Skip to content

GPU usage improvements #184

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 2 commits into from
Mar 31, 2020
Merged

GPU usage improvements #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65038e8
Made the two changes needed for jobs on Biowulf to not have Swift/T u…
andrew-weisman Mar 27, 2020
4de4372
Merge remote-tracking branch 'upstream/master' into gpu-usage-improve…
andrew-weisman Mar 27, 2020
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
2 changes: 1 addition & 1 deletion turbine/code/bin/turbine.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ fi
LAUNCH_OPTIONS=()
LAUNCH_OPTIONS+=${LINE_PREFIX}
LAUNCH_OPTIONS+=( -n ${PROCS} )
LAUNCH_OPTIONS+=( ${TURBINE_LAUNCH_OPTIONS} )
LAUNCH_OPTIONS+=( ${=TURBINE_LAUNCH_OPTIONS} )

if (( VERBOSE ))
then
Expand Down
12 changes: 7 additions & 5 deletions turbine/code/scripts/submit/slurm/turbine-slurm.sh.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ ifelse(getenv_nospace(PROJECT),`',,
#SBATCH --account=getenv(PROJECT)
)

# TURBINE_SBATCH_ARGS could include --exclusive, --constraint=..., etc.
ifelse(getenv_nospace(TURBINE_SBATCH_ARGS),`',,
#SBATCH getenv(TURBINE_SBATCH_ARGS)
)

#SBATCH --job-name=getenv_nospace(TURBINE_JOBNAME)

#SBATCH --time=getenv_nospace(WALLTIME)
Expand All @@ -49,6 +44,13 @@ ifelse(getenv_nospace(MAIL_ENABLED),`1',
#SBATCH --mail-type=ALL
)

# This block should be here, after other arguments to #SBATCH, so that the user can overwrite automatically set values such as --nodes (which is set in run-init.zsh using PROCS / PPN)
# Note this works because sbatch ignores all but the last of duplicate arguments
# TURBINE_SBATCH_ARGS could include --exclusive, --constraint=..., etc.
ifelse(getenv_nospace(TURBINE_SBATCH_ARGS),`',,
#SBATCH getenv(TURBINE_SBATCH_ARGS)
)

# BEGIN TURBINE_DIRECTIVE
getenv(TURBINE_DIRECTIVE)
# END TURBINE_DIRECTIVE
Expand Down