Skip to content

Commit cfd4695

Browse files
committed
fix a couple of issues
1 parent a58647a commit cfd4695

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

.github/workflows/continuousIntegration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ jobs:
227227
env:
228228
DOCKER_REPOSITORY: geosx/ubuntu:24.04-gcc-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
229229
HOST_CONFIG: hostconfigs/environment.cmake
230-
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/g++
231-
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/gcc
230+
CMAKE_CXX_COMPILER: /usr/bin/g++
231+
CMAKE_C_COMPILER: /usr/bin/gcc
232232
CMAKE_BUILD_TYPE: Debug
233233
BUILD_AND_TEST_ARGS: "--build-exe --code-coverage"
234234
run: ./scripts/ci_build_and_test.sh

scripts/ci_build_and_test_in_container.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
#!/bin/bash
22
env
33

4+
if [ -f /usr/lib64/libblas.so.3 ]; then
5+
BLAS_LIB=/usr/lib64/libblas.so.3
6+
LAPACK_LIB=/usr/lib64/liblapack.so.3
7+
elif [ -f /usr/lib/x86_64-linux-gnu/libblas.so ]; then
8+
BLAS_LIB=/usr/lib/x86_64-linux-gnu/libblas.so
9+
LAPACK_LIB=/usr/lib/x86_64-linux-gnu/liblapack.so
10+
else
11+
echo "BLAS/LAPACK not found"; exit 1
12+
fi
13+
414

515
# if [ -f /etc/os-release ]; then
616
# . /etc/os-release
@@ -17,6 +27,8 @@ env
1727
# exit 1
1828
# fi
1929

30+
31+
2032
# echo "Using package manager: $PACKAGE_MANAGER"
2133

2234
# if [ "$PACKAGE_MANAGER" == "apt" ]; then
@@ -62,7 +74,9 @@ or_die python3 scripts/config-build.py \
6274
-hc ${HOST_CONFIG} \
6375
-bt ${CMAKE_BUILD_TYPE} \
6476
-bp ${HPCREACT_BUILD_DIR} \
65-
-ip ${HPCREACT_INSTALL_DIR}\
77+
-ip ${HPCREACT_INSTALL_DIR} \
78+
-DBLAS_LIBRARIES=${BLAS_LIB} \
79+
-DLAPACK_LIBRARIES=${LAPACK_LIB} \
6680
-DENABLE_COVERAGE:BOOL=${ENABLE_COVERAGE}
6781

6882
or_die cd ${HPCREACT_BUILD_DIR}

0 commit comments

Comments
 (0)