Skip to content

Commit 10e99fb

Browse files
atmyersatmyers
committed
Merge branch 'particle_soa_refactor' of github.com:Thierry992/amrex into HEAD
2 parents d03045d + f1e1d6f commit 10e99fb

File tree

284 files changed

+13950
-6891
lines changed

Some content is hidden

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

284 files changed

+13950
-6891
lines changed

‎.github/workflows/clang.yml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
# Build and install libamrex as AMReX CMake project
1313
# Note: this is an intentional "minimal" build that does not enable (many) options
1414
library_clang:
15-
name: Clang@6.0 C++14 SP NOMPI Debug [lib]
16-
runs-on: ubuntu-18.04
17-
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wno-c++17-extensions"}
15+
name: Clang@7.0 C++17 SP NOMPI Debug [lib]
16+
runs-on: ubuntu-20.04
17+
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor"}
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: Dependencies
21-
run: .github/workflows/dependencies/dependencies_clang6.sh
21+
run: .github/workflows/dependencies/dependencies_clang7.sh
2222
- name: Build & Install
2323
run: |
2424
mkdir build
@@ -34,7 +34,6 @@ jobs:
3434
-DAMReX_PLOTFILE_TOOLS=ON \
3535
-DAMReX_PRECISION=SINGLE \
3636
-DAMReX_PARTICLES_PRECISION=SINGLE \
37-
-DCMAKE_CXX_STANDARD=14 \
3837
-DCMAKE_C_COMPILER=$(which clang) \
3938
-DCMAKE_CXX_COMPILER=$(which clang++) \
4039
-DCMAKE_Fortran_COMPILER=$(which gfortran)
@@ -48,14 +47,14 @@ jobs:
4847
ctest --output-on-failure
4948
5049
tests_clang:
51-
name: Clang@6.0 C++14 SP Particles DP Mesh Debug [tests]
52-
runs-on: ubuntu-18.04
53-
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wno-c++17-extensions -O1"}
50+
name: Clang@7.0 C++17 SP Particles DP Mesh Debug [tests]
51+
runs-on: ubuntu-20.04
52+
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -O1 -Wnon-virtual-dtor"}
5453
# It's too slow with -O0
5554
steps:
56-
- uses: actions/checkout@v2
55+
- uses: actions/checkout@v3
5756
- name: Dependencies
58-
run: .github/workflows/dependencies/dependencies_clang6.sh
57+
run: .github/workflows/dependencies/dependencies_clang7.sh
5958
- name: Build & Install
6059
run: |
6160
mkdir build
@@ -70,7 +69,6 @@ jobs:
7069
-DAMReX_PARTICLES=ON \
7170
-DAMReX_PRECISION=DOUBLE \
7271
-DAMReX_PARTICLES_PRECISION=SINGLE \
73-
-DCMAKE_CXX_STANDARD=14 \
7472
-DCMAKE_C_COMPILER=$(which clang) \
7573
-DCMAKE_CXX_COMPILER=$(which clang++) \
7674
-DCMAKE_Fortran_COMPILER=$(which gfortran)
@@ -80,14 +78,14 @@ jobs:
8078
8179
# Build 2D libamrex with configure
8280
configure-2d:
83-
name: Clang@6.0 NOMPI Release [configure 2D]
84-
runs-on: ubuntu-18.04
81+
name: Clang@7.0 NOMPI Release [configure 2D]
82+
runs-on: ubuntu-20.04
8583
steps:
86-
- uses: actions/checkout@v2
84+
- uses: actions/checkout@v3
8785
- name: Dependencies
88-
run: .github/workflows/dependencies/dependencies_clang6.sh
86+
run: .github/workflows/dependencies/dependencies_clang7.sh
8987
- name: Build & Install
9088
run: |
9189
./configure --dim 2 --with-fortran no --comp llvm --with-mpi no
92-
make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS="-fno-operator-names -Wno-c++17-extensions"
90+
make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS="-fno-operator-names"
9391
make install

‎.github/workflows/cuda.yml‎

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,13 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
# Build libamrex and all tests with CUDA 10.2
11-
tests-cuda10:
12-
name: [email protected] [email protected] C++14 Release [tests]
13-
runs-on: ubuntu-18.04
14-
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wunreachable-code"}
15-
steps:
16-
- uses: actions/checkout@v2
17-
- name: Dependencies
18-
run: .github/workflows/dependencies/dependencies_nvcc10.sh
19-
- name: Build & Install
20-
run: |
21-
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
22-
export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/usr/local/cuda/lib64:${LD_LIBRARY_PATH}
23-
which nvcc || echo "nvcc not in PATH!"
24-
mkdir build
25-
cd build
26-
cmake .. \
27-
-DCMAKE_VERBOSE_MAKEFILE=ON \
28-
-DAMReX_EB=OFF \
29-
-DAMReX_ENABLE_TESTS=ON \
30-
-DAMReX_FORTRAN=OFF \
31-
-DAMReX_PARTICLES=ON \
32-
-DAMReX_GPU_BACKEND=CUDA \
33-
-DCMAKE_C_COMPILER=$(which gcc-6) \
34-
-DCMAKE_CXX_COMPILER=$(which g++-6) \
35-
-DCMAKE_CUDA_HOST_COMPILER=$(which g++-6) \
36-
-DCMAKE_Fortran_COMPILER=$(which gfortran-6) \
37-
-DAMReX_CUDA_ARCH=7.0 \
38-
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON
39-
make -j 2
40-
4110
# Build libamrex and all tests with CUDA 11.0.2 (recent supported)
4211
tests-cuda11:
4312
name: [email protected] [email protected] C++17 Release [tests]
4413
runs-on: ubuntu-20.04
45-
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code"}
14+
env: {CXXFLAGS: "-fno-operator-names -Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches"}
4615
steps:
47-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
4817
- name: Dependencies
4918
run: .github/workflows/dependencies/dependencies_nvcc11.sh
5019
- name: Build & Install
@@ -64,9 +33,7 @@ jobs:
6433
-DCMAKE_CXX_COMPILER=$(which g++) \
6534
-DCMAKE_CUDA_HOST_COMPILER=$(which g++) \
6635
-DCMAKE_Fortran_COMPILER=$(which gfortran) \
67-
-DCMAKE_CUDA_STANDARD=17 \
68-
-DCMAKE_CXX_STANDARD=17 \
69-
-DAMReX_CUDA_ARCH=8.0 \
36+
-DAMReX_CUDA_ARCH=7.0 \
7037
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
7138
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
7239
@@ -78,7 +45,7 @@ jobs:
7845
runs-on: ubuntu-20.04
7946
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wshadow"}
8047
steps:
81-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v3
8249
- name: Dependencies
8350
run: .github/workflows/dependencies/dependencies_nvhpc21-11.sh
8451
- name: Build & Install
@@ -106,8 +73,6 @@ jobs:
10673
-DCMAKE_CXX_COMPILER=$(which nvc++) \
10774
-DCMAKE_CUDA_HOST_COMPILER=$(which nvc++) \
10875
-DCMAKE_Fortran_COMPILER=$(which nvfortran) \
109-
-DCMAKE_CUDA_STANDARD=17 \
110-
-DCMAKE_CXX_STANDARD=17 \
11176
-DAMReX_CUDA_ARCH=8.0 \
11277
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
11378
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
@@ -119,12 +84,12 @@ jobs:
11984
name: [email protected] [email protected] [configure 3D]
12085
runs-on: ubuntu-20.04
12186
steps:
122-
- uses: actions/checkout@v2
87+
- uses: actions/checkout@v3
12388
- name: Dependencies
12489
run: .github/workflows/dependencies/dependencies_nvcc11.sh
12590
- name: Build & Install
12691
run: |
12792
export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
12893
./configure --dim 3 --with-cuda yes --enable-eb yes --enable-xsdk-defaults yes --with-fortran no
129-
make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names CXXSTD=c++17
94+
make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names
13095
make install

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2020 The AMReX Community
3+
# Copyright 2020-2022 The AMReX Community
44
#
55
# License: BSD-3-Clause-LBNL
66
# Authors: Axel Huebl

‎.github/workflows/dependencies/dependencies_clang6.sh‎ renamed to ‎.github/workflows/dependencies/dependencies_clang7.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2020 The AMReX Community
3+
# Copyright 2020-2022 The AMReX Community
44
#
55
# License: BSD-3-Clause-LBNL
66
# Authors: Axel Huebl
@@ -11,4 +11,4 @@ sudo apt-get update
1111

1212
sudo apt-get install -y \
1313
build-essential \
14-
clang gfortran
14+
clang-7 gfortran

‎.github/workflows/dependencies/dependencies_gcc8.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Copyright 2020-2022 The AMReX Community
4+
#
5+
# License: BSD-3-Clause-LBNL
6+
# Authors: Axel Huebl
7+
8+
set -eu -o pipefail
9+
10+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
11+
sudo apt-get update
12+
13+
sudo apt-get install -y --no-install-recommends \
14+
build-essential \
15+
g++-8 gfortran-8 \
16+
libopenmpi-dev \
17+
openmpi-bin

‎.github/workflows/dependencies/dependencies_nofortran.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2020 Axel Huebl
3+
# Copyright 2020-2022 The AMReX Community
44
#
55
# License: BSD-3-Clause-LBNL
6+
# Authors: Axel Huebl
67

78
# search recursive inside a folder if a file contains tabs
89
#

‎.github/workflows/dependencies/dependencies_nvcc10.sh‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/workflows/dependencies/dependencies_nvcc11.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2020 Axel Huebl
3+
# Copyright 2020-2022 Axel Huebl
44
#
55
# License: BSD-3-Clause-LBNL
66

@@ -19,9 +19,8 @@ sudo apt-get install -y \
1919
pkg-config \
2020
wget
2121

22-
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
23-
echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
24-
| sudo tee /etc/apt/sources.list.d/cuda.list
22+
curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
23+
sudo dpkg -i cuda-keyring_1.0-1_all.deb
2524
sudo apt-get update
2625
sudo apt-get install -y \
2726
cuda-command-line-tools-11-2 \

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v2.3.1 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
14+
uses: actions/checkout@v3
1515
with:
1616
persist-credentials: false
1717

0 commit comments

Comments
 (0)