Skip to content

Commit 52bb537

Browse files
WeiqunZhangWeiqunZhang
committed
Merge branch 'development' into use_openpmd-api
2 parents ea95312 + f1ec8df commit 52bb537

File tree

78 files changed

+738
-349
lines changed

Some content is hidden

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

78 files changed

+738
-349
lines changed

‎.github/workflows/bittree.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
mpiexec -n 2 ./main2d.gnu.TEST.MPI.ex inputs_bittree amr.plot_int=1000
5353
5454
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
55-
make -j2 -f clang-tidy-ccache-misses.mak \
55+
make -j2 -k -f clang-tidy-ccache-misses.mak \
5656
CLANG_TIDY=clang-tidy-15 \
5757
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
5858
@@ -104,7 +104,7 @@ jobs:
104104
mpiexec -n 2 ./main3d.gnu.TEST.MPI.ex inputs_bittree max_step=10
105105
106106
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
107-
make -j2 -f clang-tidy-ccache-misses.mak \
107+
make -j2 -k -f clang-tidy-ccache-misses.mak \
108108
CLANG_TIDY=clang-tidy-15 \
109109
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
110110

‎.github/workflows/clang.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
make test_install
6060
6161
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
62-
make -j2 -f clang-tidy-ccache-misses.mak \
62+
make -j2 -k -f clang-tidy-ccache-misses.mak \
6363
CLANG_TIDY=clang-tidy-12 \
6464
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
6565
@@ -117,7 +117,7 @@ jobs:
117117
make -j 2
118118
119119
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
120-
make -j2 -f clang-tidy-ccache-misses.mak \
120+
make -j2 -k -f clang-tidy-ccache-misses.mak \
121121
CLANG_TIDY=clang-tidy-14 \
122122
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
123123
@@ -159,7 +159,7 @@ jobs:
159159
make install
160160
161161
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
162-
make -j2 -f clang-tidy-ccache-misses.mak \
162+
make -j2 -k -f clang-tidy-ccache-misses.mak \
163163
CLANG_TIDY=clang-tidy-14 \
164164
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
165165

‎.github/workflows/dependencies/dependencies_codeplay.sh‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,24 @@
66

77
set -eu -o pipefail
88

9-
curl -o oneapi_nvidia.sh -L "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=nvidia&filters[]=linux&aat=$1"
10-
chmod +x oneapi_nvidia.sh
11-
sudo ./oneapi_nvidia.sh --yes
9+
# `man apt.conf`:
10+
# Number of retries to perform. If this is non-zero APT will retry
11+
# failed files the given number of times.
12+
echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries
1213

13-
curl -o oneapi_amd.sh -L "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=amd&filters[]=linux&aat=$1"
14-
chmod +x oneapi_amd.sh
15-
sudo ./oneapi_amd.sh --yes
14+
# https://developer.codeplay.com/apt/index.html
15+
sudo wget -qO - https://developer.codeplay.com/apt/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/codeplay-keyring.gpg > /dev/null
16+
echo "deb [signed-by=/usr/share/keyrings/codeplay-keyring.gpg] https://developer.codeplay.com/apt all main" | sudo tee /etc/apt/sources.list.d/codeplay.list
17+
18+
sudo apt-get update
19+
20+
# try apt install up to five times, to avoid connection splits
21+
status=1
22+
for itry in {1..5}
23+
do
24+
sudo apt-get install -y --no-install-recommends \
25+
$1 \
26+
&& { sudo apt-get clean; status=0; break; } \
27+
|| { sleep 10; }
28+
done
29+
if [[ ${status} -ne 0 ]]; then exit 1; fi

‎.github/workflows/dependencies/dependencies_hip.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ sudo apt-get install -y --no-install-recommends \
4545
rocrand-dev \
4646
rocprim-dev
4747

48+
# hiprand-dev is a new package that does not exist in old versions
49+
sudo apt-get install -y --no-install-recommends hiprand-dev || true
50+
4851
# activate
4952
#
5053
source /etc/profile.d/rocm.sh

‎.github/workflows/gcc.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
make test_install
5656
5757
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
58-
make -j2 -f clang-tidy-ccache-misses.mak \
58+
make -j2 -k -f clang-tidy-ccache-misses.mak \
5959
CLANG_TIDY=clang-tidy-12 \
6060
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
6161
@@ -107,7 +107,7 @@ jobs:
107107
cmake --build build -j 2
108108
109109
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
110-
make -j2 -f clang-tidy-ccache-misses.mak \
110+
make -j2 -k -f clang-tidy-ccache-misses.mak \
111111
CLANG_TIDY=clang-tidy-12 \
112112
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
113113
@@ -155,7 +155,7 @@ jobs:
155155
cmake --build build -j 2
156156
157157
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
158-
make -j2 -f clang-tidy-ccache-misses.mak \
158+
make -j2 -k -f clang-tidy-ccache-misses.mak \
159159
CLANG_TIDY=clang-tidy-12 \
160160
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
161161
@@ -204,7 +204,7 @@ jobs:
204204
cmake --build build -j 2
205205
206206
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
207-
make -j2 -f clang-tidy-ccache-misses.mak \
207+
make -j2 -k -f clang-tidy-ccache-misses.mak \
208208
CLANG_TIDY=clang-tidy-12 \
209209
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
210210
@@ -263,7 +263,7 @@ jobs:
263263
264264
# Let's not use clang-tidy for this test because it wants to use C++20.
265265
# ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
266-
# make -j2 -f clang-tidy-ccache-misses.mak \
266+
# make -j2 -k -f clang-tidy-ccache-misses.mak \
267267
# CLANG_TIDY=clang-tidy-12 \
268268
# CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
269269
@@ -320,7 +320,7 @@ jobs:
320320
make -j 2
321321
322322
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
323-
make -j2 -f clang-tidy-ccache-misses.mak \
323+
make -j2 -k -f clang-tidy-ccache-misses.mak \
324324
CLANG_TIDY=clang-tidy-12 \
325325
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
326326
@@ -384,7 +384,7 @@ jobs:
384384
make -j 2
385385
386386
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
387-
make -j2 -f clang-tidy-ccache-misses.mak \
387+
make -j2 -k -f clang-tidy-ccache-misses.mak \
388388
CLANG_TIDY=clang-tidy-14 \
389389
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
390390
@@ -426,7 +426,7 @@ jobs:
426426
make install
427427
428428
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
429-
make -j2 -f clang-tidy-ccache-misses.mak \
429+
make -j2 -k -f clang-tidy-ccache-misses.mak \
430430
CLANG_TIDY=clang-tidy-12 \
431431
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
432432
@@ -466,7 +466,7 @@ jobs:
466466
make install
467467
468468
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
469-
make -j2 -f clang-tidy-ccache-misses.mak \
469+
make -j2 -k -f clang-tidy-ccache-misses.mak \
470470
CLANG_TIDY=clang-tidy-15 \
471471
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
472472
@@ -506,7 +506,7 @@ jobs:
506506
make install
507507
508508
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
509-
make -j2 -f clang-tidy-ccache-misses.mak \
509+
make -j2 -k -f clang-tidy-ccache-misses.mak \
510510
CLANG_TIDY=clang-tidy-12 \
511511
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
512512
@@ -546,7 +546,7 @@ jobs:
546546
make install
547547
548548
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
549-
make -j2 -f clang-tidy-ccache-misses.mak \
549+
make -j2 -k -f clang-tidy-ccache-misses.mak \
550550
CLANG_TIDY=clang-tidy-12 \
551551
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
552552
@@ -585,7 +585,7 @@ jobs:
585585
CCACHE=ccache
586586
587587
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
588-
make -j2 -f clang-tidy-ccache-misses.mak \
588+
make -j2 -k -f clang-tidy-ccache-misses.mak \
589589
CLANG_TIDY=clang-tidy-12 \
590590
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
591591
@@ -630,7 +630,7 @@ jobs:
630630
make -j 2
631631
632632
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
633-
make -j2 -f clang-tidy-ccache-misses.mak \
633+
make -j2 -k -f clang-tidy-ccache-misses.mak \
634634
CLANG_TIDY=clang-tidy-12 \
635635
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
636636

‎.github/workflows/hypre.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
mpiexec -n 2 ./main3d.gnu.MPI.ex inputs.hypre
101101
102102
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
103-
make -j2 -f clang-tidy-ccache-misses.mak \
103+
make -j2 -k -f clang-tidy-ccache-misses.mak \
104104
CLANG_TIDY=clang-tidy-14 \
105105
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
106106
@@ -148,7 +148,7 @@ jobs:
148148
mpiexec -n 2 ./main2d.gnu.MPI.ex inputs.2d
149149
150150
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
151-
make -j2 -f clang-tidy-ccache-misses.mak \
151+
make -j2 -k -f clang-tidy-ccache-misses.mak \
152152
CLANG_TIDY=clang-tidy-14 \
153153
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
154154

‎.github/workflows/intel.yml‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
-DCMAKE_C_COMPILER=$(which icx) \
4545
-DCMAKE_CXX_COMPILER=$(which icpx) \
4646
-DCMAKE_Fortran_COMPILER=$(which ifx) \
47-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
47+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
48+
-DAMReX_PARALLEL_LINK_JOBS=2
4849
cmake --build build --parallel 2
4950
5051
ccache -s
@@ -86,7 +87,8 @@ jobs:
8687
-DAMReX_GPU_BACKEND=SYCL \
8788
-DCMAKE_C_COMPILER=$(which icx) \
8889
-DCMAKE_CXX_COMPILER=$(which icpx) \
89-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
90+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
91+
-DAMReX_PARALLEL_LINK_JOBS=2
9092
cmake --build build --parallel 2
9193
9294
ccache -s
@@ -95,29 +97,24 @@ jobs:
9597
tests-oneapi-sycl-eb-nvidia:
9698
name: oneAPI SYCL for Nvidia GPUs [tests w/ EB]
9799
runs-on: ubuntu-latest
98-
env:
99-
CODEPLAYTOKEN: ${{ secrets.CODEPLAYTOKEN }}
100100
steps:
101101
- uses: actions/checkout@v3
102102
- name: Dependencies
103-
if: ${{ env.CODEPLAYTOKEN != '' }}
104103
run: |
105-
.github/workflows/dependencies/dependencies_nvcc.sh
104+
.github/workflows/dependencies/ubuntu_free_disk_space.sh
106105
.github/workflows/dependencies/dependencies_dpcpp.sh
107-
.github/workflows/dependencies/dependencies_codeplay.sh ${{ env.CODEPLAYTOKEN }}
106+
.github/workflows/dependencies/dependencies_nvcc.sh 12.0
107+
.github/workflows/dependencies/dependencies_codeplay.sh oneapi-nvidia-12.0
108108
.github/workflows/dependencies/dependencies_ccache.sh
109109
- name: Set Up Cache
110-
if: ${{ env.CODEPLAYTOKEN != '' }}
111110
uses: actions/cache@v3
112111
with:
113112
path: ~/.cache/ccache
114113
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
115114
restore-keys: |
116115
ccache-${{ github.workflow }}-${{ github.job }}-git-
117116
- name: Build & Install
118-
if: ${{ env.CODEPLAYTOKEN != '' }}
119-
# clang currently supports CUDA up to version 11.5 and a warning is issued with newer versions
120-
env: {CXXFLAGS: "-fsycl -fsycl-targets=nvptx64-nvidia-cuda -fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor -Wno-unknown-cuda-version"}
117+
env: {CXXFLAGS: "-fsycl -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --offload-arch=sm_80 -fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor"}
121118
run: |
122119
export CCACHE_COMPRESS=1
123120
export CCACHE_COMPRESSLEVEL=10
@@ -136,7 +133,8 @@ jobs:
136133
-DAMReX_GPU_BACKEND=SYCL \
137134
-DCMAKE_C_COMPILER=$(which icx) \
138135
-DCMAKE_CXX_COMPILER=$(which clang++) \
139-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
136+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
137+
-DAMReX_PARALLEL_LINK_JOBS=2
140138
cmake --build build --parallel 2
141139
142140
ccache -s
@@ -145,28 +143,23 @@ jobs:
145143
no-tests-oneapi-sycl-amd:
146144
name: oneAPI SYCL for AMD GPUs
147145
runs-on: ubuntu-20.04
148-
env:
149-
CODEPLAYTOKEN: ${{ secrets.CODEPLAYTOKEN }}
150146
steps:
151147
- uses: actions/checkout@v3
152148
- name: Dependencies
153-
if: ${{ env.CODEPLAYTOKEN != '' }}
154149
run: |
155150
.github/workflows/dependencies/ubuntu_free_disk_space.sh
156-
.github/workflows/dependencies/dependencies_hip.sh 5.4.6
157151
.github/workflows/dependencies/dependencies_dpcpp.sh
158-
.github/workflows/dependencies/dependencies_codeplay.sh ${{ env.CODEPLAYTOKEN }}
152+
.github/workflows/dependencies/dependencies_hip.sh 5.4.3
153+
.github/workflows/dependencies/dependencies_codeplay.sh oneapi-amd-5.4.3
159154
.github/workflows/dependencies/dependencies_ccache.sh
160155
- name: Set Up Cache
161-
if: ${{ env.CODEPLAYTOKEN != '' }}
162156
uses: actions/cache@v3
163157
with:
164158
path: ~/.cache/ccache
165159
key: ccache-${{ github.workflow }}-${{ github.job }}-git-${{ github.sha }}
166160
restore-keys: |
167161
ccache-${{ github.workflow }}-${{ github.job }}-git-
168162
- name: Build & Install
169-
if: ${{ env.CODEPLAYTOKEN != '' }}
170163
env: {CXXFLAGS: "-fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx90a -fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor"}
171164
run: |
172165
export CCACHE_COMPRESS=1
@@ -186,7 +179,8 @@ jobs:
186179
-DAMReX_SYCL_SUB_GROUP_SIZE=64 \
187180
-DCMAKE_C_COMPILER=$(which icx) \
188181
-DCMAKE_CXX_COMPILER=$(which clang++) \
189-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
182+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
183+
-DAMReX_PARALLEL_LINK_JOBS=2
190184
cmake --build build --parallel 2
191185
192186
ccache -s

‎.github/workflows/petsc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
mpiexec -n 2 ./main2d.gnu.TEST.MPI.ex inputs.rt.2d.petsc
5151
5252
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
53-
make -j2 -f clang-tidy-ccache-misses.mak \
53+
make -j2 -k -f clang-tidy-ccache-misses.mak \
5454
CLANG_TIDY=clang-tidy-14 \
5555
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
5656

‎.github/workflows/smoke.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
make test_install
4848
4949
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
50-
make -j2 -f clang-tidy-ccache-misses.mak \
50+
make -j2 -k -f clang-tidy-ccache-misses.mak \
5151
CLANG_TIDY=clang-tidy-15 \
5252
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
5353

‎.github/workflows/sundials.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
cmake --build build -j 2
6161
6262
${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt
63-
make -j2 -f clang-tidy-ccache-misses.mak \
63+
make -j2 -k -f clang-tidy-ccache-misses.mak \
6464
CLANG_TIDY=clang-tidy-14 \
6565
CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*"
6666

0 commit comments

Comments
 (0)