Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for testing #250

Merged
merged 12 commits into from
Sep 19, 2023
Merged

Updates for testing #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
554ab22
Update CI.
jrood-nrel Sep 18, 2023
5608af4
Update CI.
jrood-nrel Sep 18, 2023
2d71fd1
Add non-EB cases.
jrood-nrel Sep 18, 2023
b414d05
TurbInflow is only 3d.
jrood-nrel Sep 18, 2023
73467f3
Don't use hipcc.
jrood-nrel Sep 18, 2023
cc17333
Merge branch 'development' into jrood/update-ci
jrood-nrel Sep 18, 2023
ce0b7bc
Try installing less HIP libraries.
jrood-nrel Sep 18, 2023
fcc664b
Update PelePhysics. Fix more implicit bool.
jrood-nrel Sep 18, 2023
b1e63e9
Try to fix HIP. Turn off TripleFlame.
jrood-nrel Sep 19, 2023
1cf98b8
Try updating sundials for HIP.
jrood-nrel Sep 19, 2023
2f996fe
Try rocm-libs.
jrood-nrel Sep 19, 2023
c1f0b63
Try to use TMPDIR.
jrood-nrel Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@ jobs:
echo "::add-matcher::.github/problem-matchers/gcc.json"
set -eu -o pipefail
ccache -z
make -j ${{env.NPROCS}} DIM=3 KEEP_BUILDINFO_CPP=TRUE USE_CCACHE=TRUE COMP=gnu USE_MPI=FALSE DEBUG=TRUE 2>&1 | tee -a build-output.txt
make -j ${{env.NPROCS}} DIM=2 KEEP_BUILDINFO_CPP=TRUE USE_CCACHE=TRUE COMP=gnu USE_MPI=FALSE DEBUG=TRUE 2>&1 | tee -a build-output.txt
- name: FlameSheet ccache report
working-directory: ./Exec/RegTests/FlameSheet
run: |
ccache -s
du -hs ${HOME}/.cache/ccache
- name: FlameSheet debug test
working-directory: ./Exec/RegTests/FlameSheet
run: ./PeleLMeX3d.gnu.DEBUG.ex flamesheet-drm19-3d.inp amr.max_step=1 amr.plot_int=-1 amr.check_int=-1
run: ./PeleLMeX2d.gnu.DEBUG.ex flamesheet-drm19-2d.inp amr.max_step=1 amr.plot_int=-1 amr.check_int=-1
- name: FlameSheet debug report
working-directory: ./Exec/RegTests/FlameSheet
run: |
egrep "warning:|error:" build-output.txt \
| egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile" \
| egrep -v "Submodules/amrex|Submodules/sundials|Submodules/AMReX-Hydro|GNUmakefile" \
| egrep -v "ld: warning:" | sort | uniq \
| awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
cat warnings.txt
Expand All @@ -99,7 +99,7 @@ jobs:
# working-directory: ./Exec/RegTests/EB-C10
# run: |
# egrep "warning:|error:" build-output.txt \
# | egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile" \
# | egrep -v "Submodules/amrex|Submodules/sundials|Submodules/AMReX-Hydro|GNUmakefile" \
# | egrep -v "ld: warning:" | sort | uniq \
# | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
# cat warnings.txt
Expand All @@ -124,7 +124,7 @@ jobs:
# working-directory: ./Exec/RegTests/TG
# run: |
# egrep "warning:|error:" build-output.txt \
# | egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile" \
# | egrep -v "Submodules/amrex|Submodules/sundials|Submodules/AMReX-Hydro|GNUmakefile" \
# | egrep -v "ld: warning:" | sort | uniq \
# | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
# cat warnings.txt
Expand All @@ -146,7 +146,7 @@ jobs:
# working-directory: ./Exec/RegTests/Soot-Flame
# run: |
# egrep "warning:|error:" build-output.txt \
# | egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile|Submodules/PeleMP" \
# | egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile|Submodules/PeleMP|Submodules/AMReX-Hydro" \
# | egrep -v "Submodules/PelePhysics/Support/Mechanism/Models" | sort | uniq \
# | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
# cat warnings.txt
Expand All @@ -168,7 +168,7 @@ jobs:
# working-directory: ./Exec/RegTests/Spray-Conv
# run: |
# egrep "warning:|error:" build-output.txt \
# | egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile|Submodules/PeleMP" \
# | egrep -v "Submodules/amrex|Submodules/sundials|GNUmakefile|Submodules/PeleMP|Submodules/AMReX-Hydro" \
# | egrep -v "Submodules/PelePhysics/Support/Mechanism/Models" | sort | uniq \
# | awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > warnings.txt
# cat warnings.txt
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
run: |
echo "::add-matcher::.github/problem-matchers/gcc.json"
egrep "warning:|error:" ${{runner.workspace}}/build-output.txt \
| egrep -v "Submodules/amrex|Submodules/sundials" \
| egrep -v "Submodules/amrex|Submodules/sundials|Submodules/AMReX-Hydro" \
| egrep -v "ld: warning:" | egrep -v "lto-wrapper: warning:" | sort | uniq \
| awk 'BEGIN{i=0}{print $0}{i++}END{print "Warnings: "i}' > ${{runner.workspace}}/build-output-warnings.txt
cat ${{runner.workspace}}/build-output-warnings.txt
Expand Down Expand Up @@ -399,7 +399,7 @@ jobs:
echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \
| sudo tee -a /etc/profile.d/rocm.sh
sudo apt-get update
sudo apt-get install -y rocm-dev roctracer-dev rocprofiler-dev rocrand-dev rocprim-dev rocm-libs
export TMPDIR=${{runner.workspace}}/.tmp && mkdir -p $TMPDIR && sudo apt-get install -y rocm-dev rocrand-dev rocprim-dev rocm-libs
- name: Install Ccache
run: |
wget https://github.com/ccache/ccache/releases/download/v4.8/ccache-4.8-linux-x86_64.tar.xz
Expand All @@ -416,13 +416,13 @@ jobs:
run: |
source /etc/profile.d/rocm.sh
which clang
which clang++
which hipcc
cmake -B${{runner.workspace}}/build-hip \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_CXX_COMPILER:STRING=$(which hipcc) \
-DCMAKE_CXX_COMPILER:STRING=$(which clang++) \
-DCMAKE_C_COMPILER:STRING=$(which clang) \
-DCMAKE_CXX_STANDARD:STRING=17 \
-DPELELMEX_ENABLE_MPI:BOOL=OFF \
-DPELELMEX_ENABLE_HIP:BOOL=ON \
-DAMReX_AMD_ARCH:STRING=gfx90a \
Expand All @@ -431,7 +431,6 @@ jobs:
-DGPU_TARGETS:STRING=gfx90a \
-DAMReX_GPU_RDC:BOOL=OFF \
-DPELELMEX_ENABLE_FCOMPARE_FOR_TESTS:BOOL=OFF \
-DPELELMEX_ENABLE_MASA:BOOL=OFF \
-DCMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache \
${{github.workspace}}
- name: Build
Expand Down
61 changes: 0 additions & 61 deletions .github/workflows/cuda.yml
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions .github/workflows/hip.yml
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions .github/workflows/intel.yml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/style.yml
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/style/check_tabs.sh
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/style/check_trailing_whitespaces.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set(PELELMEX_PRECISION "DOUBLE" CACHE STRING "Floating point precision SINGLE or
option(PELELMEX_ENABLE_EB "Enable Embedded Boundary" OFF)
option(PELELMEX_ENABLE_EFIELD "Enable Electric field module" OFF)
option(PELELMEX_ENABLE_SOOT "Enable Soot module" OFF)
option(PELELMEX_ENABLE_PARTICLE "Enable particles" OFF)
option(PELELMEX_ENABLE_PARTICLES "Enable particles" OFF)

# HPC options
option(PELELMEX_ENABLE_MPI "Enable MPI" OFF)
Expand Down
Loading