Skip to content

Commit 87b98b0

Browse files
lucafedeli88lucafedeli88
committed
Merge remote-tracking branch 'upstream/development' into update_fugaku_instructions
2 parents d827e8d + c6875f4 commit 87b98b0

26 files changed

+206
-122
lines changed

‎.github/workflows/clang_tidy.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
if: github.event.pull_request.draft == false
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: install dependencies
1717
run: |
1818
.github/workflows/dependencies/clang14.sh
1919
- name: set up cache
20-
uses: actions/cache@v3
20+
uses: actions/cache@v4
2121
with:
2222
path: ~/.cache/ccache
2323
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -37,7 +37,7 @@ jobs:
3737
3838
cmake -S . -B build_clang_tidy \
3939
-DCMAKE_VERBOSE_MAKEFILE=ON \
40-
-DWarpX_DIMS="1;2;3;RZ" \
40+
-DWarpX_DIMS="1;2;RZ;3" \
4141
-DWarpX_MPI=ON \
4242
-DWarpX_COMPUTE=OMP \
4343
-DWarpX_PSATD=ON \
@@ -47,10 +47,10 @@ jobs:
4747
-DWarpX_PRECISION=SINGLE \
4848
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
4949
50-
cmake --build build_clang_tidy -j 2
50+
cmake --build build_clang_tidy -j 4
5151
5252
${{github.workspace}}/.github/workflows/source/makeMakefileForClangTidy.py --input ${{github.workspace}}/ccache.log.txt
53-
make -j2 --keep-going -f clang-tidy-ccache-misses.mak \
53+
make -j4 --keep-going -f clang-tidy-ccache-misses.mak \
5454
CLANG_TIDY=clang-tidy \
5555
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
5656
@@ -66,7 +66,7 @@ jobs:
6666
PR_NUMBER: ${{ github.event.number }}
6767
run: |
6868
echo $PR_NUMBER > pr_number.txt
69-
- uses: actions/upload-artifact@v3
69+
- uses: actions/upload-artifact@v4
7070
with:
7171
name: pr_number
7272
path: pr_number.txt

‎.github/workflows/cleanup-cache-postpr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Clean up ccache
2121
run: |
2222
gh extension install actions/gh-actions-cache

‎.github/workflows/cleanup-cache.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Clean up ccache
2121
run: |
2222
gh extension install actions/gh-actions-cache

‎.github/workflows/codeql.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Install Packages (C++)
3535
if: ${{ matrix.language == 'cpp' }}
@@ -44,7 +44,7 @@ jobs:
4444
4545
- name: Set Up Cache
4646
if: ${{ matrix.language == 'cpp' }}
47-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4848
with:
4949
path: ~/.cache/ccache
5050
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -57,14 +57,14 @@ jobs:
5757
$CMAKE -S . -B build -DWarpX_OPENPMD=ON
5858
5959
- name: Initialize CodeQL
60-
uses: github/codeql-action/init@v2
60+
uses: github/codeql-action/init@v3
6161
with:
6262
config-file: ./.github/codeql/warpx-codeql.yml
6363
languages: ${{ matrix.language }}
6464
queries: +security-and-quality
6565

6666
- name: Build (py)
67-
uses: github/codeql-action/autobuild@v2
67+
uses: github/codeql-action/autobuild@v3
6868
if: ${{ matrix.language == 'python' }}
6969

7070
- name: Build (C++)
@@ -75,18 +75,18 @@ jobs:
7575
export CCACHE_MAXSIZE=100M
7676
ccache -z
7777
78-
$CMAKE --build build -j 2
78+
$CMAKE --build build -j 4
7979
8080
ccache -s
8181
du -hs ~/.cache/ccache
8282
8383
# Make sure CodeQL has something to do
8484
touch Source/Utils/WarpXVersion.cpp
8585
export CCACHE_DISABLE=1
86-
$CMAKE --build build -j 2
86+
$CMAKE --build build -j 4
8787
8888
- name: Perform CodeQL Analysis
89-
uses: github/codeql-action/analyze@v2
89+
uses: github/codeql-action/analyze@v3
9090
with:
9191
category: "/language:${{ matrix.language }}"
9292
upload: False
@@ -107,7 +107,7 @@ jobs:
107107
output: sarif-results/${{ matrix.language }}.sarif
108108

109109
- name: Upload SARIF
110-
uses: github/codeql-action/upload-sarif@v2
110+
uses: github/codeql-action/upload-sarif@v3
111111
with:
112112
sarif_file: sarif-results/${{ matrix.language }}.sarif
113113

@@ -120,7 +120,7 @@ jobs:
120120
PR_NUMBER: ${{ github.event.number }}
121121
run: |
122122
echo $PR_NUMBER > pr_number.txt
123-
- uses: actions/upload-artifact@v3
123+
- uses: actions/upload-artifact@v4
124124
with:
125125
name: pr_number
126126
path: pr_number.txt

‎.github/workflows/cuda.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
CXXFLAGS: "-Werror"
2020
CMAKE_GENERATOR: Ninja
2121
steps:
22-
- uses: actions/checkout@v3
23-
- uses: actions/setup-python@v4
22+
- uses: actions/checkout@v4
23+
- uses: actions/setup-python@v5
2424
name: Install Python
2525
with:
2626
python-version: '3.x'
2727
- name: install dependencies
2828
run: |
2929
.github/workflows/dependencies/nvcc11-3.sh
3030
- name: CCache Cache
31-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3232
with:
3333
path: ~/.cache/ccache
3434
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -73,7 +73,7 @@ jobs:
7373
-DWarpX_PSATD=ON \
7474
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
7575
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
76-
cmake --build build_sp -j 2
76+
cmake --build build_sp -j 4
7777
7878
python3 -m pip install --upgrade pip
7979
python3 -m pip install --upgrade build packaging setuptools wheel
@@ -92,12 +92,12 @@ jobs:
9292
runs-on: ubuntu-20.04
9393
if: github.event.pull_request.draft == false
9494
steps:
95-
- uses: actions/checkout@v3
95+
- uses: actions/checkout@v4
9696
- name: install dependencies
9797
run: |
9898
.github/workflows/dependencies/nvcc11-8.sh
9999
- name: CCache Cache
100-
uses: actions/cache@v3
100+
uses: actions/cache@v4
101101
with:
102102
path: ~/.cache/ccache
103103
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -116,24 +116,24 @@ jobs:
116116
117117
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
118118
cd ../amrex && git checkout --detach 296ed40e16ae1877640f5b78e9162dbd4ba1c279 && cd -
119-
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
119+
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 4
120120
121121
ccache -s
122122
du -hs ~/.cache/ccache
123123
124-
build_nvhpc21-11-nvcc:
125-
name: NVHPC@21.11 NVCC/NVC++ Release [tests]
124+
build_nvhpc24-1-nvcc:
125+
name: NVHPC@24.1 NVCC/NVC++ Release [tests]
126126
runs-on: ubuntu-20.04
127127
if: github.event.pull_request.draft == false
128128
#env:
129129
# # For NVHPC, Ninja is slower than the default:
130130
# CMAKE_GENERATOR: Ninja
131131
steps:
132-
- uses: actions/checkout@v3
132+
- uses: actions/checkout@v4
133133
- name: Dependencies
134134
run: .github/workflows/dependencies/nvhpc.sh
135135
- name: CCache Cache
136-
uses: actions/cache@v3
136+
uses: actions/cache@v4
137137
with:
138138
path: ~/.cache/ccache
139139
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -147,7 +147,7 @@ jobs:
147147
ccache -z
148148
149149
source /etc/profile.d/modules.sh
150-
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.11
150+
module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/24.1
151151
which nvcc || echo "nvcc not in PATH!"
152152
which nvc++ || echo "nvc++ not in PATH!"
153153
which nvc || echo "nvc not in PATH!"
@@ -165,13 +165,13 @@ jobs:
165165
-DCMAKE_VERBOSE_MAKEFILE=ON \
166166
-DWarpX_COMPUTE=CUDA \
167167
-DWarpX_EB=ON \
168-
-DWarpX_PYTHON=ON \
168+
-DWarpX_PYTHON=OFF \
169169
-DAMReX_CUDA_ARCH=8.0 \
170170
-DWarpX_OPENPMD=ON \
171171
-DWarpX_PSATD=ON \
172172
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
173173
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
174-
cmake --build build -j 2
174+
cmake --build build -j 4
175175
176176
# work-around for mpi4py 3.1.1 build system issue with using
177177
# a GNU-built Python executable with non-GNU Python modules
@@ -197,7 +197,7 @@ jobs:
197197
PR_NUMBER: ${{ github.event.number }}
198198
run: |
199199
echo $PR_NUMBER > pr_number.txt
200-
- uses: actions/upload-artifact@v3
200+
- uses: actions/upload-artifact@v4
201201
with:
202202
name: pr_number
203203
path: pr_number.txt

‎.github/workflows/dependencies/nvhpc.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ $(dirname "$0")/ccache.sh
3131
echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | \
3232
sudo tee /etc/apt/sources.list.d/nvhpc.list
3333
sudo apt update -y && \
34-
sudo apt install -y --no-install-recommends nvhpc-21-11 && \
34+
sudo apt install -y --no-install-recommends nvhpc-24-1 && \
3535
sudo rm -rf /var/lib/apt/lists/* && \
36-
sudo rm -rf /opt/nvidia/hpc_sdk/Linux_x86_64/21.11/examples \
37-
/opt/nvidia/hpc_sdk/Linux_x86_64/21.11/profilers \
38-
/opt/nvidia/hpc_sdk/Linux_x86_64/21.11/math_libs/11.5/targets/x86_64-linux/lib/lib*_static*.a
36+
sudo rm -rf /opt/nvidia/hpc_sdk/Linux_x86_64/24.1/examples \
37+
/opt/nvidia/hpc_sdk/Linux_x86_64/24.1/profilers \
38+
/opt/nvidia/hpc_sdk/Linux_x86_64/24.1/math_libs/11.5/targets/x86_64-linux/lib/lib*_static*.a
3939

4040
# things should reside in /opt/nvidia/hpc_sdk now
4141

4242
# activation via:
4343
# source /etc/profile.d/modules.sh
44-
# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/21.11
44+
# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/24.1
4545

4646
# cmake-easyinstall
4747
#

‎.github/workflows/hip.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
CMAKE_GENERATOR: Ninja
1616
if: github.event.pull_request.draft == false
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: install dependencies
2020
shell: bash
2121
run: .github/workflows/dependencies/hip.sh
2222
- name: CCache Cache
23-
uses: actions/cache@v3
23+
uses: actions/cache@v4
2424
with:
2525
path: ~/.cache/ccache
2626
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -56,7 +56,7 @@ jobs:
5656
-DWarpX_OPENPMD=ON \
5757
-DWarpX_PRECISION=SINGLE \
5858
-DWarpX_PSATD=ON
59-
cmake --build build_sp -j 2
59+
cmake --build build_sp -j 4
6060
6161
export WARPX_MPI=OFF
6262
export PYWARPX_LIB_DIR=$PWD/build_sp/lib/site-packages/pywarpx/
@@ -74,12 +74,12 @@ jobs:
7474
CMAKE_GENERATOR: Ninja
7575
if: github.event.pull_request.draft == false
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878
- name: install dependencies
7979
shell: bash
8080
run: .github/workflows/dependencies/hip.sh
8181
- name: CCache Cache
82-
uses: actions/cache@v3
82+
uses: actions/cache@v4
8383
with:
8484
path: ~/.cache/ccache
8585
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
@@ -116,7 +116,7 @@ jobs:
116116
-DWarpX_OPENPMD=ON \
117117
-DWarpX_PRECISION=DOUBLE \
118118
-DWarpX_PSATD=ON
119-
cmake --build build_2d -j 2
119+
cmake --build build_2d -j 4
120120
121121
export WARPX_MPI=OFF
122122
export PYWARPX_LIB_DIR=$PWD/build_2d/lib/site-packages/pywarpx/
@@ -135,7 +135,7 @@ jobs:
135135
PR_NUMBER: ${{ github.event.number }}
136136
run: |
137137
echo $PR_NUMBER > pr_number.txt
138-
- uses: actions/upload-artifact@v3
138+
- uses: actions/upload-artifact@v4
139139
with:
140140
name: pr_number
141141
path: pr_number.txt

‎.github/workflows/insitu.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
container:
2121
image: senseiinsitu/ci:fedora35-amrex-20220613
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Configure
2525
run: |
2626
cmake -S . -B build \
2727
-DWarpX_SENSEI=ON \
2828
-DWarpX_COMPUTE=NOACC
2929
- name: Build
3030
run: |
31-
cmake --build build -j 2
31+
cmake --build build -j 4
3232
3333
ascent:
3434
name: Ascent
@@ -41,7 +41,7 @@ jobs:
4141
container:
4242
image: alpinedav/ascent:0.9.2
4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- name: Configure
4646
run: |
4747
. /ascent_docker_setup_env.sh
@@ -51,7 +51,7 @@ jobs:
5151
- name: Build
5252
run: |
5353
. /ascent_docker_setup_env.sh
54-
cmake --build build -j 2
54+
cmake --build build -j 4
5555
- name: Test
5656
run: |
5757
cp Examples/Physics_applications/laser_acceleration/inputs_3d .
@@ -61,7 +61,7 @@ jobs:
6161
max_step = 40 \
6262
diag1.intervals = 30:40:10 \
6363
diag1.format = ascent
64-
- uses: actions/upload-artifact@v2
64+
- uses: actions/upload-artifact@v4
6565
with:
6666
name: ascent-test-artifacts
6767
path: |

0 commit comments

Comments
 (0)