Update dockerfile conda action

geodynamics · Jun 18, 2024 · 1c1ca67 · 1c1ca67
1 parent ca2f909
commit 1c1ca67
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -118,6 +118,8 @@ jobs:
         activate-environment: radev
         environment-file: environment.yml
         channel-priority: strict
+        auto-update-conda: true
+        miniconda-version: "latest"
     - name: Build documentation
       continue-on-error: true
       run: |
@@ -126,7 +128,6 @@ jobs:
     - name: Build Rayleigh
       run: |
         cd "$GITHUB_WORKSPACE"
-        export MKLROOT=$CONDA_PREFIX
-        ./configure -conda-mkl --FC=mpifort --FFLAGS_DBG='-O0 -g -fbounds-check -ffpe-trap=invalid,zero,overflow -fbacktrace -ffixed-line-length-132 -Wall'
+        ./configure --openblas --FC=mpifort --FFLAGS_DBG='-O0 -g -fbounds-check -ffpe-trap=invalid,zero,overflow -fbacktrace -ffixed-line-length-132 -Wall'
         make -j
         make install
diff --git a/configure b/configure
@@ -833,13 +833,23 @@ then
 fi
 echo " Include flags              :  "$RAYLEIGH_INC
 echo ""
+
+###############################################################################################
+# Standard LIBRARIES
+if [[ $OSTYPE == *"darwin"* ]]
+then
+    STD_FLAGS="-lc++"
+else
+    STD_FLAGS="-lstdc++"
+fi
+
 ###############################################################################################
 # BLAS, LAPACK, and FFTW LIBRARIES
 if [[ $USE_MKL == "TRUE" ]]
 then
     if [[ $FVERSION == "INTEL" ]]
     then
-        LIB_FLAGS="-mkl -lstdc++"
+        MKL_LIB="-mkl"
     fi
     if [[ $FVERSION == "GNU" || $FVERSION == "AOCC" ]]
     then
@@ -848,24 +858,22 @@ then
             if [[ $OSTYPE == *"darwin"* ]]
             then
                 MKL_LIB="-L${RAMKLROOT}/lib -Wl,-rpath,${MKLROOT}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
-                LIB_FLAGS="\$(MKL_LIB) -lc++"
-                FULL_LIB="-L${RAMKLROOT}/lib -Wl,-rpath,${MKLROOT}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl -lc++"
+                FULL_LIB="-L${RAMKLROOT}/lib -Wl,-rpath,${MKLROOT}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ${STD_FLAGS}"
             else
                 MKL_LIB="-L${RAMKLROOT}/lib -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
-                LIB_FLAGS="\$(MKL_LIB) -lstdc++"
-                FULL_LIB="-L${RAMKLROOT}/lib -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl -lstdc++"
+                FULL_LIB="-L${RAMKLROOT}/lib -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ${STD_FLAGS}"
             fi
         elif [[ $DEBIANMKL == "TRUE" ]]
         then
             MKL_LIB="-Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
-            LIB_FLAGS="\$(MKL_LIB) -lstdc++"
-            FULL_LIB="-Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl -lstdc++"
+            FULL_LIB="-Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ${STD_FLAGS}"
         else
             MKL_LIB="-L${RAMKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
-            LIB_FLAGS="\$(MKL_LIB) -lstdc++"
-            FULL_LIB="-L${RAMKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl -lstdc++"
+            FULL_LIB="-L${RAMKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl ${STD_FLAGS}"
         fi
     fi
+
+    LIB_FLAGS="\$(MKL_LIB) ${STD_FLAGS}"
 else
 
     #WE NEED TO RUN CHECKS HERE
@@ -904,8 +912,8 @@ else
         FFTWLINK="-L$FFTWROOT/lib -lfftw3"
     fi
 
-    LIB_FLAGS="\$(LAPACKLINK) \$(FFTWLINK) \$(BLASLINK) -lstdc++"
-    FULL_LIB="$LAPACKLINK $FFTWLINK $BLASLINK -lstdc++"
+    LIB_FLAGS="\$(LAPACKLINK) \$(FFTWLINK) \$(BLASLINK) \$(STD_FLAGS)"
+    FULL_LIB="$LAPACKLINK $FFTWLINK $BLASLINK $STD_FLAGS"
 fi
 
 if [ "$CUSTOMLIB" == "TRUE" ]

diff --git a/environment.yml b/environment.yml
@@ -17,11 +17,11 @@ dependencies:
   - sphinx=4.0
   - sphinxcontrib-bibtex=2.2
   - nbsphinx=0.8
-  - pandoc=2.13
+  - pandoc=3.2
   - recommonmark=0.7
   - sphinx-book-theme
   - compilers=1.4.2
-  - mkl=2020.4
+  - openblas=0.3.25
   - fftw=3.3
   - mpich=3.4
   - funcsigs=1.0

diff --git a/environment_doc.yml b/environment_doc.yml
@@ -14,7 +14,7 @@ dependencies:
   - sphinx=4.0
   - sphinxcontrib-bibtex=2.2
   - nbsphinx=0.8
-  - pandoc=2.13
+  - pandoc=3.2
   - recommonmark=0.7
   - sphinx-book-theme
   - funcsigs=1.0