Cluster submission fixes (#213)

* deprecation warning for legacy file * let cluster use user's python environment
icecube · Oct 14, 2022 · 3859bdd · 3859bdd
1 parent 0032605
commit 3859bdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/flarestack/cluster/make_desy_cluster_script.py b/flarestack/cluster/make_desy_cluster_script.py
@@ -4,6 +4,10 @@
 
 logger = logging.getLogger(__name__)
 
+logger.warning(
+    "WARNING: this module is deprecated. Check `flarestack.cluster.submitter` instead."
+)
+
 username = os.path.basename(os.environ["HOME"])
 
 root_dir = os.path.dirname(fs_dir[:-1])

diff --git a/flarestack/cluster/submitter.py b/flarestack/cluster/submitter.py
@@ -1,4 +1,4 @@
-import os, subprocess, time, logging, shutil, copy
+import os, subprocess, time, logging, shutil, copy, sys
 import numpy as np
 from flarestack.shared import (
     fs_dir,
@@ -437,7 +437,7 @@ def make_cluster_submission_script(self):
             "eval $(/cvmfs/icecube.opensciencegrid.org/py3-v4.1.0/setup.sh) \n"
             "export PYTHONPATH=" + DESYSubmitter.root_dir + "/ \n"
             "export FLARESTACK_SCRATCH_DIR=" + flarestack_scratch_dir + " \n"
-            "python " + fs_dir + "core/multiprocess_wrapper.py -f $1 -n $2 \n"
+            f"{sys.executable} {fs_dir} core/multiprocess_wrapper.py -f $1 -n $2 \n"
             "cp $TMPDIR/${JOB_ID}_stdout.txt " + log_dir + "\n"
             "cp $TMPDIR/${JOB_ID}_stderr.txt " + log_dir + "\n "
         )