Skip to content

Commit

Permalink
Merge branch 'AMReX-Codes:development' into eyoo/multicuts
Browse files Browse the repository at this point in the history
  • Loading branch information
ejyoo921 authored Aug 27, 2024
2 parents 2fd9f4d + df0d594 commit 11e7ddd
Show file tree
Hide file tree
Showing 217 changed files with 10,850 additions and 6,224 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/catalyst.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: 🐧 Catalyst

on: [push, pull_request]

concurrency:
group: ${{ github.ref }}-${{ github.head_ref }}-insituvis-catalyst
cancel-in-progress: true

jobs:
catalyst:
name: Catalyst
runs-on: ubuntu-22.04
if: github.event.pull_request.draft == false
env:
CXX: g++
CC: gcc
CMAKE_PREFIX_PATH: "/opt/conduit:/opt/catalyst"
container:
image: kitware/paraview:ci-catalyst-amrex-warpx-20240701
steps:
- uses: actions/checkout@v4
- name: Configure
run: |
cmake -S . -B build \
-DCMAKE_BUILD_TYPE=Debug \
-DAMReX_ENABLE_TESTS=ON \
-DAMReX_FORTRAN=OFF \
-DAMReX_CATALYST=ON \
-DAMReX_CONDUIT=ON
- name: Build
run: |
cmake --build build -j 4
47 changes: 47 additions & 0 deletions .github/workflows/clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,53 @@ jobs:
ccache -s
du -hs ~/.cache/ccache
tests_cxx20:
name: Clang C++20 [tests]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Dependencies
run: |
.github/workflows/dependencies/dependencies.sh
.github/workflows/dependencies/dependencies_clang.sh 15
.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
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor"}
run: |
export CCACHE_COMPRESS=1
export CCACHE_COMPRESSLEVEL=10
export CCACHE_MAXSIZE=100M
export CCACHE_EXTRAFILES=${{ github.workspace }}/.clang-tidy
export CCACHE_LOGFILE=${{ github.workspace }}/ccache.log.txt
ccache -z
mkdir build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DAMReX_EB=ON \
-DAMReX_ENABLE_TESTS=ON \
-DAMReX_FORTRAN=OFF \
-DAMReX_MPI=ON \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_C_COMPILER=$(which clang-15) \
-DCMAKE_CXX_COMPILER=$(which clang++-15) \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
make -j 4
ctest --output-on-failure
ccache -s
du -hs ~/.cache/ccache
# Build 2D libamrex with configure
configure-2d:
name: Clang NOMPI Release [configure 2D]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ jobs:
- name: Run tests
run: |
cd build
ctest --output-on-failure -R
ctest --output-on-failure
test_hdf5:
name: GNU@9.3 HDF5 I/O Test [tests]
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ jobs:
restore-keys: |
ccache-${{ github.workflow }}-${{ github.job }}-git-
- name: Build & Install
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor"}
# /tmp/icpx-2d34de0e47/global_vars-header-4390fb.h:25:36: error: zero size arrays are an extension [-Werror,-Wzero-length-array]
# 25 | const char* const kernel_names[] = {
# | ^
# 1 error generated.
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor -Wno-zero-length-array"}
run: |
export CCACHE_COMPRESS=1
export CCACHE_COMPRESSLEVEL=10
Expand Down Expand Up @@ -68,7 +72,11 @@ jobs:
restore-keys: |
ccache-${{ github.workflow }}-${{ github.job }}-git-
- name: Build & Install
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor"}
# /tmp/icpx-2d34de0e47/global_vars-header-4390fb.h:25:36: error: zero size arrays are an extension [-Werror,-Wzero-length-array]
# 25 | const char* const kernel_names[] = {
# | ^
# 1 error generated.
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor -Wno-zero-length-array"}
run: |
export CCACHE_COMPRESS=1
export CCACHE_COMPRESSLEVEL=10
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,17 @@ jobs:
cmake -S . -B build `
-DCMAKE_VERBOSE_MAKEFILE=ON `
-DCMAKE_BUILD_TYPE=RelWithDebInfo `
-DCMAKE_CXX_FLAGS=" /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR" `
-DAMReX_EB=ON `
-DAMReX_ENABLE_TESTS=ON `
-DAMReX_FORTRAN=OFF `
-DAMReX_MPI=OFF
#-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
cmake --build build --config RelWithDebInfo -j 4
cmake --build build -j 4
cmake --build build --config RelWithDebInfo --target install
cmake --build build --config RelWithDebInfo --target test_install
cmake --build build --target install
cmake --build build --target test_install
#ccache -s
Expand Down
67 changes: 67 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,70 @@
# 24.08

-- Catalyst support (#4011)

-- Fix typos in FaceDivFree interior interpolation. (#4048)

-- ParmParse: Read IntVect & RealVect from array (#4050)
ParmParse: Fix assertion in new queryarr for IntVect & RealVect (#4051)

-- IParser: Use long long int (#4046)

-- ParmParse: Math expression support (#4032)

-- AmrData: remove dependency on Fortran (#4049)

-- Remove reliance on managed memory in HDF5 mesh IO (#4047)

-- New Feature in MLEBNodeFDLaplacian: MultiFab sigma coefficient (#3968)

-- Nodal Solver: Use multi-color Gauss-Seidel on GPU (#4043)

-- Use reduction to compute min and max particle distances in NeighborParticles test. (#3212)

-- ParmParse: Refactoring II (#4035)

-- Fix deadlock for CUDA (#4044)

-- ParmParse: Refactoring (#4031)

-- MLMG: Keep ghost cell values in user's inputs (#4040)

-- Geometry: Fix operator>> (#4042)

-- FillPatch for Face Data: Fix Geometry used in creating mask (#4039)

-- Parser: Allow dots in variable names (#4038)

-- HDF5: Remove unnecessary casting (#4036)

-- HDF5: Fix chunking warning (#4033) (#4034)

-- New parameter amrex::init_snan (#4030)

-- Change the default max_grid_size in 3D on GPU from 32 to 64 (#4029)

-- GpuArray: add operator+= (#4028)

-- FPE traps: Add functions for enabling and disabling FPE traps (#4025)

-- HDF5: Correctly determine max_mfi_count (#4024)

-- HDF5: expose ZLIB compression without SZ or ZFP flags (#4015)

-- Hypre: Use Gpu::hypreSynchronize (#4022)

-- AmrMesh: add const to a few functions (#4021)

-- Convexify AMR data (#4013)

-- Fix BottomSolver::bicgcg (#4020)

-- Fix some warnings issued by Coverity (#4017)

-- convert IndexType to IndexTypeND (#3988)

-- Workaround MSVC issue in tupleToArray (#4000)

# 24.07

-- HDF5: Correctly handle writing only some components when writing Particle (#4005)
Expand Down
Loading

0 comments on commit 11e7ddd

Please sign in to comment.