From 0515557d167d2d96d7d0683e31a82bb57241cc84 Mon Sep 17 00:00:00 2001
From: Felix Kleinert <f.kleinert@fz-juelich.de>
Date: Tue, 7 Apr 2020 10:07:25 +0200
Subject: [PATCH] update JUWELS path to /p/project
---
src/helpers.py | 2 +-
src/run_modules/experiment_setup.py | 4 ++--
test/test_helpers.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/helpers.py b/src/helpers.py
index 45cc996b..4d733ebb 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -115,7 +115,7 @@ def prepare_host(create_new=True, sampling="daily"):
elif (len(hostname) > 2) and (hostname[:2] == "jr"):
path = f"/p/project/cjjsc42/{user}/DATA/toar_{sampling}/"
elif (len(hostname) > 2) and (hostname[:2] in ['jw', 'ju']):
- path = f"/p/home/jusers/{user}/juwels/intelliaq/DATA/toar_{sampling}/"
+ path = f"/p/project/deepacf/intelliaq/{user}/DATA/toar_{sampling}/"
elif "runner-6HmDp9Qd-project-2411-concurrent" in hostname:
path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
else:
diff --git a/src/run_modules/experiment_setup.py b/src/run_modules/experiment_setup.py
index 70e75e22..6e3b69c0 100644
--- a/src/run_modules/experiment_setup.py
+++ b/src/run_modules/experiment_setup.py
@@ -42,13 +42,13 @@ class ExperimentSetup(RunEnvironment):
create_new_model=None, bootstrap_path=None, permute_data_on_training=False, transformation=None,
train_min_length=None, val_min_length=None, test_min_length=None, extreme_values=None,
extremes_on_right_tail_only=None, evaluate_bootstraps=True, plot_list=None, number_of_bootstraps=None,
- create_new_bootstraps=None):
+ create_new_bootstraps=None, data_path=None):
# create run framework
super().__init__()
# experiment setup
- self._set_param("data_path", helpers.prepare_host(sampling=sampling))
+ self._set_param("data_path", data_path, default=helpers.prepare_host(sampling=sampling))
self._set_param("hostname", helpers.get_host())
# self._set_param("hostname", "jwc0123")
self._set_param("hpc_hosts", DEFAULT_HPC_HOST_LIST)
diff --git a/test/test_helpers.py b/test/test_helpers.py
index 6fbefc35..6121254b 100644
--- a/test/test_helpers.py
+++ b/test/test_helpers.py
@@ -152,7 +152,7 @@ class TestPrepareHost:
assert prepare_host() == "/home/testUser/Data/toar_daily/"
assert prepare_host() == "/home/testUser/Data/toar_daily/"
assert prepare_host() == "/p/project/cjjsc42/testUser/DATA/toar_daily/"
- assert prepare_host() == "/p/home/jusers/testUser/juwels/intelliaq/DATA/toar_daily/"
+ assert prepare_host() == "/p/project/deepacf/intelliaq/testUser/DATA/toar_daily/"
assert prepare_host() == '/home/testUser/machinelearningtools/data/toar_daily/'
@mock.patch("socket.gethostname", return_value="NotExistingHostName")
--
GitLab