From 062e957e4c56f57189ac5d9df0534ec7fac5dd28 Mon Sep 17 00:00:00 2001
From: karnem <mikhail.karnevskiy@desy.de>
Date: Tue, 23 Jul 2019 10:41:09 +0200
Subject: [PATCH] Source script before loading module.
---
bin/slurm_calibrate.sh | 2 --
xfel_calibrate/calibrate.py | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/bin/slurm_calibrate.sh b/bin/slurm_calibrate.sh
index c447f639f..f06b078c7 100755
--- a/bin/slurm_calibrate.sh
+++ b/bin/slurm_calibrate.sh
@@ -31,8 +31,6 @@ echo "finalize: $finalize"
echo "cluster_cores: $cluster_cores"
echo "job ID: $SLURM_JOB_ID"
-module load anaconda/3
-
export CAL_NOTEBOOK_NAME=$notebook
echo "Starting influx feeder"
diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index 858060827..5f7b41ba5 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -430,9 +430,8 @@ def concurrent_run(temp_path, nb, nbname, args, cparm=None, cval=None,
import stat
with open("{}/finalize.sh".format(temp_path), "w") as finfile:
finfile.write("#!/bin/tcsh\n")
+ finfile.write("source /etc/profile.d/modules.sh\n")
finfile.write("module load texlive/2017\n")
- finfile.write("if [[ `which python` != *'karabo'* ]];\n")
- finfile.write("then module load anaconda/3; fi\n")
finfile.write("echo 'Running finalize script'\n")
finfile.write(
"python3 -c {}\n".format(fmtcmd.format(joblist=job_list)))
--
GitLab