Skip to content

Commit c5c741c

Browse files
zhichen3zhichen3
authored
Merge branch 'development' into fix_ash_script
2 parents 50b5b7b + 966eca6 commit c5c741c

File tree

34 files changed

+836
-360
lines changed

34 files changed

+836
-360
lines changed

‎.clang-tidy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Checks: >
2626
-misc-redundant-expression,
2727
modernize-*,
2828
-modernize-avoid-c-arrays,
29+
-modernize-use-designated-initializers,
2930
-modernize-use-trailing-return-type,
3031
performance-*,
3132
-performance-avoid-endl,

‎.github/workflows/dependencies/dependencies_nvcc.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ sudo apt-get install -y \
2525
wget
2626

2727
VERSION_DOTTED=${1-12.0} && VERSION_DASHED=$(sed 's/\./-/' <<< $VERSION_DOTTED)
28-
curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
29-
sudo dpkg -i cuda-keyring_1.0-1_all.deb
28+
curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/cuda-keyring_1.1-1_all.deb
29+
sudo dpkg -i cuda-keyring_1.1-1_all.deb
3030
sudo apt-get update
3131
sudo apt-get install -y \
3232
cuda-command-line-tools-$VERSION_DASHED \
@@ -39,4 +39,7 @@ sudo apt-get install -y \
3939
libcufft-dev-$VERSION_DASHED \
4040
libcurand-dev-$VERSION_DASHED \
4141
libcusparse-dev-$VERSION_DASHED
42+
43+
sudo apt-get install -y --no-install-recommends libnvjitlink-dev-$VERSION_DASHED || true
44+
4245
sudo ln -s cuda-$VERSION_DOTTED /usr/local/cuda

‎.github/workflows/gpu_action.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
jobs:
1010
gpu-compilation:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@v6
1414
with:
@@ -29,14 +29,14 @@ jobs:
2929
sudo apt-get -qq -y install curl cmake jq clang g++>=9.3.0
3030
3131
- name: Install CUDA
32-
run: .github/workflows/dependencies/dependencies_nvcc.sh 11.8
32+
run: .github/workflows/dependencies/dependencies_nvcc.sh 12.9
3333

3434
- name: Install hypre
3535
run: |
36-
wget -q https://github.com/hypre-space/hypre/archive/refs/tags/v2.28.0.tar.gz
37-
tar xfz v2.28.0.tar.gz
38-
cd hypre-2.28.0/src
39-
CUDA_HOME=/usr/local/cuda HYPRE_CUDA_SM=60 ./configure --with-cxxstandard=17 --with-cuda --enable-unified-memory --without-MPI
36+
wget -q https://github.com/hypre-space/hypre/archive/refs/tags/v2.33.0.tar.gz
37+
tar xfz v2.33.0.tar.gz
38+
cd hypre-2.33.0/src
39+
CUDA_HOME=/usr/local/cuda HYPRE_CUDA_SM=60 ./configure --with-cxxstandard=20 --with-cuda --enable-unified-memory --without-MPI
4040
make -j 4
4141
make install
4242
cd ../../
@@ -56,5 +56,5 @@ jobs:
5656
- name: Compile problems for GPU
5757
run: |
5858
export PATH=$PATH:/usr/local/cuda/bin
59-
export AMREX_HYPRE_HOME=${PWD}/hypre-2.28.0/src/hypre
59+
export AMREX_HYPRE_HOME=${PWD}/hypre-2.33.0/src/hypre
6060
python3 external/cpp-linter-action/run_on_changed_files.py ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} -header-filter=Castro -ignore-files="amrex|Microphysics" -gpu

‎CHANGES.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# 26.01
2+
3+
* `massive_star` : add volume-rendering scripts (#3186)
4+
5+
* optimize `normalize_species` (#3179, #3183)
6+
7+
* optimize `copy_cons_to_burn` (#3184)
8+
9+
* `xrb_spherical` : update the plotting script (#3154)
10+
11+
* `flame_wave` : update the plotting script to fix sizing
12+
and add "ash" (#3151)
13+
14+
* clang-tidy 21 fixes (#3163)
15+
16+
* eliminate circular include in `Rotation.H` (#3162)
17+
18+
* switch `python3` -> `python` in scripts (#3178)
19+
20+
* github CI action updates (#3185)
21+
22+
* add documentation on performance (#3177)
23+
124
# 25.12
225

326
* make some state arguments const in geometry sources (#3174)

‎Docs/source/getting_started.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Getting Started
1414
The compilation process is managed by AMReX and its build system. The
1515
general requirements to build Castro are:
1616

17-
* A C++17 (or later) compiler (for GCC, we need >= 9.0 for CUDA compilation)
17+
* A C++20 (or later) compiler (for GCC, we need >= 13.1)
1818

1919
* python (>= 3.10)
2020

@@ -24,7 +24,7 @@ GCC is the main compiler suite used by the developers.
2424

2525
For running in parallel, an MPI library is required. For running on GPUs:
2626

27-
* CUDA 11 or later is required for NVIDIA GPUs
27+
* CUDA 12 or later is required for NVIDIA GPUs
2828

2929
* ROCM 6.3.1 or later is required for AMD GPUs (earlier versions have a register allocation bug)
3030

‎Exec/Make.Castro‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ ifeq ("$(wildcard $(AMREX_HOME)/Tools/GNUMake/Make.defs)","")
5252
$(error AMReX has not been downloaded. Please run "git submodule update --init" from the top level of the code)
5353
endif
5454

55-
# Require C++17
56-
CXXSTD := c++17
55+
# Require C++20
56+
CXXSTD := c++20
5757

5858
# Use Lazy QueueReduction for the timing outputs
5959
LAZY := TRUE

‎Exec/science/Detonation/ci-benchmarks/sdc_det_plt00040_extrema.out‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
plotfile = det_x_plt00040
22
time = 5.1558159140336702e-06
33
variables minimum value maximum value
4-
density 185260363.62 216672791.04
5-
xmom -39912455407 2.9675380132e+16
4+
density 185258192.85 216602408.23
5+
xmom -46504100132 2.9545170078e+16
66
ymom 0 0
77
zmom 0 0
8-
rho_E 1.3062473821e+26 2.7889238252e+26
9-
rho_e 1.3062473821e+26 2.7746883032e+26
10-
Temp 50000000.026 7845891887.8
11-
rho_H1 2.1200770885e-22 0.020000094999
12-
rho_He3 0.0017224254611 0.021019644526
13-
rho_He4 94392923.774 200001392.04
14-
rho_C12 0.020000000216 21092707.992
15-
rho_N14 1.9999998591e-22 0.27443371386
16-
rho_O16 0.02 19208.967071
17-
rho_Ne20 0.02 3300.3195244
18-
rho_Mg24 0.02 23342.608028
19-
rho_Si28 0.02 2016933.4723
20-
rho_S32 0.02 1657466.027
21-
rho_Ar36 0.02 822375.60061
22-
rho_Ca40 0.02 725149.19519
23-
rho_Ti44 0.02 34191.594394
24-
rho_Cr48 0.02 78178.53746
25-
rho_Fe52 0.02 277975.20228
26-
rho_Fe54 0.02 94979684.886
27-
rho_Ni56 0.02 2242117.3256
28-
rho_n 2.1200770885e-22 234640.60556
29-
rho_p 0.019999995438 3609101.2404
8+
rho_E 1.3062473821e+26 2.7894570581e+26
9+
rho_e 1.3062473821e+26 2.7751890329e+26
10+
Temp 50000000.026 7845892023.3
11+
rho_H1 2.1201744635e-22 0.020000093825
12+
rho_He3 0.0017224320228 0.021020120012
13+
rho_He4 94358680.307 200001380.3
14+
rho_C12 0.020000000216 21130190.363
15+
rho_N14 1.9999997568e-22 0.020000138814
16+
rho_O16 0.02 19208.971235
17+
rho_Ne20 0.02 3345.900962
18+
rho_Mg24 0.02 23316.810422
19+
rho_Si28 0.02 2014906.8671
20+
rho_S32 0.02 1655900.9204
21+
rho_Ar36 0.02 821645.4629
22+
rho_Ca40 0.02 725101.08718
23+
rho_Ti44 0.02 34164.565105
24+
rho_Cr48 0.02 78159.887474
25+
rho_Fe52 0.02 278026.13131
26+
rho_Fe54 0.02 94990636.169
27+
rho_Ni56 0.02 2241021.534
28+
rho_n 2.1201744635e-22 234640.70453
29+
rho_p 0.019999995438 3609229.1563
3030
Shock 0 0
31-
rho_enuc -4.6861317752e+29 3.5751015484e+32
32-
pressure 5.5236728651e+25 1.1610600289e+26
33-
kineng 0 2.0675227861e+24
34-
soundspeed 612864631.21 895228348.05
35-
Gamma_1 1.3599756436 1.3819419317
36-
MachNumber 0 0.16183219823
37-
uplusc 612864631.21 1000374203.5
38-
uminusc -895228544.56 -612861109.42
39-
entropy 98214767.758 336273316.58
31+
rho_enuc -4.7045878771e+29 3.5763112794e+32
32+
pressure 5.5236728651e+25 1.1610601906e+26
33+
kineng 0 2.0499232063e+24
34+
soundspeed 612864631.21 895228359.43
35+
Gamma_1 1.3599756444 1.3819594037
36+
MachNumber 0 0.1612010102
37+
uplusc 612864631.21 999831635.41
38+
uminusc -895228575.82 -612861139.09
39+
entropy 98214767.758 336273404.4
4040
magvort 0 0
41-
divu -98011.7293 33845.051642
42-
eint_E 6.5312369103e+17 1.3804410746e+18
43-
eint_e 6.5312369103e+17 1.3804410746e+18
44-
logden 8.2677825121 8.3358043777
45-
StateErr_0 185260363.62 216672791.04
46-
StateErr_1 50000000.026 7845891887.8
41+
divu -97843.447695 33859.293026
42+
eint_E 6.5312369103e+17 1.3804411077e+18
43+
eint_e 6.5312369103e+17 1.3804411077e+18
44+
logden 8.2677774233 8.3356632809
45+
StateErr_0 185258192.85 216602408.23
46+
StateErr_1 50000000.026 7845892023.3
4747
StateErr_2 1e-30 9.9999779324e-11
4848
X(H1) 1e-30 9.9999779324e-11
49-
X(He3) 8.9858903208e-12 9.9999601254e-11
50-
X(He4) 0.48405906739 0.9999999982
51-
X(C12) 1.0000000108e-10 0.099490287907
52-
X(N14) 1e-30 1.2944515808e-09
53-
X(O16) 1e-10 9.6044819858e-05
54-
X(Ne20) 1e-10 1.5566978872e-05
55-
X(Mg24) 1e-10 0.00011126283205
56-
X(Si28) 1e-10 0.010061318103
57-
X(S32) 1e-10 0.0083502176265
58-
X(Ar36) 1e-10 0.004166596777
59-
X(Ca40) 1e-10 0.0037109584758
60-
X(Ti44) 1e-10 0.00017304225979
61-
X(Cr48) 1e-10 0.00040090960657
62-
X(Fe52) 1e-10 0.0013385458977
63-
X(Fe54) 1e-10 0.46486546879
64-
X(Ni56) 1e-10 0.010347941312
65-
X(n) 1e-30 0.0011732028532
66-
X(p) 9.9999977015e-11 0.01759896785
67-
abar 4.000000001 6.7310134082
68-
Ye 0.49998671101 0.5000156148
69-
x_velocity -199.56224945 139342631.97
49+
X(He3) 8.9858859563e-12 9.9999601254e-11
50+
X(He4) 0.48401882032 0.9999999982
51+
X(C12) 1.0000000108e-10 0.099662507624
52+
X(N14) 1e-30 1.0000000373e-10
53+
X(O16) 1e-10 9.6044829786e-05
54+
X(Ne20) 1e-10 1.5781253004e-05
55+
X(Mg24) 1e-10 0.00011114942576
56+
X(Si28) 1e-10 0.010056996916
57+
X(S32) 1e-10 0.0083479592032
58+
X(Ar36) 1e-10 0.0041660812823
59+
X(Ca40) 1e-10 0.0037108409454
60+
X(Ti44) 1e-10 0.00017303110403
61+
X(Cr48) 1e-10 0.00040092608765
62+
X(Fe52) 1e-10 0.0013387591067
63+
X(Fe54) 1e-10 0.46490849282
64+
X(Ni56) 1e-10 0.010346244773
65+
X(n) 1e-30 0.0011732032003
66+
X(p) 9.9999977003e-11 0.017598814998
67+
abar 4.000000001 6.7314528761
68+
Ye 0.49998613725 0.50001572797
69+
x_velocity -232.52047511 138765368.48
7070
y_velocity 0 0
7171
z_velocity 0 0
72-
t_sound_t_enuc 3.4412023971e-13 0.97389660476
73-
enuc -2.4915696853e+21 1.650000229e+24
74-
magvel 0 139342631.97
75-
radvel -199.56224945 139342631.97
76-
circvel 0 2
77-
magmom 0 2.9675380132e+16
72+
t_sound_t_enuc 3.4412406685e-13 0.97449833131
73+
enuc -2.5013290295e+21 1.6510948833e+24
74+
magvel 0 138765368.48
75+
radvel -232.52047511 138765368.48
76+
circvel 0 1.4142135624
77+
magmom 0 2.9545170078e+16
7878
angular_momentum_x 0 0
7979
angular_momentum_y 0 0
8080
angular_momentum_z 0 0

‎Exec/science/flame_wave/ci-benchmarks/grid_diag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# COLUMN 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
22
# TIMESTEP TIME MASS XMOM YMOM ZMOM ANG. MOM. X ANG. MOM. Y ANG. MOM. Z KIN. ENERGY INT. ENERGY GAS ENERGY GRAV. ENERGY TOTAL ENERGY CENTER OF MASS X-LOC CENTER OF MASS Y-LOC CENTER OF MASS Z-LOC CENTER OF MASS X-VEL CENTER OF MASS Y-VEL CENTER OF MASS Z-VEL MAXIMUM TEMPERATURE MAXIMUM DENSITY MAXIMUM T_S / T_E
33
0 0.0000000000000000e+00 1.4700685690734707e+20 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 2.9163021935536670e+37 2.9163021935536670e+37 0.0000000000000000e+00 2.9163021935536670e+37 2.7306641645125830e+04 6.8087525965688326e+02 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 0.0000000000000000e+00 1.3928678114307070e+09 3.0715027784564160e+07 0.0000000000000000e+00
4-
1 5.9806047036494466e-08 1.4700700110494260e+20 3.3564221216239532e+23 7.2876252581771450e+23 1.2612378556758431e+20 3.1318391967099364e+23 -2.7141686348170817e+24 1.9066097490959230e+28 7.8605324806497653e+29 2.9163081863789488e+37 2.9163082649842732e+37 0.0000000000000000e+00 2.9163082649842732e+37 2.7306641717926217e+04 6.8087482283161262e+02 0.0000000000000000e+00 2.2831716152266335e+03 4.9573321021457969e+03 8.5794407490531299e-01 1.3929529135979342e+09 3.0715326539042991e+07 3.3873763033676453e-04
5-
2 1.2559269877663839e-07 1.4700717750113816e+20 7.0484895415396614e+23 1.5304335699509390e+24 5.5619061952571815e+20 1.3810900989302018e+24 -1.1969287484396057e+25 4.0039912977470795e+28 3.0853275728201704e+30 2.9163145904137372e+37 2.9163148989464890e+37 0.0000000000000000e+00 2.9163148989464890e+37 2.7306641954244835e+04 6.8087461719006524e+02 0.0000000000000000e+00 4.7946567380936831e+03 1.0410604406979313e+04 3.7834249250953209e+00 1.3933796340131781e+09 3.0715561813908841e+07 3.3857586860691635e-04
4+
1 5.9806047036494466e-08 1.4700700110494260e+20 3.3564221216239452e+23 7.2876252581771450e+23 1.2612378556758414e+20 3.1318391967099330e+23 -2.7141686348170742e+24 1.9066097490959234e+28 7.8605324806497259e+29 2.9163081863789488e+37 2.9163082649842732e+37 0.0000000000000000e+00 2.9163082649842732e+37 2.7306641717926221e+04 6.8087482283161262e+02 0.0000000000000000e+00 2.2831716152266281e+03 4.9573321021457969e+03 8.5794407490531188e-01 1.3929529135979342e+09 3.0715326539042991e+07 3.3873763033676453e-04
5+
2 1.2559269877663839e-07 1.4700717750113816e+20 7.0484895415396748e+23 1.5304335699509390e+24 5.5619061952571828e+20 1.3810900989302024e+24 -1.1969287484396064e+25 4.0039912977470795e+28 3.0853275728198749e+30 2.9163145904137377e+37 2.9163148989464890e+37 0.0000000000000000e+00 2.9163148989464890e+37 2.7306641954244828e+04 6.8087461719006524e+02 0.0000000000000000e+00 4.7946567380936922e+03 1.0410604406979313e+04 3.7834249250953218e+00 1.3933796340131781e+09 3.0715561813908841e+07 3.3857586860691635e-04

0 commit comments

Comments
 (0)