Skip to content

Commit

Permalink
Fix how the CMAKE_PREFIX_PATH is forwarded to DHA libraries.
Browse files Browse the repository at this point in the history
  • Loading branch information
bvanessen committed Jun 17, 2024
1 parent e9f166a commit 518e8ef
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion scripts/superbuild/ci/ci_pascal_core_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ cmake \
-S ${SUPERBUILD_SRC_DIR} \
-B ${BUILD_DIR} \
\
-D CMAKE_PREFIX_PATH=${FWD_CMAKE_PREFIX_PATH} \
-D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
\
Expand Down
5 changes: 3 additions & 2 deletions scripts/superbuild/ci/ci_pascal_dha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,15 @@ BUILD_DIR=${TMPDIR}/lbann-superbuild-dha
# Update the location of external packages
source ${INSTALL_PREFIX_EXTERNALS}/logs/lbann_sb_suggested_cmake_prefix_path.sh
export CMAKE_PREFIX_PATH=${INSTALL_PREFIX}/half-2.1.0:${CMAKE_PREFIX_PATH}
FWD_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}
CMAKE_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}
FWD_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/|}

cmake \
-G Ninja \
-S ${SUPERBUILD_SRC_DIR} \
-B ${BUILD_DIR} \
\
-D CMAKE_PREFIX_PATH=${FWD_CMAKE_PREFIX_PATH} \
-D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
\
Expand Down
5 changes: 3 additions & 2 deletions scripts/superbuild/ci/ci_pascal_dha_distconv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,15 @@ BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-distconv

# Update the location of external packages
source ${INSTALL_PREFIX_EXTERNALS}/logs/lbann_sb_suggested_cmake_prefix_path.sh
FWD_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}
CMAKE_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}
FWD_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/|}

cmake \
-G Ninja \
-S ${SUPERBUILD_SRC_DIR} \
-B ${BUILD_DIR} \
\
-D CMAKE_PREFIX_PATH=${FWD_CMAKE_PREFIX_PATH} \
-D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
\
Expand Down
5 changes: 3 additions & 2 deletions scripts/superbuild/ci/ci_pascal_dha_half.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,15 @@ BUILD_DIR=${TMPDIR}/lbann-superbuild-dha-half
# Update the location of external packages
source ${INSTALL_PREFIX_EXTERNALS}/logs/lbann_sb_suggested_cmake_prefix_path.sh
export CMAKE_PREFIX_PATH=${INSTALL_PREFIX}/half-2.1.0:${CMAKE_PREFIX_PATH}
FWD_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}
CMAKE_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/;}
FWD_CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH//:/|}

cmake \
-G Ninja \
-S ${SUPERBUILD_SRC_DIR} \
-B ${BUILD_DIR} \
\
-D CMAKE_PREFIX_PATH=${FWD_CMAKE_PREFIX_PATH} \
-D CMAKE_PREFIX_PATH=${CMAKE_CMAKE_PREFIX_PATH} \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
\
Expand Down

0 comments on commit 518e8ef

Please sign in to comment.