Skip to content

Commit 0d735ce

Browse files
committed
trace fix
1 parent 9fc3734 commit 0d735ce

File tree

11 files changed

+63
-3381
lines changed

11 files changed

+63
-3381
lines changed
72.7 KB
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import sys
2+
sys.path.append('/home/ubuntu/eva/src/parse_report')
3+
from utils import plot_instantaneous_configuration, calculate_total_cost_per_instance
4+
5+
6+
def artifacts_eval():
7+
path = "/home/ubuntu/eva_report.json"
8+
plot_instantaneous_configuration(path, "instantaneous_configuration.png")
9+
calculate_total_cost_per_instance(path)
10+
11+
artifacts_eval()

src/eurosys_artifacts_eval/physical_trace.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"0": {
3-
"name": "sage",
3+
"name": "two_node_resnet18",
44
"arrival_time": 20
55
},
66
"1": {
7-
"name": "two_node_resnet18",
7+
"name": "sage",
88
"arrival_time": 30
99
},
1010
"2": {

src/job_submission_driver.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
EVA_IP_ADDR="172.31.17.248"
77
EVA_PORT=50422
8-
trace = "/home/ubuntu/eurosys_artifacts_eval/physical_trace.json"
8+
#trace = "/home/ubuntu/mount/physical_experiment/physical_trace.json"
9+
trace = "/home/ubuntu/eva/src/eurosys_artifacts_eval/physical_trace.json"
910

1011
class Job:
1112
def __init__(self, id, name, arrival_time, local_path):
@@ -15,6 +16,7 @@ def __init__(self, id, name, arrival_time, local_path):
1516
self.local_path = local_path
1617

1718
def submit(job):
19+
# global_working_dir = f"workspace_r1/job_{job.id}"
1820
global_working_dir = f"workspace/job_{job.id}"
1921
command = [
2022
"python", "eva_submit.py",
@@ -31,11 +33,13 @@ def submit(job):
3133

3234
jobs = {}
3335
for job_id, job_desc in trace_json.items():
36+
print(f"{job_id} {job_desc['name']=}")
3437
jobs[int(job_id)] = Job(
3538
id=int(job_id),
3639
name=job_desc['name'],
3740
arrival_time=job_desc['arrival_time'],
38-
local_path=f"/home/ubuntu/eurosys_artifacts_eval/physical_jobs/{job_desc['name']}"
41+
local_path=f"/home/ubuntu/eva/src/eurosys_artifacts_eval/physical_jobs/{job_desc['name']}"
42+
# local_path=f"/home/ubuntu/mount/physical_experiment/{job_desc['name']}"
3943
# local_path=f"/home/ubuntu/resubmission_physical_jobs/{job_desc['name']}/job_{job_id}"
4044
)
4145
# make sure the path exist

src/log_physical.txt

Lines changed: 0 additions & 515 deletions
This file was deleted.

src/master/scheduler/synergy_scheduler.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,6 @@ def synergy(self, planned_config, task_ids, instances, instance_types, task_to_m
161161
if tasks[task_id].instance_id is None:
162162
self._logger.debug(f"task_id {task_id} is not on any instance")
163163
candidate_task_ids.append(task_id)
164-
for instance_id in instances:
165-
# ignore instances that have jobs that are migrating
166-
if instance_id in planned_config:
167-
continue
168-
it_id = instances[instance_id].instance_type_id
169-
# at this point, all tasks on this instance are migratable
170-
self._logger.debug(f"instance_id {instance_id} is not in planned_config")
171-
self._logger.debug(f"committed_task_ids: {instances[instance_id].committed_task_ids}")
172-
opportunity_cost = self.get_opportunity_cost(instances[instance_id].committed_task_ids, tasks, jobs, instance_types, task_to_min_it_map, contention_map)
173-
if opportunity_cost < instance_types[it_id].cost and \
174-
not (len(instances[instance_id].committed_task_ids) == 1 and \
175-
task_to_min_it_map[instances[instance_id].committed_task_ids[0]] == it_id):
176-
self._logger.debug(f"instance_id {instance_id} is not worth it, adding tasks {instances[instance_id].committed_task_ids} to candidate_task_ids")
177-
candidate_task_ids.extend(instances[instance_id].committed_task_ids)
178164

179165
self._logger.debug(f"candidate_task_ids: {candidate_task_ids}")
180166
# for tasks that are not candidate_task_ids, add them to planned config

src/pai_trace/traces/pai_full.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"name": "node0",
1313
"demand": {
1414
"any": [
15-
8,
16-
64,
15+
1,
16+
12,
1717
16
1818
]
1919
},
72.4 KB
Loading

0 commit comments

Comments
 (0)