diff --git a/src/helpers.py b/src/helpers.py index 45cc996b0f814c4553a1ca15f07332e3ed0096d4..4d733ebbaf8761a815cd8669720fc12ba60ef4e7 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 70e75e22c952f258eb401666a3df2ebaa232cf14..6e3b69c05d33757a60e3571ed4770997610f6568 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 6fbefc35f80e4f13c3ccd43e5a06c9f8c67ae9e8..6121254bdaa3ad64dd98939825eb4ced515ccb4e 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")