Skip to content

Commit 7b48a8c

Browse files
committed
fixup: use heffte 2.4 in HIP CI (header warning in rocm)
(requires CMake >3.19)
1 parent 9342cab commit 7b48a8c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

docker/Dockerfile.hipcc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN KEYDUMP_URL=https://cloud.cees.ornl.gov/download && \
3737

3838
# Install CMake
3939
ENV CMAKE_DIR=/opt/cmake
40-
RUN CMAKE_VERSION=3.16.9 && \
40+
RUN CMAKE_VERSION=3.22.4 && \
4141
CMAKE_KEY=2D2CEF1034921684 && \
4242
CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION} && \
4343
CMAKE_SCRIPT=cmake-${CMAKE_VERSION}-Linux-x86_64.sh && \
@@ -46,10 +46,10 @@ RUN CMAKE_VERSION=3.16.9 && \
4646
wget --quiet ${CMAKE_URL}/${CMAKE_SHA256}.asc && \
4747
wget --quiet ${CMAKE_URL}/${CMAKE_SCRIPT} && \
4848
gpg --verify ${CMAKE_SHA256}.asc ${CMAKE_SHA256} && \
49-
grep ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sha256sum --check && \
49+
grep -i ${CMAKE_SCRIPT} ${CMAKE_SHA256} | sed -e s/linux/Linux/ | sha256sum --check && \
5050
mkdir -p ${CMAKE_DIR} && \
5151
sh ${CMAKE_SCRIPT} --skip-license --prefix=${CMAKE_DIR} && \
52-
rm ${CMAKE_SCRIPT}
52+
rm cmake*
5353
ENV PATH=${CMAKE_DIR}/bin:$PATH
5454

5555
# Install Open MPI
@@ -133,7 +133,7 @@ RUN FFTW_URL=http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz && \
133133
rm -rf ${SCRATCH_DIR}
134134

135135
# Install heffte
136-
ARG HEFFTE_VERSION=2.3.0
136+
ARG HEFFTE_VERSION=2.4.0
137137
ENV HEFFTE_DIR=/opt/heffte
138138
RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.tar.gz && \
139139
HEFFTE_ARCHIVE=heffte.tar.gz && \
@@ -150,6 +150,7 @@ RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.
150150
-D CMAKE_CXX_COMPILER=hipcc \
151151
-D CMAKE_CXX_STANDARD=14 \
152152
-D CMAKE_CXX_FLAGS="--amdgpu-target=gfx908" \
153+
-D Heffte_ENABLE_TESTING=OFF \
153154
-D Heffte_ENABLE_ROCM=ON \
154155
-D Heffte_ENABLE_FFTW=ON \
155156
.. && \

0 commit comments

Comments
 (0)