Skip to content

Commit cf51047

Browse files
EZoniEZoni
committed
Revert workflow changes
1 parent fbaa6f2 commit cf51047

File tree

12 files changed

+94
-71
lines changed

12 files changed

+94
-71
lines changed

‎.azure-pipelines.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ pr:
1313
paths:
1414
exclude:
1515
- Docs
16-
- .github/workflows/**
17-
- .azure-pipelines.yml
1816

1917
jobs:
2018
- job:
@@ -40,6 +38,7 @@ jobs:
4038
# Cartesian 3D
4139
cartesian_3d:
4240
WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON
41+
WARPX_HEFFTE: 'TRUE'
4342
# Cylindrical RZ
4443
cylindrical_rz:
4544
WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON
@@ -122,6 +121,17 @@ jobs:
122121
-DCMAKE_CXX_STANDARD=17 \
123122
-Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
124123
fi
124+
if [ "${WARPX_HEFFTE:-FALSE}" == "TRUE" ]; then
125+
cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/[email protected] \
126+
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \
127+
-DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \
128+
-DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF \
129+
-DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF \
130+
-DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \
131+
-DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
132+
-DHeffte_ENABLE_MAGMA=OFF \
133+
-DCMAKE_VERBOSE_MAKEFILE=ON
134+
fi
125135
# Python modules required for test analysis
126136
python3 -m pip install --upgrade -r Regression/requirements.txt
127137
python3 -m pip cache purge

‎.github/workflows/clang_sanitizers.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-clangsanitizers
@@ -18,7 +17,7 @@ jobs:
1817
name: Clang UB sanitizer
1918
runs-on: ubuntu-22.04
2019
container: ubuntu:23.10
21-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
20+
if: github.event.pull_request.draft == false
2221
env:
2322
CC: clang
2423
CXX: clang++
@@ -84,7 +83,7 @@ jobs:
8483
name: Clang thread sanitizer
8584
runs-on: ubuntu-22.04
8685
container: ubuntu:23.10
87-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
86+
if: github.event.pull_request.draft == false
8887
env:
8988
CC: clang
9089
CXX: clang++

‎.github/workflows/clang_tidy.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-clangtidy
@@ -21,7 +20,7 @@ jobs:
2120
name: clang-tidy-${{ matrix.dim }}D
2221
runs-on: ubuntu-22.04
2322
timeout-minutes: 180
24-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
23+
if: github.event.pull_request.draft == false
2524
steps:
2625
- uses: actions/checkout@v4
2726
- name: install dependencies

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ name: 🔍 CodeQL
22

33
on:
44
push:
5-
branches:
6-
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
5+
branches: [ "development" ]
6+
pull_request:
7+
branches: [ "development" ]
118
schedule:
129
- cron: "27 3 * * 0"
1310

@@ -19,7 +16,7 @@ jobs:
1916
analyze:
2017
name: Analyze
2118
runs-on: ubuntu-latest
22-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
19+
if: github.event.pull_request.draft == false
2320
permissions:
2421
actions: read
2522
contents: read

‎.github/workflows/cuda.yml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-cuda
@@ -21,7 +20,7 @@ jobs:
2120
build_nvcc:
2221
name: NVCC 11.3 SP
2322
runs-on: ubuntu-20.04
24-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
23+
if: github.event.pull_request.draft == false
2524
env:
2625
CXXFLAGS: "-Werror"
2726
CMAKE_GENERATOR: Ninja
@@ -63,6 +62,16 @@ jobs:
6362
-DBUILD_CLI_TOOLS=OFF \
6463
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \
6564
-DCMAKE_VERBOSE_MAKEFILE=ON
65+
cmake-easyinstall --prefix=/usr/local \
66+
git+https://github.com/icl-utk-edu/[email protected] \
67+
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \
68+
-DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \
69+
-DHeffte_ENABLE_FFTW=OFF -DHeffte_ENABLE_TESTING=OFF \
70+
-DHeffte_ENABLE_CUDA=ON -DHeffte_ENABLE_ROCM=OFF \
71+
-DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \
72+
-DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
73+
-DHeffte_ENABLE_MAGMA=OFF \
74+
-DCMAKE_VERBOSE_MAKEFILE=ON
6675
- name: build WarpX
6776
run: |
6877
export CCACHE_COMPRESS=1
@@ -83,6 +92,7 @@ jobs:
8392
-DWarpX_openpmd_internal=OFF \
8493
-DWarpX_PRECISION=SINGLE \
8594
-DWarpX_FFT=ON \
95+
-DWarpX_HEFFTE=ON \
8696
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
8797
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
8898
cmake --build build_sp -j 4
@@ -102,7 +112,7 @@ jobs:
102112
build_nvcc_gnumake:
103113
name: NVCC 11.8.0 GNUmake
104114
runs-on: ubuntu-20.04
105-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
115+
if: github.event.pull_request.draft == false
106116
steps:
107117
- uses: actions/checkout@v4
108118
- name: install dependencies
@@ -127,7 +137,7 @@ jobs:
127137
which nvcc || echo "nvcc not in PATH!"
128138
129139
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
130-
cd ../amrex && git checkout --detach 456c93c7d9512f1cdffac0574973d7df41417898 && cd -
140+
cd ../amrex && git checkout --detach 4b703fec6c2ff983e465c8cef0cc4947231edb07 && cd -
131141
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
132142
133143
ccache -s
@@ -136,7 +146,7 @@ jobs:
136146
build_nvhpc24-1-nvcc:
137147
name: [email protected] NVCC/NVC++ Release [tests]
138148
runs-on: ubuntu-20.04
139-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
149+
if: github.event.pull_request.draft == false
140150
#env:
141151
# # For NVHPC, Ninja is slower than the default:
142152
# CMAKE_GENERATOR: Ninja

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,16 @@ sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.c
7979
sudo chmod a+x /usr/local/bin/cmake-easyinstall
8080
export CEI_SUDO="sudo"
8181
export CEI_TMP="/tmp/cei"
82+
83+
# heFFTe
84+
#
85+
cmake-easyinstall --prefix=/usr/local \
86+
git+https://github.com/icl-utk-edu/[email protected] \
87+
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \
88+
-DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \
89+
-DHeffte_ENABLE_FFTW=OFF -DHeffte_ENABLE_TESTING=OFF \
90+
-DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=ON \
91+
-DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \
92+
-DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \
93+
-DHeffte_ENABLE_MAGMA=OFF \
94+
-DCMAKE_VERBOSE_MAKEFILE=ON

‎.github/workflows/hip.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-hip
@@ -20,7 +19,7 @@ jobs:
2019
env:
2120
CXXFLAGS: "-Werror -Wno-deprecated-declarations -Wno-error=pass-failed"
2221
CMAKE_GENERATOR: Ninja
23-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
22+
if: github.event.pull_request.draft == false
2423
steps:
2524
- uses: actions/checkout@v4
2625
- name: install dependencies
@@ -62,7 +61,8 @@ jobs:
6261
-DWarpX_MPI=ON \
6362
-DWarpX_OPENPMD=ON \
6463
-DWarpX_PRECISION=SINGLE \
65-
-DWarpX_FFT=ON
64+
-DWarpX_FFT=ON \
65+
-DWarpX_HEFFTE=ON
6666
cmake --build build_sp -j 4
6767
6868
export WARPX_MPI=OFF
@@ -79,7 +79,7 @@ jobs:
7979
env:
8080
CXXFLAGS: "-Werror -Wno-deprecated-declarations -Wno-error=pass-failed"
8181
CMAKE_GENERATOR: Ninja
82-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
82+
if: github.event.pull_request.draft == false
8383
steps:
8484
- uses: actions/checkout@v4
8585
- name: install dependencies
@@ -122,7 +122,8 @@ jobs:
122122
-DWarpX_MPI=ON \
123123
-DWarpX_OPENPMD=ON \
124124
-DWarpX_PRECISION=DOUBLE \
125-
-DWarpX_FFT=ON
125+
-DWarpX_FFT=ON \
126+
-DWarpX_HEFFTE=ON
126127
cmake --build build_2d -j 4
127128
128129
export WARPX_MPI=OFF

‎.github/workflows/insitu.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-insituvis
@@ -17,7 +16,7 @@ jobs:
1716
sensei:
1817
name: SENSEI
1918
runs-on: ubuntu-20.04
20-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
19+
if: github.event.pull_request.draft == false
2120
env:
2221
CXX: clang++
2322
CC: clang
@@ -43,7 +42,7 @@ jobs:
4342
ascent:
4443
name: Ascent
4544
runs-on: ubuntu-20.04
46-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
45+
if: github.event.pull_request.draft == false
4746
env:
4847
CXX: g++
4948
CC: gcc
@@ -83,7 +82,7 @@ jobs:
8382
catalyst:
8483
name: Catalyst
8584
runs-on: ubuntu-22.04
86-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
85+
if: github.event.pull_request.draft == false
8786
env:
8887
CXX: g++
8988
CC: gcc

‎.github/workflows/intel.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-intel
@@ -19,7 +18,7 @@ jobs:
1918
build_icc:
2019
name: oneAPI ICC SP&DP
2120
runs-on: ubuntu-20.04
22-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
21+
if: github.event.pull_request.draft == false
2322
# For oneAPI, Ninja is slower than the default:
2423
#env:
2524
# CMAKE_GENERATOR: Ninja
@@ -87,7 +86,7 @@ jobs:
8786
CXXFLAGS: "-Werror -Wno-error=pass-failed -Wno-tautological-constant-compare"
8887
# For oneAPI, Ninja is slower than the default:
8988
# CMAKE_GENERATOR: Ninja
90-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
89+
if: github.event.pull_request.draft == false
9190
steps:
9291
- uses: actions/checkout@v4
9392
- name: install dependencies
@@ -152,7 +151,7 @@ jobs:
152151
CXXFLAGS: "-Werror -Wno-tautological-constant-compare"
153152
# For oneAPI, Ninja is slower than the default:
154153
# CMAKE_GENERATOR: Ninja
155-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
154+
if: github.event.pull_request.draft == false
156155
steps:
157156
- uses: actions/checkout@v4
158157
- name: install dependencies

‎.github/workflows/macos.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ on:
44
push:
55
branches:
66
- "development"
7-
workflow_run:
8-
workflows: [PR analysis]
9-
types:
10-
- completed
7+
pull_request:
8+
paths-ignore:
9+
- "Docs/**"
1110

1211
concurrency:
1312
group: ${{ github.ref }}-${{ github.head_ref }}-macos
@@ -17,8 +16,7 @@ jobs:
1716
build_appleclang:
1817
name: AppleClang
1918
runs-on: macos-latest
20-
if: 0
21-
#if: ${{ github.event.pull_request.draft == false && github.event.workflow_run.outputs.skip == "false" }}
19+
if: github.event.pull_request.draft == false
2220
env:
2321
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: TRUE
2422
# For macOS, Ninja is slower than the default:

0 commit comments

Comments
 (0)