Merge branch 'AMReX-Codes:development' into eyoo/multicuts

ejyoo921 · Jul 2, 2024 · ac65ec6 · ac65ec6
2 parents fb5c787 + 39f46ae
commit ac65ec6
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 7 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set Up Cache
       uses: actions/cache@v4
       with:
-        path: /Users/runner/Library/Caches/ccache
+        path: ~/Library/Caches/ccache
         key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
         restore-keys: |
              ccache-${{ github.workflow }}-${{ github.job }}-git-
@@ -31,8 +31,10 @@ jobs:
       run: |
         export CCACHE_COMPRESS=1
         export CCACHE_COMPRESSLEVEL=10
-        export CCACHE_MAXSIZE=30M
+        export CCACHE_MAXSIZE=50M
+        export CCACHE_SLOPPINESS=time_macros
         ccache -z
+        ccache --version
 
         cmake -S . -B build             \
             -DBUILD_SHARED_LIBS=ON      \
@@ -46,6 +48,7 @@ jobs:
 
         ctest --test-dir build --output-on-failure
 
+        du -hs ~/Library/Caches/ccache
         ccache -s
 
   # Build libamrex and all tests
@@ -59,7 +62,7 @@ jobs:
     - name: Set Up Cache
       uses: actions/cache@v4
       with:
-        path: /Users/runner/Library/Caches/ccache
+        path: ~/Library/Caches/ccache
         key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
         restore-keys: |
              ccache-${{ github.workflow }}-${{ github.job }}-git-
@@ -71,7 +74,9 @@ jobs:
         export CCACHE_COMPRESS=1
         export CCACHE_COMPRESSLEVEL=10
         export CCACHE_MAXSIZE=160M
+        export CCACHE_SLOPPINESS=time_macros
         ccache -z
+        ccache --version
 
         cmake -S . -B build             \
             -DCMAKE_BUILD_TYPE=Debug    \
@@ -84,6 +89,7 @@ jobs:
 
         ctest --test-dir build --output-on-failure
 
+        du -hs ~/Library/Caches/ccache
         ccache -s
 
   save_pr_number:

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,56 @@
+# 24.07
+
+  -- HDF5: Correctly handle writing only some components when writing Particle (#4005)
+
+  -- HDF5: Correctly choose datatype of plotfile based on RD numBytes (#4006)
+
+  -- Fix L2 norms in C_util/Convergence codes (#4009)
+
+  -- Match the dimensions of reqd_work_group_size to submitted nd_range (#4002)
+
+  -- GNU Make: try nvidia-smi for CUDA arch if deviceQuery fails (#3997)
+
+  -- Sundials Update (#3984)
+
+  -- Derive: Add MultiFab version of DeriveFunc (#3990)
+
+  -- GNU Make: Add support for CUDA LTO (#3993)
+
+  -- Bottom Solver: Keep the unconverged result if it's an improvement (#3991)
+
+  -- Multi-level composite solver using hypre (#3987)
+     Workaround std::exclusive_scan issue with old compilers (#3996)
+
+  -- TableData: Add support for row-major order (amrex::Order::C) (#3973)
+
+  -- Avoid self copy in MultiFab::Copy (#3986)
+
+  -- Convert IntVect to IntVectND (#3969)
+
+  -- GNU Make: Don't replace -I with -isystem for MPI include paths (#3985)
+
+  -- Add pyamrex CI (#3967)
+
+  -- const auto ptd -> const auto& ptd (#3983)
+
+  -- Fix ctests with HIP (#3982)
+
+  -- Add TupleSplit (#3978)
+
+  -- use HIP stream-ordered allocator (#3980)
+
+  -- Add structured binding support to GpuTuple (#3977)
+
+  -- New FillPatch function: FillPatchNLevels (#3974)
+
+  -- Update GNUmake files for NREL machines. (#3975)
+
+  -- SYCL for Nvidia: Re-enable CI without tests (#3971)
+
+  -- Skip empty particle tiles in operator++ to avoid race condition in constructor. (#3951)
+
+  -- adding physical and math BC types for inflow-outflow BCs (#3965)
+
 # 24.06
 
   -- add missing AMReX_SUNDIALS in AMReXConfig.cmake (#3962)

diff --git a/Src/Base/AMReX_Tuple.H b/Src/Base/AMReX_Tuple.H
@@ -472,12 +472,12 @@ auto tupleToArray (GpuTuple<T> const& tup)
     return GpuArray<T,1>{amrex::get<0>(tup)};
 }
 
-//! Convert GpuTuple<T,Ts...> to GpuArray
-template <typename T, typename... Ts, std::enable_if_t<Same<T,Ts...>::value, int> = 0>
+//! Convert GpuTuple<T,T2,Ts...> to GpuArray
+template <typename T, typename T2, typename... Ts, std::enable_if_t<Same<T,T2,Ts...>::value, int> = 0>
 AMREX_GPU_HOST_DEVICE constexpr
-auto tupleToArray (GpuTuple<T,Ts...> const& tup)
+auto tupleToArray (GpuTuple<T,T2,Ts...> const& tup)
 {
-    return detail::tuple_to_array_helper(tup, std::index_sequence_for<T,Ts...>{});
+    return detail::tuple_to_array_helper(tup, std::index_sequence_for<T,T2,Ts...>{});
 }
 
 } // namespace amrex