merge

Alpine-DAV · Dec 12, 2024 · bf9c744 · bf9c744
2 parents 6ebf72a + 6dec0a2
commit bf9c744
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/build_ascent_gcc.yml b/.github/workflows/build_ascent_gcc.yml
@@ -46,6 +46,12 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: 'recursive'
+    - name: Env Info
+      run: |
+        echo "**** Env Info"
+        cmake --version
+        gcc --version
+        which mpicc
     - name: Build TPLs
       run: |
         env enable_mpi=ON \
@@ -58,7 +64,6 @@ jobs:
             ./scripts/build_ascent/build_ascent.sh
     - name: Configure Ascent
       run: |
-        cmake --version
         echo "**** Configuring Ascent"
         cmake -S src -B build -C ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install
     - name: Build Ascent
@@ -121,6 +126,12 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: 'recursive'
+    - name: Env Info
+      run: |
+        echo "**** Env Info"
+        cmake --version
+        gcc --version
+        which mpicc
     - name: Build TPLs
       run: |
         env enable_mpi=ON \
@@ -134,7 +145,6 @@ jobs:
             ./scripts/build_ascent/build_ascent.sh
     - name: Configure Ascent
       run: |
-        cmake --version
         echo "**** Configuring Ascent"
         cmake -S src -B build -C ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install
     - name: Build Ascent

diff --git a/.github/workflows/build_ascent_hip.yml b/.github/workflows/build_ascent_hip.yml
@@ -8,7 +8,7 @@ jobs:
   build_cuda:
     name: Build Ascent HIP
     runs-on: ubuntu-20.04
-    container: alpinedav/ascent-devel:ubuntu-20.04-rocm-6.3.0-devel
+    container: alpinedav/ascent-devel:ubuntu-20.04-rocm-6.3.0-x86_64
     env:
       CMAKE_VERSION: 3.23.2
     steps:

diff --git a/scripts/build_ascent/build_ascent.sh b/scripts/build_ascent/build_ascent.sh
@@ -841,7 +841,7 @@ fi # build_umpire
 ################
 # MFEM
 ################
-mfem_version=4.6
+mfem_version=4.7
 mfem_src_dir=$(ospath ${source_dir}/mfem-${mfem_version})
 mfem_build_dir=$(ospath ${build_dir}/mfem-${mfem_version})
 mfem_install_dir=$(ospath ${install_dir}/mfem-${mfem_version}/)