-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into xyuan/rad_develop
- Loading branch information
Showing
300 changed files
with
11,440 additions
and
6,691 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,46 +56,3 @@ jobs: | |
-DERF_ENABLE_MPI:BOOL=ON \ | ||
-DERF_ENABLE_CUDA:BOOL=ON . | ||
cmake --build build-${{matrix.cuda_pkg}} -- -j $(nproc) | ||
cuda-moisture-build: | ||
runs-on: ubuntu-20.04 | ||
name: (MOISTURE ON) CUDA v${{matrix.cuda_ver}} | ||
strategy: | ||
matrix: | ||
cuda_pkg: [11-0] | ||
include: | ||
- cuda_ver: "11.0" | ||
cuda_pkg: 11-0 | ||
cuda_extra: libcurand-dev-11-0 cuda-cupti-dev-11-0 libcusolver-dev-11-0 libcublas-dev-11-0 libcusparse-dev-11-0 | ||
steps: | ||
- name: Cancel previous runs | ||
uses: styfle/[email protected] | ||
with: | ||
access_token: ${{github.token}} | ||
- uses: actions/checkout@v3 | ||
with: | ||
submodules: true | ||
- name: Prepare CUDA environment | ||
run: | | ||
export DEBIAN_FRONTEND=noninteractive | ||
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub | ||
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu2004/x86_64/7fa2af80.pub | ||
echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" | sudo tee /etc/apt/sources.list.d/cuda.list | ||
echo "deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu2004/x86_64 /" | sudo tee /etc/apt/sources.list.d/nvidia-ml.list | ||
sudo apt-get update | ||
sudo apt-get install -y --no-install-recommends \ | ||
libopenmpi-dev cuda-command-line-tools-${{matrix.cuda_pkg}} cuda-compiler-${{matrix.cuda_pkg}} cuda-minimal-build-${{matrix.cuda_pkg}} cuda-nvml-dev-${{matrix.cuda_pkg}} cuda-nvtx-${{matrix.cuda_pkg}} ${{matrix.cuda_extra}} | ||
- name: Configure and build | ||
run: | | ||
export PATH=/usr/local/nvidia/bin:/usr/local/cuda-${{matrix.cuda_ver}}/bin:${PATH} | ||
export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:/usr/local/cuda-${{matrix.cuda_ver}}/lib:${LD_LIBRARY_PATH} | ||
cmake -Bbuild-${{matrix.cuda_pkg}} \ | ||
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ | ||
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \ | ||
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON \ | ||
-DERF_DIM:STRING=3 \ | ||
-DERF_ENABLE_MPI:BOOL=OFF \ | ||
-DERF_ENABLE_MOISTURE:BOOL=ON \ | ||
-DERF_ENABLE_CUDA:BOOL=ON . | ||
cmake --build build-${{matrix.cuda_pkg}} -- -j $(nproc) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -119,105 +119,3 @@ jobs: | |
name: build-and-test | ||
path: | | ||
${{runner.workspace}}/ERF/regressioncov.xml | ||
Build-And-Test-HIP-Moisture: | ||
name: (MOISTURE ON) HIP ROCm [email protected] C++17 [tests] | ||
runs-on: ubuntu-20.04 | ||
# Have to have -Wno-deprecated-declarations due to deprecated atomicAddNoRet | ||
# Have to have -Wno-gnu-zero-variadic-macro-arguments to avoid | ||
# amrex/Src/Base/AMReX_GpuLaunchGlobal.H:15:5: error: must specify at least one argument for '...' parameter of variadic macro [-Werror,-Wgnu-zero-variadic-macro-arguments] | ||
# __launch_bounds__(amrex_launch_bounds_max_threads) | ||
# ^ | ||
# /opt/rocm-4.1.1/hip/include/hip/hcc_detail/hip_runtime.h:178:71: note: expanded from macro '__launch_bounds__' | ||
# select_impl_(__VA_ARGS__, launch_bounds_impl1, launch_bounds_impl0)(__VA_ARGS__) | ||
# ^ | ||
# /opt/rocm-4.1.1/hip/include/hip/hcc_detail/hip_runtime.h:176:9: note: macro 'select_impl_' defined here | ||
# #define select_impl_(_1, _2, impl_, ...) impl_ | ||
# NOTE: -Werror was removed because ERF specifically had a lot of warnings. It will be a separate task to go through and fix them all... | ||
env: {CXXFLAGS: "-Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wno-deprecated-declarations -Wno-gnu-zero-variadic-macro-arguments -Wno-pass-failed"} | ||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
submodules: true | ||
|
||
- name: Dependencies | ||
run: .github/workflows/dependencies/dependencies_hip.sh | ||
|
||
- name: Build & Install | ||
run: | | ||
source /etc/profile.d/rocm.sh | ||
hipcc --version | ||
which clang | ||
which clang++ | ||
# "mpic++ --showme" forgets open-pal in Ubuntu 20.04 + OpenMPI 4.0.3 | ||
# https://bugs.launchpad.net/ubuntu/+source/openmpi/+bug/1941786 | ||
# https://github.com/open-mpi/ompi/issues/9317 | ||
export LDFLAGS="-lopen-pal" | ||
cmake \ | ||
-B${{runner.workspace}}/ERF/build-${{matrix.os}} \ | ||
-DCMAKE_VERBOSE_MAKEFILE=ON \ | ||
-DCMAKE_INSTALL_PREFIX:PATH=${{runner.workspace}}/ERF/install \ | ||
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ | ||
-DERF_DIM:STRING=3 \ | ||
-DERF_ENABLE_MPI:BOOL=ON \ | ||
-DERF_ENABLE_HIP:BOOL=ON \ | ||
-DAMReX_AMD_ARCH=gfx908 \ | ||
-DERF_ENABLE_TESTS:BOOL=ON \ | ||
-DERF_ENABLE_ALL_WARNINGS:BOOL=ON \ | ||
-DERF_ENABLE_FCOMPARE:BOOL=ON \ | ||
-DERF_ENABLE_MOISTURE:BOOL=ON \ | ||
-DCODECOV:BOOL=ON \ | ||
-DCMAKE_C_COMPILER=$(which clang) \ | ||
-DCMAKE_CXX_COMPILER=$(which clang++) \ | ||
-DCMAKE_CXX_STANDARD=17 \ | ||
${{github.workspace}}; | ||
# ${{matrix.mpipreflags}} \ | ||
# for some reason this cmake command fails to build the code, | ||
# and we need to use the make command that follows instead ... | ||
# cmake --build ${{runner.workspace}}/ERF/build-${{matrix.os}} --parallel ${{env.NPROCS}}; | ||
pushd ${{runner.workspace}}/ERF/build-${{matrix.os}}; | ||
# make -j ${{env.NPROCS}}; | ||
make -j 2; | ||
# - name: Regression Tests | ||
# run: | | ||
# ctest -L regression -VV | ||
# working-directory: ${{runner.workspace}}/ERF/build-${{matrix.os}} | ||
|
||
# - name: Generate coverage report | ||
# working-directory: ${{runner.workspace}}/ERF/build-${{matrix.os}} | ||
# run: | | ||
# find . -type f -name '*.gcno' -path "**Source**" -exec gcov -pb {} + | ||
# cd .. | ||
# gcovr -g -k -r . --xml regressioncov.xml # -v | ||
|
||
# - name: Upload coverage to Codecov | ||
# uses: codecov/codecov-action@v3 | ||
# with: | ||
# dry_run: false | ||
# # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos | ||
# files: ./regressioncov.xml # optional | ||
# flags: regtests # optional | ||
# # name: codecov-umbrella # optional | ||
# fail_ci_if_error: true # optional (default = false) | ||
# verbose: true # optional (default = false) | ||
# directory: ${{runner.workspace}}/ERF | ||
|
||
- name: Success artifacts | ||
uses: actions/upload-artifact@v3 | ||
if: success() | ||
with: | ||
name: build-and-test | ||
path: | | ||
${{runner.workspace}}/ERF/regressioncov.xml | ||
- name: Failing test artifacts | ||
uses: actions/upload-artifact@v3 | ||
if: failure() | ||
with: | ||
name: build-and-test | ||
path: | | ||
${{runner.workspace}}/ERF/regressioncov.xml |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,42 @@ | ||
#23.11 | ||
# 24.01 | ||
-- AMReX submodule set to 24.01 release hash (a068330) | ||
|
||
-- Addition of more moisture vars (#1350) | ||
|
||
-- AMReX submodule set to 23.11 release hash (ae7b64b) | ||
-- Make PBL model terrain aware (#1348) | ||
|
||
-- Bug fix with vertical grid stretching and MOST (#1275) | ||
-- Moisture is no longer a compile time option (#1334) | ||
|
||
-- Bug fix with negative K_turb below surface and MYNN2.5 PBL model (#1271) | ||
-- Radiation cleanup (#1318) | ||
|
||
-- Correction to equation of state with moisture (#1263) | ||
-- Enable multiple moisture models (#1303) | ||
|
||
# 23.12 | ||
-- AMReX submodule set to 23.12 release hash (9b733ec) | ||
|
||
-- Generalized multi-level sponge zones. This allows for nudging of fine solution | ||
towards coarse solution with complex box arrays. (#1233) | ||
-- Inclusion of Kessler microphysics option (#1324) | ||
|
||
# 23.10 | ||
-- Fix for particles with redistribute call (#1314) | ||
|
||
-- Inclusion of radiation (#1311) | ||
|
||
-- Inclusion of refluxing for two-way coupling (#1289) | ||
|
||
-- Metgrid initialization with SST and LandMask (#1280) | ||
|
||
# 23.11 | ||
-- AMReX submodule set to 23.11 release hash (ae7b64b) | ||
|
||
-- First release since JOSS paper. Too many key ERF PRs to summarize. | ||
-- Bug fix with vertical grid stretching and MOST (#1275) | ||
|
||
-- Bug fix with negative K_turb below surface and MYNN2.5 PBL model (#1271) | ||
|
||
-- Correction to equation of state with moisture (#1263) | ||
|
||
-- Generalized multi-level sponge zones. This allows for nudging of fine solution | ||
towards coarse solution with complex box arrays. (#1233) | ||
|
||
# 23.10 | ||
-- First release since JOSS paper. Too many key ERF PRs to summarize. | ||
|
||
-- AMReX submodule set to 23.10 release hash (388738d) | ||
-- AMReX submodule set to 23.10 release hash (388738d) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.