From b44dc99e7b777197dd576520d6f23548c6512c9a Mon Sep 17 00:00:00 2001 From: Tim Greaves Date: Wed, 7 Apr 2021 19:55:06 +0100 Subject: [PATCH] DOCKER: Explicitly allow core oversubscription Core oversubscription should be switched on for tests through testharness (see issue #182) but doesn't appear to be working, so explicitly turning it on in the base images. --- docker/Dockerfile.bionic | 1 + docker/Dockerfile.focal | 1 + docker/Dockerfile.groovy | 1 + 3 files changed, 3 insertions(+) diff --git a/docker/Dockerfile.bionic b/docker/Dockerfile.bionic index b8e46d4027..040b0e78d2 100644 --- a/docker/Dockerfile.bionic +++ b/docker/Dockerfile.bionic @@ -35,6 +35,7 @@ ENV LD_LIBRARY_PATH /usr/lib/petscdir/3.8.3/linux-gnu-c-opt/lib ENV LDFLAGS -L/usr/lib/x86_64-linux-gnu/hdf5/openmpi ENV CPPFLAGS -I/usr/include/hdf5/openmpi ENV OMPI_MCA_btl_vader_single_copy_mechanism none +ENV OMPI_MCA_rmaps_base_oversubscribe 1 # Add a Fluidity user who will be the default user for this container # Make sure the user has a userid matching the host system diff --git a/docker/Dockerfile.focal b/docker/Dockerfile.focal index 3368ae5c00..f2d0b55f82 100644 --- a/docker/Dockerfile.focal +++ b/docker/Dockerfile.focal @@ -28,6 +28,7 @@ ENV PETSC_DIR /usr/lib/petscdir/3.12 ENV LDFLAGS -L/usr/lib/x86_64-linux-gnu/hdf5/openmpi ENV CPPFLAGS -I/usr/include/hdf5/openmpi ENV OMPI_MCA_btl_vader_single_copy_mechanism none +ENV OMPI_MCA_rmaps_base_oversubscribe 1 # Add a Fluidity user who will be the default user for this container # Make sure the user has a userid matching the host system diff --git a/docker/Dockerfile.groovy b/docker/Dockerfile.groovy index a336408c5f..1cba8f1fb1 100644 --- a/docker/Dockerfile.groovy +++ b/docker/Dockerfile.groovy @@ -26,6 +26,7 @@ ENV PETSC_DIR /usr/lib/petscdir/3.13 ENV LDFLAGS -L/usr/lib/x86_64-linux-gnu/hdf5/openmpi ENV CPPFLAGS -I/usr/include/hdf5/openmpi ENV OMPI_MCA_btl_vader_single_copy_mechanism none +ENV OMPI_MCA_rmaps_base_oversubscribe 1 # Add a Fluidity user who will be the default user for this container # Make sure the user has a userid matching the host system