Skip to content

Commit ba45d63

Browse files
authored
Merge branch 'development' into ice
2 parents 3e181f4 + 369afb6 commit ba45d63

File tree

288 files changed

+21289
-5494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+21289
-5494
lines changed

.clang-tidy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Checks: >
1919
-misc-include-cleaner,
2020
-misc-non-private-member-variables-in-classes,
2121
-misc-use-anonymous-namespace,
22+
-misc-use-internal-linkage,
2223
modernize-*,
2324
-modernize-avoid-c-arrays,
2425
-modernize-use-trailing-return-type,
@@ -29,12 +30,14 @@ Checks: >
2930
-readability-avoid-const-params-in-decls,
3031
-readability-braces-around-statements,
3132
-readability-else-after-return,
33+
-readability-enum-initial-value,
3234
-readability-function-cognitive-complexity,
3335
-readability-function-size,
3436
-readability-identifier-length,
3537
-readability-implicit-bool-conversion,
3638
-readability-isolate-declaration,
3739
-readability-magic-numbers,
40+
-readability-math-missing-parentheses,
3841
-readability-named-parameter,
3942
-readability-simplify-boolean-expr,
4043
mpi-*,

.github/workflows/burn_cell_metal_chem.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Compile
3232
run: |
3333
cd unit_test/burn_cell_metal_chem
34-
make -j 2
34+
make -j 4
3535
3636
- name: Run and compare outputs for different Z values, also including cosmic ray ionization
3737
run: |

.github/workflows/burn_cell_primordial_chem.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Compile and run
3232
run: |
3333
cd unit_test/burn_cell_primordial_chem
34-
make -j 2
34+
make -j 4
3535
./main1d.gnu.DEBUG.ex inputs_primordial_chem amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
3636
3737
- name: Print backtrace

.github/workflows/c-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: AMReX-Astro/cpp-linter-action@main
2727
with:
2828
build_path: 'unit_test/test_react'
29-
make_options: '-j 2 USE_OMP=FALSE USE_MPI=FALSE USE_CUDA=FALSE DEBUG=TRUE'
29+
make_options: '-j 4 USE_OMP=FALSE USE_MPI=FALSE USE_CUDA=FALSE DEBUG=TRUE'
3030
ignore_files: 'amrex|util/gcem'
3131
header_filter: '(/conductivity/|/constants/|/EOS/|/integration/|/interfaces/|/networks/|/neutrinos/|/nse_solver/|/opacity/|/rates/|/screening/|/util/|^\./).*\.H$'
3232
config_file: ${GITHUB_WORKSPACE}/.clang-tidy

.github/workflows/castro-development.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
export MICROPHYSICS_HOME=${PWD}
4848
4949
cd Castro/Exec/science/flame_wave/
50-
make -j2 CCACHE=ccache USE_MPI=FALSE
50+
make -j 4 CCACHE=ccache USE_MPI=FALSE
5151
5252
ccache -s
5353
du -hs ~/.cache/ccache
@@ -64,7 +64,7 @@ jobs:
6464
export MICROPHYSICS_HOME=${PWD}
6565
6666
cd Castro/Exec/science/subchandra/
67-
make -j2 CCACHE=ccache USE_MPI=FALSE
67+
make -j 4 CCACHE=ccache USE_MPI=FALSE
6868
6969
ccache -s
7070
du -hs ~/.cache/ccache

.github/workflows/castro.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
export MICROPHYSICS_HOME=${PWD}
5252
5353
cd Castro/Exec/science/flame_wave/
54-
make -j2 CCACHE=ccache USE_MPI=FALSE
54+
make -j 4 CCACHE=ccache USE_MPI=FALSE
5555
5656
ccache -s
5757
du -hs ~/.cache/ccache
@@ -68,7 +68,7 @@ jobs:
6868
export MICROPHYSICS_HOME=${PWD}
6969
7070
cd Castro/Exec/science/subchandra/
71-
make -j2 CCACHE=ccache USE_MPI=FALSE
71+
make -j 4 CCACHE=ccache USE_MPI=FALSE
7272
7373
ccache -s
7474
du -hs ~/.cache/ccache

.github/workflows/clang-tidy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
2727
- name: Install dependencies
2828
run: |
29-
.github/workflows/dependencies_clang-tidy-apt-llvm.sh 17
29+
.github/workflows/dependencies_clang-tidy-apt-llvm.sh 19
3030
3131
- name: Compile burn_cell_sdc
3232
run: |
3333
cd unit_test/burn_cell_sdc
34-
make USE_MPI=FALSE USE_CLANG_TIDY=TRUE CLANG_TIDY=clang-tidy-17 CLANG_TIDY_WARN_ERROR=TRUE -j 4
34+
make USE_MPI=FALSE USE_CLANG_TIDY=TRUE CLANG_TIDY=clang-tidy-19 CLANG_TIDY_WARN_ERROR=TRUE -j 4
3535

.github/workflows/cmake_build_cell_primordial_chem.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ jobs:
1818
run: |
1919
mkdir build && cd build
2020
cmake .. -DBUILD_UNIT_TEST=true -DBUILD_AMReX=true
21-
make -j2
21+
make -j 4
2222
ctest --output-on-failure

.github/workflows/cuda.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ jobs:
2626
cd ../..
2727
2828
- name: Dependencies
29-
run: .github/workflows/dependencies/dependencies_nvcc11.sh
29+
run: .github/workflows/dependencies/dependencies_nvcc.sh 11.7
3030

3131
- name: compile test_react (aprox13)
3232
run: |
3333
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
3434
cd unit_test/test_react
35-
make NETWORK_DIR=aprox13 USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 2
35+
make NETWORK_DIR=aprox13 USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4
3636
3737
- name: compile test_react (ignition_reaclib/URCA-simple)
3838
run: |
3939
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
4040
cd unit_test/test_react
4141
make realclean
42-
make NETWORK_DIR=ignition_reaclib/URCA-simple USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 2
42+
make NETWORK_DIR=ignition_reaclib/URCA-simple USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4
4343
4444
- name: compile test_nse_net (ase)
4545
run: |
4646
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
4747
cd unit_test/test_nse_net
48-
make USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 2
48+
make USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4

.github/workflows/dependencies/dependencies_hip.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/r
4040

4141
# we should not need to export HIP_PATH=/opt/rocm/hip with those installs
4242

43+
sudo apt-get clean
4344
sudo apt-get update
4445

4546
# Ref.: https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html#installing-development-packages-for-cross-compilation
@@ -56,7 +57,9 @@ sudo apt-get install -y --no-install-recommends \
5657
roctracer-dev \
5758
rocprofiler-dev \
5859
rocrand-dev \
59-
rocprim-dev
60+
rocfft-dev \
61+
rocprim-dev \
62+
rocsparse-dev
6063

6164
# hiprand-dev is a new package that does not exist in old versions
6265
sudo apt-get install -y --no-install-recommends hiprand-dev || true

0 commit comments

Comments
 (0)