Skip to content

Commit 82444c5

Browse files
committed
Merge branch 'development'
2 parents c172557 + da181fb commit 82444c5

File tree

565 files changed

+97115
-162098
lines changed

Some content is hidden

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

565 files changed

+97115
-162098
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Checks: >
2121
-misc-use-internal-linkage,
2222
modernize-*,
2323
-modernize-avoid-c-arrays,
24+
-modernize-use-designated-initializers,
2425
-modernize-use-trailing-return-type,
2526
performance-*,
2627
-performance-avoid-endl,

.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 -j 4 CCACHE=ccache USE_MPI=FALSE
50+
make -j 4 CXXSTD=c++20 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 -j 4 CCACHE=ccache USE_MPI=FALSE NETWORK_DIR=he-burn/he-burn-19am
67+
make -j 4 CXXSTD=c++20 CCACHE=ccache USE_MPI=FALSE NETWORK_DIR=he-burn/he-burn-19am
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 -j 4 CCACHE=ccache USE_MPI=FALSE
54+
make -j 4 CXXSTD=c++20 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 -j 4 CCACHE=ccache USE_MPI=FALSE NETWORK_DIR=he-burn/he-burn-19am
71+
make -j 4 CXXSTD=c++20 CCACHE=ccache USE_MPI=FALSE NETWORK_DIR=he-burn/he-burn-19am
7272
7373
ccache -s
7474
du -hs ~/.cache/ccache

.github/workflows/check-ifdefs.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v6
18-
with:
19-
fetch-depth: 0
2018

2119
- name: Setup Python
2220
uses: actions/setup-python@v6
2321
with:
24-
python-version: '3.11'
22+
python-version: '3.14'
2523

2624
- name: Run check-ifdefs
2725
run: |

.github/workflows/check_powi.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v6
18-
with:
19-
fetch-depth: 0
2018

2119
- name: Setup Python
2220
uses: actions/setup-python@v6
2321
with:
24-
python-version: '3.11'
22+
python-version: '3.14'
2523

2624
- name: Run check_powi
2725
run: |

.github/workflows/codespell.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v6
18-
with:
19-
fetch-depth: 0
2018

2119
- name: Setup Python
2220
uses: actions/setup-python@v6
2321
with:
24-
python-version: '3.11'
22+
python-version: '3.14'
2523
cache: "pip"
2624

2725
- name: Install dependencies

.github/workflows/cuda.yml

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

99
jobs:
1010
cuda-compile:
11-
name: CUDA@11.7 GCC
12-
runs-on: ubuntu-22.04
11+
name: CUDA@12.9 GCC
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v6
1515

@@ -26,7 +26,7 @@ jobs:
2626
cd ../..
2727
2828
- name: Dependencies
29-
run: .github/workflows/dependencies/dependencies_nvcc.sh 11.7
29+
run: .github/workflows/dependencies/dependencies_nvcc.sh 12.9
3030

3131
- name: compile test_react (aprox13)
3232
run: |

.github/workflows/dependencies/dependencies_nvcc.sh

Lines changed: 6 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 \
@@ -35,7 +35,11 @@ sudo apt-get install -y \
3535
cuda-minimal-build-$VERSION_DASHED \
3636
cuda-nvml-dev-$VERSION_DASHED \
3737
cuda-nvtx-$VERSION_DASHED \
38+
libcublas-dev-$VERSION_DASHED \
3839
libcufft-dev-$VERSION_DASHED \
3940
libcurand-dev-$VERSION_DASHED \
4041
libcusparse-dev-$VERSION_DASHED
42+
43+
sudo apt-get install -y --no-install-recommends libnvjitlink-dev-$VERSION_DASHED || true
44+
4145
sudo ln -s cuda-$VERSION_DOTTED /usr/local/cuda

.github/workflows/docs-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Python
2828
uses: actions/setup-python@v6
2929
with:
30-
python-version: '3.11'
30+
python-version: '3.14'
3131
cache: "pip"
3232

3333
- name: Install dependencies

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Python
2020
uses: actions/setup-python@v6
2121
with:
22-
python-version: '3.11'
22+
python-version: '3.14'
2323
cache: "pip"
2424

2525
- name: Upgrade pip

0 commit comments

Comments
 (0)