From b1d662ba49aa7ed105543bb4101f13567ac74772 Mon Sep 17 00:00:00 2001
From: David Robert Verelst <dave@dtu.dk>
Date: Thu, 4 Oct 2018 10:33:06 +0200
Subject: [PATCH] prepost.Simulations: add option to specify the python env
path
---
wetb/prepost/Simulations.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index c754717..294a090 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -562,7 +562,8 @@ def prepare_launch(iter_dict, opt_tags, master, variable_tag_func,
update_model_data=True, maxcpu=1, pyenv='wetb_py3',
m=[3,4,6,8,9,10,12], postpro_node_zipchunks=True,
postpro_node=False, exesingle=None, exechunks=None,
- wine_arch='win32', wine_prefix='~/.wine32'):
+ wine_arch='win32', wine_prefix='~/.wine32',
+ pyenv_cmd='source /home/python/miniconda3/bin/activate'):
"""
Create the htc files, pbs scripts and replace the tags in master file
=====================================================================
@@ -805,7 +806,7 @@ def prepare_launch(iter_dict, opt_tags, master, variable_tag_func,
pyenv=pyenv, wine_64bit=wine_64bit, m=[3,4,6,8,9,10,12],
postpro_node_zipchunks=postpro_node_zipchunks,
postpro_node=postpro_node, exesingle=exesingle, exechunks=exechunks,
- wine_arch=wine_arch, wine_prefix=wine_prefix)
+ wine_arch=wine_arch, wine_prefix=wine_prefix, pyenv_cmd=pyenv_cmd)
return cases
@@ -1008,7 +1009,8 @@ def launch(cases, runmethod='none', verbose=False, copyback_turb=True,
pbs_fname_appendix=True, short_job_names=True,
maxcpu=1, pyenv='wetb_py3', wine_64bit=False, m=[3,4,6,8,9,10,12],
postpro_node_zipchunks=True, postpro_node=False, exesingle=None,
- exechunks=None, wine_arch='win32', wine_prefix='~/.wine32'):
+ exechunks=None, wine_arch='win32', wine_prefix='~/.wine32',
+ pyenv_cmd='source /home/python/miniconda3/bin/activate'):
"""
The actual launching of all cases in the Cases dictionary. Note that here
only the PBS files are written and not the actuall htc files.
@@ -1054,6 +1056,7 @@ def launch(cases, runmethod='none', verbose=False, copyback_turb=True,
postpro_node=postpro_node, exesingle=exesingle,
exechunks=exechunks, wine_arch=wine_arch,
wine_prefix=wine_prefix)
+ pbs.pyenv_cmd = pyenv_cmd
pbs.copyback_turb = copyback_turb
pbs.pbs_out_dir = pbs_out_dir
pbs.maxcpu = maxcpu
--
GitLab