diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2db00cded..cc53dd81b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ - .docker_image .opensuse: &opensuse - image: "kitware/vtkm:ci-opensuse-20231117" + image: "kitware/vtkm:ci-opensuse-20231121" extends: - .docker_image diff --git a/.gitlab/ci/docker/opensuse/Dockerfile b/.gitlab/ci/docker/opensuse/Dockerfile index 56601fc9d..4608c91bf 100644 --- a/.gitlab/ci/docker/opensuse/Dockerfile +++ b/.gitlab/ci/docker/opensuse/Dockerfile @@ -24,17 +24,23 @@ RUN zypper refresh && \ git-lfs \ hdf5-devel \ libgomp1 \ - libucp-devel \ - mpich-ofi \ - mpich-ofi-devel \ + make \ ninja \ - openucx-tools \ python311 \ python311-scipy \ tbb-devel && \ zypper clean --all -ENV fI_PROVIDER=sockets +ARG MPICH_VERSION=4.1.1 +RUN curl -s -L https://www.mpich.org/static/downloads/${MPICH_VERSION}/mpich-${MPICH_VERSION}.tar.gz | tar xzf - && \ + cd mpich-${MPICH_VERSION} && \ + ./configure \ + --disable-fortran \ + --prefix=/usr/local \ + --with-device=ch3:sock:tcp && \ + make -j $(nproc) && \ + make install && \ + rm -rf mpich-${MPICH_VERSION} # Need to run git-lfs install manually on system packaged version RUN git-lfs install