Updated the build path so that the source files can be saved for debu…

…gging.
LLNL · Jun 26, 2024 · 371eb4b · 371eb4b
1 parent 534dfd5
commit 371eb4b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/scripts/superbuild/ci/ci_pascal_env.sh b/scripts/superbuild/ci/ci_pascal_env.sh
@@ -26,10 +26,10 @@
 
 # Improve debugging info and remove some misguided warnings. These are
 # passed only to the LBANN stack.
-EXTRA_CXX_FLAGS="-O2 -g -Wno-deprecated-declarations"
+EXTRA_CXX_FLAGS="-O2 -g3 -Wno-deprecated-declarations"
 #EXTRA_CXX_FLAGS="-g3 -Wno-deprecated-declarations"
 #EXTRA_CUDA_FLAGS="-g3 -Wno-deprecated-declarations"
-EXTRA_CUDA_FLAGS="-O2 -g -Wno-deprecated-declarations"
+EXTRA_CUDA_FLAGS="-O2 -g3 -Wno-deprecated-declarations"
 
 # Prefer RPATH to RUNPATH (stability over flexibility)
 EXTRA_LINK_FLAGS="-fuse-ld=gold -Wl,--disable-new-dtags"

diff --git a/scripts/superbuild/ci/ci_tioga_core_dependencies.sh b/scripts/superbuild/ci/ci_tioga_core_dependencies.sh
@@ -56,7 +56,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_tioga_env.sh
 INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}
 
 # Set to the preferred build directory
-BUILD_DIR=${TMPDIR}/lbann-superbuild-core-dependencies-${PE_ENV_lc}-${ROCM_VER}
+BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-core-dependencies-${PE_ENV_lc}-${ROCM_VER}
 
 cmake \
     -G Ninja \

diff --git a/scripts/superbuild/ci/ci_tioga_dha.sh b/scripts/superbuild/ci/ci_tioga_dha.sh
@@ -60,7 +60,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_tioga_env.sh
 INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}/dha
 
 # Set to the preferred build directory
-BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-${PE_ENV_lc}-${ROCM_VER}
+BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-dha-${PE_ENV_lc}-${ROCM_VER}
 
 # 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_tioga_dha_distconv.sh b/scripts/superbuild/ci/ci_tioga_dha_distconv.sh
@@ -60,7 +60,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_tioga_env.sh
 INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}/dha_with_distconv
 
 # Set to the preferred build directory
-BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-distconv-${PE_ENV_lc}-${ROCM_VER}
+BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-dha-distconv-${PE_ENV_lc}-${ROCM_VER}
 
 # 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_tioga_env.sh b/scripts/superbuild/ci/ci_tioga_env.sh
@@ -26,8 +26,8 @@
 
 # Improve debugging info and remove some misguided warnings. These are
 # passed only to the LBANN stack.
-EXTRA_CXX_FLAGS="-O2 -g -Wno-deprecated-declarations"
-EXTRA_HIP_FLAGS="-O2 -g -Wno-deprecated-declarations"
+EXTRA_CXX_FLAGS="-O2 -g3 -Wno-deprecated-declarations"
+EXTRA_HIP_FLAGS="-O2 -g3 -Wno-deprecated-declarations"
 
 # Prefer RPATH to RUNPATH (stability over flexibility)
 EXTRA_LINK_FLAGS="-fuse-ld=lld -Wl,--disable-new-dtags"
@@ -41,9 +41,12 @@ AMD_GPU_ARCH=gfx90a,gfx942
 #INSTALL_PREFIX=${PWD}/install-rocm-distconv
 ROCM_VER=$(basename ${ROCM_PATH})
 PE_ENV_lc=$(echo "${PE_ENV}" | tr '[:upper:]' '[:lower:]')
-INSTALL_ROOT=/usr/workspace/lbann/ci_stable_dependencies/tioga/${PE_ENV_lc}//${ROCM_VER}
+INSTALL_ROOT=/usr/workspace/lbann/ci_stable_dependencies/tioga/${PE_ENV_lc}/${ROCM_VER}
 INSTALL_PREFIX_EXTERNALS=${INSTALL_ROOT}/cray-mpich-8.1.29/
 
+# 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=/p/vast1/lbann/stable_dependencies/tioga/rocm-6.1.0/miopen
 CMAKE_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}

diff --git a/scripts/superbuild/ci/ci_tioga_lbann.sh b/scripts/superbuild/ci/ci_tioga_lbann.sh
@@ -87,7 +87,7 @@ source ${SUPERBUILD_SRC_DIR}/ci/ci_tioga_env.sh
 #INSTALL_PREFIX=${INSTALL_PREFIX_EXTERNALS}/dha
 
 # Set to the preferred build directory
-BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-lbann-${PE_ENV_lc}-${ROCM_VER}
+BUILD_DIR=${BUILD_ROOT}/lbann-superbuild-dha-lbann-${PE_ENV_lc}-${ROCM_VER}
 
 # Set to the preferred install directory
 INSTALL_PREFIX=${LBANN_SRC_DIR}/superbuild/install_${ROCM_VER}