From ef25359edac842614029f0cceb040f9b65cc817c Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 21 May 2021 12:31:28 -0400 Subject: ci: add MPICH to Fedora base image --- .gitlab/ci/docker/fedora34/install_deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh index ece0666..dfd7db8 100755 --- a/.gitlab/ci/docker/fedora34/install_deps.sh +++ b/.gitlab/ci/docker/fedora34/install_deps.sh @@ -68,6 +68,7 @@ dnf install --setopt=install_weak_deps=False -y \ libuv-devel \ libxml2-devel \ libxslt-devel \ + mpich-devel \ openmpi-devel \ patch \ perl \ -- cgit v0.12 From 2bc0708c39470d6ce612047d9864c1bbf2e67304 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 21 May 2021 12:32:39 -0400 Subject: ci: Switch to MPICH in Fedora jobs The OpenMPI package in Fedora 34 requires a CPU with AVX instructions. Some of our CI machines do not have them, and so fail the FindMPI.Test test with `SIGILL`. Switch to MPICH. Since we test with OpenMPI on the Debian jobs, this covers more MPI vendors anyway. --- .gitlab/ci/env_fedora34_makefiles.cmake | 2 +- .gitlab/os-linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/env_fedora34_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake index 1d0efa7..aa84e23 100644 --- a/.gitlab/ci/env_fedora34_makefiles.cmake +++ b/.gitlab/ci/env_fedora34_makefiles.cmake @@ -1,2 +1,2 @@ set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0") -set(ENV{PATH} "/usr/lib64/openmpi/bin:$ENV{PATH}") +set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 1bf4098..dcaa643 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -69,7 +69,7 @@ ### Fedora .fedora34: - image: "kitware/cmake:ci-fedora34-x86_64-2021-05-10" + image: "kitware/cmake:ci-fedora34-x86_64-2021-05-21" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" -- cgit v0.12