Update meson.yml

ralna · Jan 12, 2024 · b80d30b · b80d30b
1 parent 35f9eac
commit b80d30b
Showing 1 changed file with 32 additions and 23 deletions.
diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
@@ -66,21 +66,24 @@ jobs:
         run: |
           cd $DEPS
           mkdir deps
+          PLATFORM=""
+          if [[ "${{matrix.os}}" == "ubuntu-latest" ]]; then
+            PLATFORM="x86_64-linux-gnu"
+          fi
+          if [[ "${{matrix.os}}" == "macos-latest" ]]; then
+            PLATFORM=x86_64-apple-darwin""
+          fi
+          if [[ "${{matrix.os}}" == "windows-latest" ]]; then
+            PLATFORM="x86_64-w64-mingw32"
+            choco install wget
+          fi
           if [[ "${{matrix.int64}}" == "true" ]]; then
-            PLATFORM=""
-            if [[ "${{matrix.os}}" == "ubuntu-latest" ]]; then
-              PLATFORM="x86_64-linux-gnu"
-            fi
-            if [[ "${{matrix.os}}" == "macos-latest" ]]; then
-              PLATFORM=x86_64-apple-darwin""
-            fi
-            if [[ "${{matrix.os}}" == "windows-latest" ]]; then
-              PLATFORM="x86_64-w64-mingw32"
-              choco install wget
-            fi
             wget https://github.com/JuliaBinaryWrappers/OpenBLAS_jll.jl/releases/download/OpenBLAS-v0.3.26%2B0/OpenBLAS.v0.3.26.$PLATFORM-libgfortran5.tar.gz
             tar -xzvf OpenBLAS.v0.3.26.$PLATFORM-libgfortran5.tar.gz -C deps
-          fi
+          else
+            wget https://github.com/JuliaBinaryWrappers/OpenBLAS32_jll.jl/releases/download/OpenBLAS32-v0.3.26%2B0/OpenBLAS32.v0.3.26.$PLATFORM-libgfortran5.tar.gz
+            tar -xzvf OpenBLAS32.v0.3.26.$PLATFORM-libgfortran5.tar.gz -C deps
+          end
 
       - name: Set the environment variable LD_LIBRARY_PATH
         if: matrix.os != 'windows-latest'
@@ -117,28 +120,34 @@ jobs:
           CPPSTD="c++11"
           INT64="false"
           SSIDS="false"
+          BLAS="openblas"
+          LAPACK="openblas"
           if [[ "${{matrix.compiler}}" == "nvidia-hpc" ]]; then
             CSTD="none"
             CPPSTD="none"
           fi
           if [[ "${{matrix.int64}}" == "true" ]]; then
             INT64="true"
+            BLAS="openblas64_"
+            LAPACK="openblas64_"
           fi
           if [[ "${{matrix.compiler}}" == "nvidia-hpc" || ( "${{matrix.compiler}}" == "intel" && "${{matrix.os}}" == "windows-latest" ) ]]; then
             SSIDS="false"
           fi
 
-          if [[ "${{matrix.int64}}" == "true" ]]; then
-            meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true -Dssids=$SSIDS \
-                                 --prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true \
-                                 -Dgalahad_int64=$INT64 -Dc_std=$CSTD -Dcpp_std=$CPPSTD \
-                                 -Dlibblas_path=$DEPS/deps/$LIBDIR -Dliblapack_path=$DEPS/deps/$LIBDIR \
-                                 -Dlibblas=openblas64_ -Dliblapack=openblas64_
-          else
-            meson setup builddir --buildtype=debug -Dexamples=true -Dtests=true -Dssids=$SSIDS \
-                                 --prefix=$GITHUB_WORKSPACE/galahad -Dpythoniface=true \
-                                 -Dgalahad_int64=$INT64 -Dc_std=$CSTD -Dcpp_std=$CPPSTD
-          fi
+          meson setup builddir --buildtype=debug \
+                               --prefix=$GITHUB_WORKSPACE/galahad \
+                               -Dc_std=$CSTD \
+                               -Dcpp_std=$CPPSTD \
+                               -Dexamples=true \
+                               -Dtests=true \
+                               -Dssids=$SSIDS \
+                               -Dpythoniface=true \
+                               -Dgalahad_int64=$INT64 \
+                               -Dlibblas_path=$DEPS/deps/$LIBDIR \
+                               -Dliblapack_path=$DEPS/deps/$LIBDIR \
+                               -Dlibblas=$BLAS \
+                               -Dliblapack=$LAPACK
 
       - name: Build GALAHAD
         shell: bash