Commit f834e7cd authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

fixed bug in dispatch_file

parent 028ad8b5
...@@ -4,29 +4,38 @@ from csst_dag.dag import Dispatcher ...@@ -4,29 +4,38 @@ from csst_dag.dag import Dispatcher
# # 1221 plan recs, 36630 data recs # # 1221 plan recs, 36630 data recs
plan_basis, data_basis = Dispatcher.load_test_data() plan_basis, data_basis = Dispatcher.load_test_data()
print(len(plan_basis), len(data_basis))
print("plan conames: ", plan_basis.colnames)
print("data conames: ", data_basis.colnames)
# # 666 task/s # # 666 task/s
task_list_via_file = Dispatcher.dispatch_file(plan_basis, data_basis) task_list_via_file = Dispatcher.dispatch_file(plan_basis, data_basis[:10])
t = Table(task_list_via_file) t = Table(task_list_via_file)
np.unique(t["success"]) np.unique(t["success"])
np.unique(t["n_relevant_plan"]) np.unique(t["n_relevant_plan"])
np.unique(t["n_relevant_data"]) np.unique(t["n_relevant_data"])
print(t["task"]) print(t["task"])
print(sum(t["success"])) print(sum(t["success"]))
print(task_list_via_file[0]["relevant_plan"].colnames)
print(task_list_via_file[0]["relevant_data"].colnames)
# # 13 task/s @n_jobs=1, 100*10 task/s @n_jobs=10 (max) # # 13 task/s @n_jobs=1, 100*10 task/s @n_jobs=10 (max)
task_list_via_detector = Dispatcher.dispatch_detector( task_list_via_detector = Dispatcher.dispatch_detector(
plan_basis, data_basis[::10], n_jobs=1 plan_basis, data_basis[::100], n_jobs=1
) )
t = Table(task_list_via_detector) t = Table(task_list_via_detector)
np.unique(t["n_relevant_plan"], return_counts=True) np.unique(t["n_relevant_plan"], return_counts=True)
np.unique(t["success"], return_counts=True) np.unique(t["success"], return_counts=True)
print(task_list_via_detector[0]["relevant_plan"].colnames)
print(task_list_via_detector[0]["relevant_data"].colnames)
# 16 task/s @n_jobs=1, 130*10 tasks/s @n_jobs=10 (max) 🔼 # 16 task/s @n_jobs=1, 130*10 tasks/s @n_jobs=10 (max) 🔼
task_list_via_obsid = Dispatcher.dispatch_obsid(plan_basis, data_basis, n_jobs=10) task_list_via_obsid = Dispatcher.dispatch_obsid(plan_basis, data_basis, n_jobs=10)
t = Table(task_list_via_obsid) t = Table(task_list_via_obsid)
np.unique(t["n_relevant_plan"], return_counts=True) np.unique(t["n_relevant_plan"], return_counts=True)
np.unique(t["success"], return_counts=True) np.unique(t["success"], return_counts=True)
print(task_list_via_obsid[0]["relevant_plan"].colnames)
print(task_list_via_obsid[0]["relevant_data"].colnames)
# 13s/task # 13s/task
task_list_via_obsgroup = Dispatcher.dispatch_obsgroup(plan_basis, data_basis) task_list_via_obsgroup = Dispatcher.dispatch_obsgroup(plan_basis, data_basis)
...@@ -36,3 +45,11 @@ print( ...@@ -36,3 +45,11 @@ print(
"/", "/",
len(task_list_via_obsgroup), len(task_list_via_obsgroup),
) )
print(task_list_via_obsgroup[0]["relevant_plan"].colnames)
print(task_list_via_obsgroup[0]["relevant_data"].colnames)
# relevant plan_basis:
# ['dataset', 'instrument', 'obs_type', 'obs_group', 'obs_id', 'detector', 'n_frame', '_id']
# relevant data_basis:
# ['dataset', 'instrument', 'obs_type', 'obs_group', 'obs_id', 'detector', 'file_name', '_id']
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment