From 6990d59c2f58ea715c69c2781782ce902e6f9ebf Mon Sep 17 00:00:00 2001
From: David Robert Verelst <dave@dtu.dk>
Date: Tue, 9 Oct 2018 21:06:48 +0200
Subject: [PATCH] prepost.simchunks: env is not active if py lib is
/usr/lib/python
---
wetb/prepost/simchunks.py | 9 +++++----
.../demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p | 6 +++---
.../demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p | 6 +++---
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/wetb/prepost/simchunks.py b/wetb/prepost/simchunks.py
index 73a9ae1..899e629 100644
--- a/wetb/prepost/simchunks.py
+++ b/wetb/prepost/simchunks.py
@@ -220,14 +220,15 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
pbs += '%s %s\n' % rpl
# sometimes activating an environment fails due to a FileExistsError
# is this because it is activated at the same time on another node?
- # check twice if the environment got activated for real
+ # check twice if the environment got activated for real,
+ # but only do so for /home/python/miniconda
pbs += 'echo "CHECK 2x IF %s IS ACTIVE, IF NOT TRY AGAIN"\n' % pyenv
pbs += 'CMD=\"from distutils.sysconfig import get_python_lib;'
- pbs += 'print (get_python_lib().find(\'%s\'))"\n' % pyenv
+ pbs += 'print (get_python_lib().find(\'/usr/lib/python\'))"\n'
pbs += 'ACTIVATED=`python -c "$CMD"`\n'
- pbs += 'if [ $ACTIVATED -eq -1 ]; then %s %s;fi\n' % rpl
+ pbs += 'if [ $ACTIVATED -eq 0 ]; then %s %s;fi\n' % rpl
pbs += 'ACTIVATED=`python -c "$CMD"`\n'
- pbs += 'if [ $ACTIVATED -eq -1 ]; then %s %s;fi\n' % rpl
+ pbs += 'if [ $ACTIVATED -eq 0 ]; then %s %s;fi\n' % rpl
# =====================================================================
# create all necessary directories at CPU_NR dirs
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p
index 2e74bfe..4f403f2 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-gorm/remote_chnk_00000.p
@@ -16,11 +16,11 @@ echo "----------------------------------------------------------------------"
echo "activate python environment wetb_py3"
source /home/python/miniconda3/bin/activate wetb_py3
echo "CHECK 2x IF wetb_py3 IS ACTIVE, IF NOT TRY AGAIN"
-CMD="from distutils.sysconfig import get_python_lib;print (get_python_lib().find('wetb_py3'))"
+CMD="from distutils.sysconfig import get_python_lib;print (get_python_lib().find('/usr/lib/python'))"
ACTIVATED=`python -c "$CMD"`
-if [ $ACTIVATED -eq -1 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
+if [ $ACTIVATED -eq 0 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
ACTIVATED=`python -c "$CMD"`
-if [ $ACTIVATED -eq -1 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
+if [ $ACTIVATED -eq 0 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
echo "----------------------------------------------------------------------"
cd /scratch/$USER/$PBS_JOBID/
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p
index fa2fb77..baf98fa 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/zip-chunks-jess/remote_chnk_00000.p
@@ -16,11 +16,11 @@ echo "----------------------------------------------------------------------"
echo "activate python environment wetb_py3"
source /home/python/miniconda3/bin/activate wetb_py3
echo "CHECK 2x IF wetb_py3 IS ACTIVE, IF NOT TRY AGAIN"
-CMD="from distutils.sysconfig import get_python_lib;print (get_python_lib().find('wetb_py3'))"
+CMD="from distutils.sysconfig import get_python_lib;print (get_python_lib().find('/usr/lib/python'))"
ACTIVATED=`python -c "$CMD"`
-if [ $ACTIVATED -eq -1 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
+if [ $ACTIVATED -eq 0 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
ACTIVATED=`python -c "$CMD"`
-if [ $ACTIVATED -eq -1 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
+if [ $ACTIVATED -eq 0 ]; then source /home/python/miniconda3/bin/activate wetb_py3;fi
echo "----------------------------------------------------------------------"
cd /scratch/$USER/$PBS_JOBID/
--
GitLab