Skip to content

Added virtual_env as additional kwarg to KassLocustP3. #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renereimann wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added virtual_env as additional kwarg to KassLocustP3. #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions hercules/simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def run(self, config_list, **kwargs):

@staticmethod
def factory(name, working_dir, use_locust=True, use_kass=False,
python_script=None):
python_script=None, **kwargs):
"""Return an instance of one of the derived classes.

Parameters
Expand All @@ -240,11 +240,11 @@ def factory(name, working_dir, use_locust=True, use_kass=False,
if name == 'grace':
return KassLocustP3Cluster(working_dir, use_locust=use_locust,
use_kass=use_kass,
python_script=python_script, direct=False)
python_script=python_script, direct=False, **kwargs)
elif name == 'desktop':
return KassLocustP3Desktop(working_dir, use_locust=use_locust,
use_kass=use_kass,
python_script=python_script, direct=False)
python_script=python_script, direct=False, **kwargs)
else:
raise ValueError('Bad KassLocustP3 creation : ' + name)

Expand Down Expand Up @@ -397,7 +397,7 @@ class KassLocustP3Cluster(AbstractKassLocustP3):
_job_script_name = 'joblist%s.txt'

def __init__(self, working_dir, use_locust=True,
use_kass=False, python_script=None, direct=True):
use_kass=False, python_script=None, direct=True, virtual_env="hercules"):
"""
Parameters
----------
Expand All @@ -408,6 +408,7 @@ def __init__(self, working_dir, use_locust=True,
AbstractKassLocustP3.__init__(self, working_dir, use_locust=use_locust,
use_kass=use_kass,
python_script=python_script, direct=direct)
self._virtual_env = virtual_env

def run(self, config_list, **kwargs):
"""This method overrides :meth:`AbstractKassLocustP3.__call__`.
Expand Down Expand Up @@ -527,7 +528,7 @@ def _assemble_command(self, output_dir):
cmd += singularity_cmd + ';' + check_failure + ';'

if self._python_script is not None:
cmd += 'module load miniconda; conda activate hercules;'
cmd += 'module load miniconda; conda activate %s;'%(self._virtual_env)
cmd += 'python ' + str(self._python_script) + ' ' + str(output_dir)

log = '>' + str(output_dir) + '/log.out'
Expand Down Expand Up @@ -573,7 +574,7 @@ class KassLocustP3:
"""

def __init__(self, working_dir, use_locust=True, use_kass=False,
python_script=None):
python_script=None, **kwargs):
"""
Parameters
----------
Expand All @@ -588,7 +589,7 @@ def __init__(self, working_dir, use_locust=True, use_kass=False,
working_dir,
use_locust=use_locust,
use_kass=use_kass,
python_script=python_script)
python_script=python_script, **kwargs)

def _add_python_script_metadata(self, config_list):
config_list.get_meta_data()['python-script'] = self._kass_locust._python_script_name
Expand Down