From 2ccf7681a149e921506d8b7cefce998b63d47368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Guyader?= <loic.le.guyader@xfel.eu>
Date: Tue, 10 May 2022 11:33:34 +0200
Subject: [PATCH] Fix load anaconda3 depreceated environment
---
doc/scripts/bin_dssc_module_job.sh | 2 +-
doc/scripts/boz_parameters_job.sh | 2 +-
doc/scripts/format_data.sh | 4 ++--
doc/scripts/start_job_single.sh | 2 +-
doc/scripts/start_processing_all.sh | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/scripts/bin_dssc_module_job.sh b/doc/scripts/bin_dssc_module_job.sh
index efdf5f9..09f5b95 100644
--- a/doc/scripts/bin_dssc_module_job.sh
+++ b/doc/scripts/bin_dssc_module_job.sh
@@ -25,7 +25,7 @@ done
# Load xfel environment
source /etc/profile.d/modules.sh
module load exfel
-module load exfel_anaconda3/1.1
+module load exfel_anaconda3
echo processing run $RUN
PDIR=$(find-proposal $PROPOSAL)
diff --git a/doc/scripts/boz_parameters_job.sh b/doc/scripts/boz_parameters_job.sh
index ef7fd34..4107d3b 100644
--- a/doc/scripts/boz_parameters_job.sh
+++ b/doc/scripts/boz_parameters_job.sh
@@ -30,7 +30,7 @@ done
# Load xfel environment
source /etc/profile.d/modules.sh
module load exfel
-module load exfel_anaconda3/1.1
+module load exfel_anaconda3
echo processing run $RUN
PDIR=$(find-proposal $PROPOSAL)
diff --git a/doc/scripts/format_data.sh b/doc/scripts/format_data.sh
index 01e6659..efc21f4 100755
--- a/doc/scripts/format_data.sh
+++ b/doc/scripts/format_data.sh
@@ -8,11 +8,11 @@ if [ -d $RUN_DIR ]
then
echo creating formatted .h5 file for run $RUN_NR in $RUN_DIR
# module load exfel
-# module load exfel_anaconda3/1.1
+# module load exfel_anaconda3
python format_data.py --run-number $RUN_NR --run-folder $RUN_DIR
#chgrp -R 60002711-part $RUN_DIR
chmod -R 777 $RUN_DIR
else
echo run folder $RUN_DIR does not exist
echo please provide a valid run number
-fi
\ No newline at end of file
+fi
diff --git a/doc/scripts/start_job_single.sh b/doc/scripts/start_job_single.sh
index d3934e9..d23a9ce 100755
--- a/doc/scripts/start_job_single.sh
+++ b/doc/scripts/start_job_single.sh
@@ -11,7 +11,7 @@ RUNTYPE=$3
source /etc/profile.d/modules.sh
module load exfel
-module load exfel_anaconda3/1.1
+module load exfel_anaconda3
echo processing modules $MODULES of run $RUN
python process_data_201007_23h.py --run-number $RUN --module ${MODULES} --runtype $RUNTYPE
diff --git a/doc/scripts/start_processing_all.sh b/doc/scripts/start_processing_all.sh
index f0fba41..a6f694b 100755
--- a/doc/scripts/start_processing_all.sh
+++ b/doc/scripts/start_processing_all.sh
@@ -8,7 +8,7 @@ if [ $RUN ] && [ $RUNTYPE ]
echo processing run $RUN
source /etc/profile.d/modules.sh
module load exfel
- module load exfel_anaconda3/1.1
+ module load exfel_anaconda3
sbatch ./start_job_single.sh $RUN '0 1 2 3' $RUNTYPE
sbatch ./start_job_single.sh $RUN '4 5 6 7' $RUNTYPE
--
GitLab