Skip to content

Commit 29e5787

Browse files
committed
Revert workflow changes
1 parent c8ce8fe commit 29e5787

File tree

4 files changed

+3
-41
lines changed

4 files changed

+3
-41
lines changed

.azure-pipelines.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
# Cartesian 3D
3939
cartesian_3d:
4040
WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON
41-
WARPX_HEFFTE: 'TRUE'
4241
# Cylindrical RZ
4342
cylindrical_rz:
4443
WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON
@@ -121,17 +120,6 @@ jobs:
121120
-DCMAKE_CXX_STANDARD=17 \
122121
-Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
123122
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
135123
# Python modules required for test analysis
136124
python3 -m pip install --upgrade -r Regression/requirements.txt
137125
python3 -m pip cache purge

.github/workflows/cuda.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ jobs:
6262
-DBUILD_CLI_TOOLS=OFF \
6363
-DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \
6464
-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
7565
- name: build WarpX
7666
run: |
7767
export CCACHE_COMPRESS=1
@@ -92,7 +82,6 @@ jobs:
9282
-DWarpX_openpmd_internal=OFF \
9383
-DWarpX_PRECISION=SINGLE \
9484
-DWarpX_FFT=ON \
95-
-DWarpX_HEFFTE=ON \
9685
-DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
9786
-DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
9887
cmake --build build_sp -j 4
@@ -137,7 +126,7 @@ jobs:
137126
which nvcc || echo "nvcc not in PATH!"
138127
139128
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
140-
cd ../amrex && git checkout --detach 4b703fec6c2ff983e465c8cef0cc4947231edb07 && cd -
129+
cd ../amrex && git checkout --detach 456c93c7d9512f1cdffac0574973d7df41417898 && cd -
141130
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
142131
143132
ccache -s

.github/workflows/dependencies/hip.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,3 @@ 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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ jobs:
6161
-DWarpX_MPI=ON \
6262
-DWarpX_OPENPMD=ON \
6363
-DWarpX_PRECISION=SINGLE \
64-
-DWarpX_FFT=ON \
65-
-DWarpX_HEFFTE=ON
64+
-DWarpX_FFT=ON
6665
cmake --build build_sp -j 4
6766
6867
export WARPX_MPI=OFF
@@ -122,8 +121,7 @@ jobs:
122121
-DWarpX_MPI=ON \
123122
-DWarpX_OPENPMD=ON \
124123
-DWarpX_PRECISION=DOUBLE \
125-
-DWarpX_FFT=ON \
126-
-DWarpX_HEFFTE=ON
124+
-DWarpX_FFT=ON
127125
cmake --build build_2d -j 4
128126
129127
export WARPX_MPI=OFF

0 commit comments

Comments
 (0)