From e2a828087d74f3af5fc44a8b83b7fec4a5c17325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Fri, 29 Mar 2024 17:39:30 +0100
Subject: [PATCH] move utils g5k to dedicated folder
---
campaign.py | 6 +++---
{scripts => g5k_utils}/build_nix_cache.sh | 0
{scripts => g5k_utils}/install_nix_g5k.sh | 0
{scripts => g5k_utils}/passive_submit.sh | 0
{scripts => g5k_utils}/passive_submit_sync.sh | 0
{scripts => g5k_utils}/sync_expe_out.sh | 0
scripts/start_notebook.sh | 3 ---
7 files changed, 3 insertions(+), 6 deletions(-)
rename {scripts => g5k_utils}/build_nix_cache.sh (100%)
rename {scripts => g5k_utils}/install_nix_g5k.sh (100%)
rename {scripts => g5k_utils}/passive_submit.sh (100%)
rename {scripts => g5k_utils}/passive_submit_sync.sh (100%)
rename {scripts => g5k_utils}/sync_expe_out.sh (100%)
delete mode 100755 scripts/start_notebook.sh
diff --git a/campaign.py b/campaign.py
index d8e3b53..4a3302b 100755
--- a/campaign.py
+++ b/campaign.py
@@ -147,7 +147,7 @@ def compute_expe_start_time(args) :
day1 += betweentime
print(expe_start_time)
# Save selected dates in a txt file
- with open(f"{WL_DIR}/start_days_for_campaign3.txt", 'w') as f:
+ with open(f"{WL_DIR}/start_days_for_campaign.txt", 'w') as f:
for date in str_start_day:
f.write(date + '\n')
return expe_start_time,begin_time,end_time,heating_days
@@ -292,9 +292,9 @@ def compute_metrics(args, expe_done_dict, red_windows_dict, yellow_windows_dict,
True,
maximum_worker, out_dir,
{"_simu_solar_wind": production_files[1]}, start_day)
- metrics_file_name = f"{out_dir}/metrics_campaign3_{save_num}.csv"
+ metrics_file_name = f"{out_dir}/metrics_campaign_{save_num}.csv"
metrics.to_csv(metrics_file_name)
- metrics_relative.to_csv(f"{out_dir}/metrics_relative_campaign3_{save_num}.csv")
+ metrics_relative.to_csv(f"{out_dir}/metrics_relative_campaign_{save_num}.csv")
plot_exec_time(expe_done_dict, WL_DIR, out_dir, f'{out_dir}/execution_times_{save_num}.svg')
plot_queue_load(expe_done_dict, out_dir)
diff --git a/scripts/build_nix_cache.sh b/g5k_utils/build_nix_cache.sh
similarity index 100%
rename from scripts/build_nix_cache.sh
rename to g5k_utils/build_nix_cache.sh
diff --git a/scripts/install_nix_g5k.sh b/g5k_utils/install_nix_g5k.sh
similarity index 100%
rename from scripts/install_nix_g5k.sh
rename to g5k_utils/install_nix_g5k.sh
diff --git a/scripts/passive_submit.sh b/g5k_utils/passive_submit.sh
similarity index 100%
rename from scripts/passive_submit.sh
rename to g5k_utils/passive_submit.sh
diff --git a/scripts/passive_submit_sync.sh b/g5k_utils/passive_submit_sync.sh
similarity index 100%
rename from scripts/passive_submit_sync.sh
rename to g5k_utils/passive_submit_sync.sh
diff --git a/scripts/sync_expe_out.sh b/g5k_utils/sync_expe_out.sh
similarity index 100%
rename from scripts/sync_expe_out.sh
rename to g5k_utils/sync_expe_out.sh
diff --git a/scripts/start_notebook.sh b/scripts/start_notebook.sh
deleted file mode 100755
index 70297d7..0000000
--- a/scripts/start_notebook.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#/bin/bash
-cd ~/demand-response-user
-nix-shell --pure -A exp_env --run "jupyter notebook --ip $(hostname -f) --no-browser"
--
GitLab