From 41487c2dc021e851a19bf23f4f6ee4a0dcec0137 Mon Sep 17 00:00:00 2001 From: Patrick Armstrong Date: Tue, 18 Jun 2024 20:05:45 -0500 Subject: [PATCH] Changed which run file each scone version uses --- pippin/classifiers/scone.py | 2 +- pippin/classifiers/scone_legacy.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pippin/classifiers/scone.py b/pippin/classifiers/scone.py index 324ee99a..395e6d89 100644 --- a/pippin/classifiers/scone.py +++ b/pippin/classifiers/scone.py @@ -14,7 +14,7 @@ # ========================================= -SCONE_SHELL_SCRIPT = "run_refactor.py" # top-level script under $SCONE_DIR +SCONE_SHELL_SCRIPT = "run.py" # top-level script under $SCONE_DIR KEYLIST_SCONE_INPUT = [ 'init_env_train', 'init_env_heatmaps', 'prescale_heatmaps', 'nevt_select_heatmaps', diff --git a/pippin/classifiers/scone_legacy.py b/pippin/classifiers/scone_legacy.py index 0a2fe8c2..35d8a153 100644 --- a/pippin/classifiers/scone_legacy.py +++ b/pippin/classifiers/scone_legacy.py @@ -176,13 +176,8 @@ def classify(self, mode): # TODO: nersc needs `module load esslurm` to sbatch gpu jobs, maybe make # this shell command to a file so diff systems can define their own - file_to_run = 'run.py' - if self.options.get("REFACTORED", False): - file_to_run = 'run_refactor.py' - elif self.options.get("LEGACY", False): - file_to_run = 'run_legacy.py' + file_to_run = 'run_legacy.py' path = Path(self.path_to_classifier) / file_to_run - path = path if path.exists() else Path(self.path_to_classifier) / 'run.py' cmd = f"python {str(path)} --config_path {self.config_path}" subprocess.run([cmd], shell=True) self.logger.info(f"Running command: {cmd}")