Merge branch 'AMReX-Codes:development' into development

ruohai0925 · Jun 16, 2024 · 7229642 · 7229642
2 parents 5f8663f + 1f038e7
commit 7229642
Show file tree

Hide file tree

Showing 49 changed files with 5,004 additions and 493 deletions.
diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml
@@ -102,6 +102,61 @@ jobs:
         ccache -s
         du -hs ~/.cache/ccache
 
+  pyamrex:
+    name: pyamrex
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Checkout pyamrex
+      uses: actions/checkout@v4
+      with:
+        repository: 'AMReX-Codes/pyamrex'
+        ref: 'development'
+        path: 'pyamrex'
+    - name: Dependencies
+      run: |
+        .github/workflows/dependencies/dependencies.sh
+        .github/workflows/dependencies/dependencies_ccache.sh
+    - name: Set Up Cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/ccache
+        key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
+        restore-keys: |
+             ccache-${{ github.workflow }}-${{ github.job }}-git-
+    - name: Build, Install & Test
+      run: |
+        export CCACHE_COMPRESS=1
+        export CCACHE_COMPRESSLEVEL=10
+        export CCACHE_MAXSIZE=400M
+        export CCACHE_LOGFILE=${{ github.workspace }}/ccache.log.txt
+        ccache -z
+
+        python3 -m pip install -U pip setuptools wheel
+        python3 -m pip install -U cmake
+        python3 -m pip install -U pandas pytest mpi4py
+
+        export AMREX_HOME=${PWD}
+        cd pyamrex
+
+        cmake -S . -B build               \
+              -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+              -DCMAKE_VERBOSE_MAKEFILE=ON \
+              -DBUILD_SHARED_LIBS=ON      \
+              -DpyAMReX_amrex_src=${AMREX_HOME} \
+              -DAMReX_MPI=ON              \
+              -DAMReX_SPACEDIM="1;2;3"
+        cmake --build build --target pip_install -j 4
+
+        ctest --test-dir build --output-on-failure
+
+        sudo cp build/lib/libamrex_*.so /usr/lib/
+        rm -rf build
+        python3 -m pytest tests
+
+        ccache -s
+        du -hs ~/.cache/ccache
+
   save_pr_number:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -125,7 +125,7 @@ jobs:
         set +e
         source /opt/intel/oneapi/setvars.sh --include-intel-llvm
         set -e
-        # Test is disabled due to a compiler issue with some math functions.
+        # WATCH: Test is disabled due to a compiler issue with some math functions.
         # The fix did not make it to the next oneAPI release. So we will
         # enable it again after the next next oneAPI release.
         cmake -S . -B build                                \

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -81,8 +81,13 @@ jobs:
         #$Env:CCACHE_MAXSIZE='135M'
         #ccache -z
 
+        # -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" `
+        # is a workaround github windows runner 20240603.1.0.
+        # https://github.com/actions/runner-images/issues/10004
+
         cmake -S . -B build   `
               -DCMAKE_VERBOSE_MAKEFILE=ON   `
+              -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" `
               -DAMReX_EB=ON                 `
               -DAMReX_ENABLE_TESTS=ON       `
               -DAMReX_FORTRAN=OFF           `
@@ -97,7 +102,7 @@ jobs:
 
   # Build libamrex and all tests
   tests_clang:
-    name: Clang C++17 w/o Fortran w/o MPI
+    name: MSVC Clang C++17 w/o Fortran w/o MPI
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
@@ -108,10 +113,15 @@ jobs:
         CMAKE_GENERATOR_TOOLSET: "ClangCl"
         CMAKE_GENERATOR: "Visual Studio 17 2022"
       run: |
+        # -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" `
+        # is a workaround github windows runner 20240603.1.0.
+        # https://github.com/actions/runner-images/issues/10004
+
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64
         cmake -S . -B build   ^
               -DBUILD_SHARED_LIBS=ON        ^
               -DCMAKE_VERBOSE_MAKEFILE=ON   ^
+              -DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" ^
               -DAMReX_EB=ON                 ^
               -DAMReX_ENABLE_TESTS=ON       ^
               -DAMReX_FORTRAN=OFF           ^