Skip to content

Commit

Permalink
Disabled always rebuilding the dependencies. Added a check to
Browse files Browse the repository at this point in the history
deactivate an active environment before loading the LBANN module.
  • Loading branch information
bvanessen committed Aug 28, 2024
1 parent 10434e7 commit 6068ad1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitlab/build-and-test-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
LLNL_LSF_SCHEDULER_PARAMETERS: "-q pbatch -nnodes 2 -W 60"
GIT_SUBMODULE_STRATEGY: none
GIT_DEPTH: 5
REBUILD_DEPS: 1
script:
- printenv > ${CI_PROJECT_DIR}/ci_environment.log
- ${CI_PROJECT_DIR}/.gitlab/build-and-test.sh
Expand Down
16 changes: 16 additions & 0 deletions .gitlab/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,22 @@ CMD="python3 -m pip install -i https://pypi.org/simple --prefix ${prefix}/lbann
echo ${CMD}
${CMD}

if [[ $(env | grep VIRTUAL_ENV) ]]; then
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "~~~~~ Build Script is currently in a Python virtual environment"
echo "~~~~~ Deactivate it before loading the LBANN module"
echo "~~~~~ $(date)"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
deactivate
fi
if [[ $(env | grep VIRTUAL_ENV) ]]; then
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "~~~~~ Build Script is currently in a Python virtual environment - deactivate it before loading"
echo "~~~~~ Deactivate it before loading the LBANN module"
echo "~~~~~ $(date)"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
fi

LBANN_MODFILES_DIR=${build_dir}/install/lbann/etc/modulefiles
CMD="ml use ${LBANN_MODFILES_DIR}"
echo ${CMD}
Expand Down

0 comments on commit 6068ad1

Please sign in to comment.