From 10449db11ebe1a8bb4e68344ceb645873c2f977c Mon Sep 17 00:00:00 2001 From: Jonas Schwab Date: Tue, 14 Jun 2022 11:27:04 +0200 Subject: [PATCH 1/4] configure.sh: Fix check_libs to work with zsh and reenable it --- configure.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.sh b/configure.sh index dd4380fe..b6bd04c1 100755 --- a/configure.sh +++ b/configure.sh @@ -67,17 +67,17 @@ set_hdf5_flags() check_libs() { FC="$1" LIBS="$2" - COMPILE="$FC check_libs.f90 $LIBS -o check_libs.out" if command -v "$FC" > /dev/null; then # Calling the compiler is successful - if $COMPILE; then # Compiling with $LIBS is successful - ./check_libs.out - else - printf "${RED}\n==== Error: Linear algebra libraries <%s> not found. ====${NC}\n\n" "$LIBS" - return 1 - fi + bash -c "$FC check_libs.f90 $LIBS -o check_libs.out" + if [ $? -eq 0 ]; then # Compiling with $LIBS is successful + ./check_libs.out + else + printf "${RED}\n==== Error: Linear algebra libraries <%s> not found. ====${NC}\n\n" "$LIBS" + return 1 + fi else - printf "${RED}\n==== Error: Compiler <%s> not found. ====${NC}\n\n" "$FC" - return 1 + printf "${RED}\n==== Error: Compiler <%s> not found. ====${NC}\n\n" "$FC" + return 1 fi } @@ -327,7 +327,7 @@ case $MACHINE in ;; esac -# check_libs "$ALF_FC" "${LIB_BLAS_LAPACK}" || return 1 +check_libs "$ALF_FC" "${LIB_BLAS_LAPACK}" || return 1 check_python || return 1 -- GitLab From 0b6fcce5a397dc07d9137ddb44a404ba23c8b62e Mon Sep 17 00:00:00 2001 From: Jonas Schwab Date: Tue, 21 Jun 2022 10:30:17 +0200 Subject: [PATCH 2/4] configure.sh: Replace bash with sh in check_libs --- configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.sh b/configure.sh index b6bd04c1..537e733e 100755 --- a/configure.sh +++ b/configure.sh @@ -68,7 +68,7 @@ check_libs() { FC="$1" LIBS="$2" if command -v "$FC" > /dev/null; then # Calling the compiler is successful - bash -c "$FC check_libs.f90 $LIBS -o check_libs.out" + sh -c "$FC check_libs.f90 $LIBS -o check_libs.out" if [ $? -eq 0 ]; then # Compiling with $LIBS is successful ./check_libs.out else -- GitLab From 16589b4d3478a5c199055815972b5181e5cd45ab Mon Sep 17 00:00:00 2001 From: Jonas Schwab Date: Tue, 21 Jun 2022 11:16:39 +0200 Subject: [PATCH 3/4] check for successful execution of check_libs.out --- configure.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.sh b/configure.sh index 537e733e..03b0a008 100755 --- a/configure.sh +++ b/configure.sh @@ -67,10 +67,14 @@ set_hdf5_flags() check_libs() { FC="$1" LIBS="$2" - if command -v "$FC" > /dev/null; then # Calling the compiler is successful + if command -v "$FC" > /dev/null; then # Compiler binary found sh -c "$FC check_libs.f90 $LIBS -o check_libs.out" if [ $? -eq 0 ]; then # Compiling with $LIBS is successful - ./check_libs.out + ./check_libs.out || ( + printf "${RED}\n==== Error: Execution of test program using compiler <%s> ====${NC}\n" "$FC" + printf "${RED}==== and linear algebra libraries <%s> not successful. ====${NC}\n\n" "$LIBS" + return 1 + ) else printf "${RED}\n==== Error: Linear algebra libraries <%s> not found. ====${NC}\n\n" "$LIBS" return 1 -- GitLab From ad7c8d12fe9cc69ac476771adfd958da7526e73a Mon Sep 17 00:00:00 2001 From: "Jefferson Stafusa E. Portela" Date: Fri, 24 Jun 2022 10:32:32 +0000 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dc59f80..7181b5b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Log of backward compatibility changes and critical bugs +## 2022-06-24 Test in configure.sh for Lapack and BLAS + +Author : J. S.E. Portela
+Merge request !145 + ## 2022-MM-DD Write parameters to HDF5 file Author : J.Schwab
-- GitLab