Skip to content

Commit

Permalink
chore: configure the WLM type by cluster (determined-ai#792)
Browse files Browse the repository at this point in the history
Now that the master reads the WLM type from the static configuration file, update the slurmcluster.sh tool accordingly.
  • Loading branch information
phillip-gaisford authored and dzhu committed Apr 25, 2023
1 parent f075fe5 commit 4c8f593
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/devcluster-slurm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $OPT_RESOURCEPOOLS
security:
tls:
skip_verify: true
type: slurm
type: $OPT_WLMTYPE
# job_project_source: project
# File containing the authorization token for communication with the launcher -- if blank then none.
# This would typically be a full path where the determined master is running generated by
Expand Down
7 changes: 7 additions & 0 deletions tools/slurmcluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ OPT_CHECKPOINTPATH_casablanca_login2=/mnt/lustre/foundation_engineering/determin
OPT_MASTERHOST_casablanca_login2=casablanca-login2
OPT_MASTERPORT_casablanca_login2=$USERPORT
OPT_TRESSUPPORTED_casablanca_login2=false
OPT_WLMTYPE_casablanca_login2=pbs

# Configuration for sawmill (10.100.97.101)
OPT_name_sawmill=10.100.97.101
Expand Down Expand Up @@ -502,6 +503,12 @@ export OPT_DEFAULTCOMPUTERESOURCEPOOL=$(lookup "OPT_DEFAULTCOMPUTERESOURCEPOOL_$
export OPT_TASKCONTAINERDEFAULTS=$(lookup "OPT_TASKCONTAINERDEFAULTS_$CLUSTER")
export OPT_PARTITIONOVERRIDES=$(lookup "OPT_PARTITIONOVERRIDES_$CLUSTER")
export OPT_RESOURCEPOOLS=$(lookup "OPT_RESOURCEPOOLS_$CLUSTER")
export OPT_WLMTYPE=$(lookup "OPT_WLMTYPE_$CLUSTER")

# If WLM type has not been specified, default to Slurm
if [[ -z $OPT_WLMTYPE ]]; then
export OPT_WLMTYPE="slurm"
fi

if [[ -z $OPT_GRESSUPPORTED ]]; then
export OPT_GRESSUPPORTED="true"
Expand Down

0 comments on commit 4c8f593

Please sign in to comment.