From ee7f28bdeb32e9b7c74c611a8f020d5ea539f031 Mon Sep 17 00:00:00 2001 From: "Brian C. Van Essen" Date: Tue, 25 Jun 2024 18:41:39 -0700 Subject: [PATCH] Updated the build path so that the source files can be saved for debugging on pascal. --- scripts/superbuild/ci/ci_pascal_core_dependencies.sh | 2 +- scripts/superbuild/ci/ci_pascal_dha.sh | 2 +- scripts/superbuild/ci/ci_pascal_dha_distconv.sh | 2 +- scripts/superbuild/ci/ci_pascal_dha_half.sh | 2 +- scripts/superbuild/ci/ci_pascal_env.sh | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/superbuild/ci/ci_pascal_core_dependencies.sh b/scripts/superbuild/ci/ci_pascal_core_dependencies.sh index 3cff8c8b3c..9c4fce61b4 100755 --- a/scripts/superbuild/ci/ci_pascal_core_dependencies.sh +++ b/scripts/superbuild/ci/ci_pascal_core_dependencies.sh @@ -41,7 +41,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_pascal_env.sh INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS} # Set to the preferred build directory -BUILD_DIR=${TMPDIR}/lbann-superbuild-core-dependencies +BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-core-dependencies #export LD_LIBRARY_PATH=${CRAY_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH} diff --git a/scripts/superbuild/ci/ci_pascal_dha.sh b/scripts/superbuild/ci/ci_pascal_dha.sh index b38639d609..b14fb10913 100755 --- a/scripts/superbuild/ci/ci_pascal_dha.sh +++ b/scripts/superbuild/ci/ci_pascal_dha.sh @@ -48,7 +48,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_pascal_env.sh INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}/dha # Set to the preferred build directory -BUILD_DIR=${TMPDIR}/lbann-superbuild-dha +BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-dha # Update the location of external packages source ${INSTALL_PREFIX_EXTERNALS}/logs/lbann_sb_suggested_cmake_prefix_path.sh diff --git a/scripts/superbuild/ci/ci_pascal_dha_distconv.sh b/scripts/superbuild/ci/ci_pascal_dha_distconv.sh index 53323aeb10..e9dc7dee8c 100755 --- a/scripts/superbuild/ci/ci_pascal_dha_distconv.sh +++ b/scripts/superbuild/ci/ci_pascal_dha_distconv.sh @@ -48,7 +48,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_pascal_env.sh INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}/dha_with_distconv # Set to the preferred build directory -BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-distconv +BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-dha-distconv # Update the location of external packages source ${INSTALL_PREFIX_EXTERNALS}/logs/lbann_sb_suggested_cmake_prefix_path.sh diff --git a/scripts/superbuild/ci/ci_pascal_dha_half.sh b/scripts/superbuild/ci/ci_pascal_dha_half.sh index ea70ecdfaf..be5dc6013e 100755 --- a/scripts/superbuild/ci/ci_pascal_dha_half.sh +++ b/scripts/superbuild/ci/ci_pascal_dha_half.sh @@ -48,7 +48,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_pascal_env.sh INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}/dha_with_half # Set to the preferred build directory -BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-half +BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-dha-half # Update the location of external packages source ${INSTALL_PREFIX_EXTERNALS}/logs/lbann_sb_suggested_cmake_prefix_path.sh diff --git a/scripts/superbuild/ci/ci_pascal_env.sh b/scripts/superbuild/ci/ci_pascal_env.sh index 54b7a0537a..1dd7c48d67 100644 --- a/scripts/superbuild/ci/ci_pascal_env.sh +++ b/scripts/superbuild/ci/ci_pascal_env.sh @@ -41,6 +41,9 @@ CUDA_GPU_ARCH=60 INSTALL_ROOT=/usr/workspace/lbann/ci_stable_dependencies/pascal/cuda-11.8.0 INSTALL_PREFIX_EXTERNALS=${INSTALL_ROOT}/openmpi-4.1.2 +# Use an accessible build directory so that the source files are preserved for debuggin +BUILD_ROOT=/usr/workspace/lbann/ci_stable_dependencies/.build/tioga/${PE_ENV_lc}/${ROCM_VER} + # Location of external packages export CMAKE_PREFIX_PATH=${INSTALL_ROOT}/cudnn-8.9.4:${INSTALL_ROOT}/nccl-2.19.4:${INSTALL_ROOT}/../../cutensor-2.0.1.2/libcutensor-linux-x86_64-2.0.1.2-archive CMAKE_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}