From 7daa9bb9a0611b8df389e68fd08ac93bdfb24d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Mon, 31 Jan 2022 10:50:53 +0100
Subject: [PATCH] relaunch campaign1 after correcting the user_file bug
---
campaign1.py | 3 ++-
instance1.py | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/campaign1.py b/campaign1.py
index d8689ed..43fd546 100755
--- a/campaign1.py
+++ b/campaign1.py
@@ -25,7 +25,8 @@ with concurrent.futures.ProcessPoolExecutor() as executor:
instances = []
for i in range(nb_expe):
print(f"Submit expe {i}")
- instances.append(executor.submit(start_instance, i, start_dates[i], True, True))
+ # start_instance(expe_num, start_date, prepare_workload, clean_log)
+ instances.append(executor.submit(start_instance, i, start_dates[i], False, True))
for instance in concurrent.futures.as_completed(instances):
print(f"Expe {instance.result()} terminated")
diff --git a/instance1.py b/instance1.py
index 1dbe897..ade5387 100755
--- a/instance1.py
+++ b/instance1.py
@@ -37,7 +37,9 @@ def run_expe(expe_num, user_category, window_size, clean_log):
else:
w_size = f"{window_size}"
EXPE_DIR = f"{ROOT_DIR}/out/expe{expe_num}/{user_category}_window{w_size}"
- EXPE_FILE = f"{EXPE_DIR}.yaml"
+ create_dir_rec_if_needed(EXPE_DIR)
+ create_dir_rec_if_needed(f"{EXPE_DIR}/cmd")
+ EXPE_FILE = f"{EXPE_DIR}/cmd/robinfile.yaml"
wl_folder = f'{WL_DIR}/expe{expe_num}'
pf = f"{ROOT_DIR}/platform/average_metacentrum.xml"
wl = f"{WL_DIR}/empty_workload.json"
@@ -93,8 +95,7 @@ def start_instance(expe_num, start_date, prepare_workload=True, clean_log=False)
prepare_input_data(expe_num, start_date)
# Create expe folder
- if not os.path.exists(f"{ROOT_DIR}/out/expe{expe_num}"):
- os.makedirs(f"{ROOT_DIR}/out/expe{expe_num}")
+ create_dir_rec_if_needed(f"{ROOT_DIR}/out/expe{expe_num}")
# Run with Rigid behavior (the demand response window has no influence here)
run_expe(expe_num=expe_num,
--
GitLab