summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleonoverweel <l.overweel@gmail.com>2017-02-27 16:12:50 +0100
committerleonoverweel <l.overweel@gmail.com>2017-02-27 16:12:50 +0100
commitace25f0382c20b0e79afa85227dc155b5498a1dc (patch)
treea3038bda2993e1e6976feb9eb77567672e8182d7
parent855b654942d400204ea3ce952b5fe0cebf8492c2 (diff)
Update tasks to add parallelizability and core use
-rw-r--r--opendc/models/task.py5
-rw-r--r--opendc/models/task_state.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/opendc/models/task.py b/opendc/models/task.py
index 8ec03568..aa9838a5 100644
--- a/opendc/models/task.py
+++ b/opendc/models/task.py
@@ -8,12 +8,13 @@ class Task(Model):
'startTick': 'start_tick',
'totalFlopCount': 'total_flop_count',
'traceId': 'trace_id',
- 'taskDependencyId': 'task_dependency_id'
+ 'taskDependencyId': 'task_dependency_id',
+ 'parallelizability': 'parallelizability'
}
}
TABLE_NAME = 'tasks'
- COLUMNS = ['id', 'start_tick', 'total_flop_count', 'trace_id', 'task_dependency_id']
+ COLUMNS = ['id', 'start_tick', 'total_flop_count', 'trace_id', 'task_dependency_id', 'parallelizability']
COLUMNS_PRIMARY_KEY = ['id']
def google_id_has_at_least(self, google_id, authorization_level):
diff --git a/opendc/models/task_state.py b/opendc/models/task_state.py
index 6569ec79..e9b5b63f 100644
--- a/opendc/models/task_state.py
+++ b/opendc/models/task_state.py
@@ -9,13 +9,14 @@ class TaskState(Model):
'taskId': 'task_id',
'experimentId': 'experiment_id',
'tick': 'tick',
- 'flopsLeft': 'flops_left'
+ 'flopsLeft': 'flops_left',
+ 'coresUsed': 'cores_used'
}
}
TABLE_NAME = 'task_states'
- COLUMNS = ['id', 'task_id', 'experiment_id', 'tick', 'flops_left']
+ COLUMNS = ['id', 'task_id', 'experiment_id', 'tick', 'flops_left', 'cores_used']
COLUMNS_PRIMARY_KEY = ['id']
@classmethod