Skip to content

Consolidate daint logic into buildenv (env vars) and daint_venv (python packages) #54

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 7 commits into from
Dec 17, 2021
Merged

Consolidate daint logic into buildenv (env vars) and daint_venv (python packages) #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6c8a77
consolidate daint-specific logic into buildenv (env vars) and daint_v…
mcgibbon Dec 8, 2021
194a154
use branch buildenv for PR
mcgibbon Dec 9, 2021
5897d6c
checkout branch without changing directory
mcgibbon Dec 9, 2021
62df885
Merge branch 'main' into feature/consolidate_daint_venv
mcgibbon Dec 14, 2021
22c03be
restore deleted mpilaunch variable
mcgibbon Dec 14, 2021
9026b06
delete top level pace.daint.slurm file
mcgibbon Dec 14, 2021
f121767
update buildenv to latest
mcgibbon Dec 17, 2021
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
10 changes: 0 additions & 10 deletions .jenkins/jenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@ if grep -q "parallel" <<< "${script}"; then
if grep -q "ranks" <<< "${experiment}"; then
export NUM_RANKS=`echo ${experiment} | grep -o -E '[0-9]+ranks' | grep -o -E '[0-9]+'`
echo "Setting NUM_RANKS=${NUM_RANKS}"
if grep -q "cuda\|gpu" <<< "${backend}" ; then
export MPICH_RDMA_ENABLED_CUDA=1
export CRAY_CUDA_MPS=1
else
export MPICH_RDMA_ENABLED_CUDA=0
export CRAY_CUDA_MPS=0
fi
if [ -f ${scheduler_script} ] ; then
sed -i 's|<NTASKS>|<NTASKS>\n#SBATCH \-\-hint=multithread\n#SBATCH --ntasks-per-core=2|g' ${scheduler_script}
sed -i 's|45|30|g' ${scheduler_script}
Expand All @@ -137,8 +130,6 @@ if grep -q "parallel" <<< "${script}"; then
fi
fi

module load daint-gpu
module load ${installdir}/modulefiles/gcloud/303.0.0
# get the test data version from the Makefile
export DATA_VERSION=`grep "FORTRAN_SERIALIZED_DATA_VERSION=" Makefile | cut -d '=' -f 2`

Expand Down Expand Up @@ -186,7 +177,6 @@ if [ ${python_env} == "virtualenv" ]; then
fi
export PACE_PATH="${JENKINS_DIR}/../"
export TEST_DATA_RUN_LOC=${TEST_DATA_HOST}
export PYTHONPATH=${installdir}/serialbox/gnu/python:$PYTHONPATH
fi

G2G="false"
Expand Down
2 changes: 1 addition & 1 deletion buildenv
Open in desktop
Submodule buildenv updated 1 files
+1 −0 machineEnvironment.sh
3 changes: 0 additions & 3 deletions fv3core/.jenkins/jenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ if grep -q "fv_dynamics" <<< "${script}"; then
export MPIRUN_CALL="srun"
fi

module load daint-gpu
module load ${installdir}/modulefiles/gcloud/303.0.0
# get the test data version from the Makefile
export DATA_VERSION=`grep "FORTRAN_SERIALIZED_DATA_VERSION=" Makefile | cut -d '=' -f 2`

Expand Down Expand Up @@ -203,7 +201,6 @@ if [ ${python_env} == "virtualenv" ]; then
fi
export FV3_PATH="${JENKINS_DIR}/../"
export TEST_DATA_RUN_LOC=${TEST_DATA_HOST}
export PYTHONPATH=${installdir}/serialbox/gnu/python:$PYTHONPATH
fi

G2G="false"
Expand Down
41 changes: 0 additions & 41 deletions pace.daint.slurm
View file
Open in desktop

This file was deleted.