Fixed how the lapack argument is passed to Hydrogen

LLNL · Aug 6, 2024 · 84de254 · 84de254
1 parent 47d9973
commit 84de254
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.gitlab/configure_deps.sh b/.gitlab/configure_deps.sh
@@ -1,9 +1,9 @@
 if [[ "$cluster" == "lassen" ]]
 then
-    hydrogen_lapack_opt="-D LBANN_SB_FWD_Hydrogen_BLA_VENDOR=IBMESSL"
-    dihydrogen_lapack_opt="-D LBANN_SB_FWD_DiHydrogen_BLA_VENDOR=IBMESSL"
-    # hydrogen_lapack_opt="-D LBANN_SB_FWD_Hydrogen_BLA_VENDOR=Generic"
-    # dihydrogen_lapack_opt="-D LBANN_SB_FWD_DiHydrogen_BLA_VENDOR=Generic"
+    # hydrogen_lapack_opt="-D LBANN_SB_FWD_Hydrogen_BLA_VENDOR=IBMESSL"
+    # dihydrogen_lapack_opt="-D LBANN_SB_FWD_DiHydrogen_BLA_VENDOR=IBMESSL"
+    hydrogen_lapack_opt="-D LBANN_SB_FWD_Hydrogen_BLA_VENDOR=Generic"
+    dihydrogen_lapack_opt="-D LBANN_SB_FWD_DiHydrogen_BLA_VENDOR=Generic"
 else
     hydrogen_lapack_opt=""
     dihydrogen_lapack_opt=""
@@ -57,6 +57,7 @@ cmake \
     -D LBANN_SB_FWD_Aluminum_CMAKE_PREFIX_PATH=${FWD_CMAKE_PREFIX_PATH} \
     \
     -D LBANN_SB_BUILD_Hydrogen=ON \
+    ${hydrogen_lapack_opt} \
     -D LBANN_SB_Hydrogen_CXX_FLAGS="${EXTRA_CXX_FLAGS}" \
     -D LBANN_SB_Hydrogen_HIP_FLAGS="${EXTRA_HIP_FLAGS}" \
     -D LBANN_SB_FWD_Hydrogen_Hydrogen_ENABLE_HALF=${build_half:-OFF} \

diff --git a/.gitlab/configure_lbann.sh b/.gitlab/configure_lbann.sh
@@ -1,3 +1,10 @@
+if [[ "$cluster" == "lassen" ]]
+then
+    # lbann_lapack_opt="-D LBANN_BLA_VENDOR=IBMESSL"
+    lbann_lapack_opt="-D LBANN_BLA_VENDOR=Generic"
+else
+    lbann_lapack_opt=""
+fi
 cmake -G Ninja \
       -S ${project_dir} \
       -B ${build_dir}/build-lbann \
@@ -26,6 +33,7 @@ cmake -G Ninja \
       -D CMAKE_EXPORT_COMPILE_COMMANDS=ON \
       -D CMAKE_CXX_FLAGS="${EXTRA_CXX_FLAGS}" \
       -D CMAKE_HIP_FLAGS="${EXTRA_HIP_FLAGS}" \
+      ${lbann_lapack_opt} \
       -D LBANN_DATATYPE=float \
       -D LBANN_WITH_CALIPER=OFF \
       -D LBANN_WITH_DISTCONV=${build_distconv:-OFF} \