Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Addition of user enabled workspace hashing #145

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

Merged
merged 5 commits into from
Sep 30, 2018
Merged

Addition of user enabled workspace hashing #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fadff34
Addition of hashing to Study parameterization.
Sep 21, 2018
beec9c6
Addition of the hashws option to argparse.
Sep 21, 2018
f97b059
Merge branch 'develop' into enchance/ws_hashing
FrankD412 Sep 22, 2018
8778159
Addition of a warning note for users who use labels in steps.
Sep 30, 2018
5cba785
Merge branch 'develop' into enchance/ws_hashing
FrankD412 Sep 30, 2018
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
17 changes: 12 additions & 5 deletions maestrowf/datastructures/core/study.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

"""Class related to the construction of study campaigns."""
import copy
from hashlib import md5
import logging
import os
import pickle
Expand Down Expand Up @@ -355,7 +356,7 @@ def setup_environment(self):
self.environment.acquire_environment()

def configure_study(self, submission_attempts=1, restart_limit=1,
throttle=0, use_tmp=False):
throttle=0, use_tmp=False, hash_ws=False):
"""
Perform initial configuration of a study.

Expand All @@ -376,6 +377,7 @@ def configure_study(self, submission_attempts=1, restart_limit=1,
self._restart_limit = restart_limit
self._submission_throttle = throttle
self._use_tmp = use_tmp
self._hash_ws = hash_ws

logger.info(
"\n------------------------------------------\n"
Expand All @@ -384,9 +386,10 @@ def configure_study(self, submission_attempts=1, restart_limit=1,
"Submission restart limit = %d\n"
"Submission throttle limit = %d\n"
"Use temporary directory = %s\n"
"Hash workspaces = %s\n"
"------------------------------------------",
self._out_path, submission_attempts, restart_limit, throttle,
use_tmp
use_tmp, hash_ws
)

def _stage_parameterized(self, dag):
Expand Down Expand Up @@ -579,9 +582,13 @@ def _stage_parameterized(self, dag):
str(combo))
# Compute this step's combination name and workspace.
combo_str = combo.get_param_string(self.used_params[step])
workspace = \
make_safe_path(self._out_path, step, combo_str)
logger.debug("Workspace: %s", workspace)
if self._hash_ws:
workspace = make_safe_path(
self._out_path, step, md5(combo_str).hexdigest())
else:
workspace = \
make_safe_path(self._out_path, step, combo_str)
logger.debug("Workspace: %s", workspace)
combo_str = "{}_{}".format(step, combo_str)
self.workspaces[combo_str] = workspace

Expand Down
6 changes: 5 additions & 1 deletion maestrowf/maestro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def run_study(args):
study.setup_environment()
study.configure_study(
throttle=args.throttle, submission_attempts=args.attempts,
restart_limit=args.rlimit, use_tmp=args.usetmp)
restart_limit=args.rlimit, use_tmp=args.usetmp, hash_ws=args.hashws)

# Stage the study.
path, exec_dag = study.stage()
Expand Down Expand Up @@ -319,6 +319,10 @@ def setup_argparser():
run.add_argument("-fg", action="store_true", default=False,
help="Runs the backend conductor in the foreground "
"instead of using nohup. [Default: %(default)s]")
run.add_argument("--hashws", action="store_true", default=False,
help="Enable hashing of subdirectories in parameterized "
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a note about the use of parameter label attributes in a study when --hashws is specified.

"studies (NOTE: breaks commands that use parameter labels"
" to search directories). [Default: %(default)s]")

prompt_opts = run.add_mutually_exclusive_group()
prompt_opts.add_argument(
Expand Down