From 79d3032f73f7026980b5245ee751591058079f2b Mon Sep 17 00:00:00 2001 From: Chris Cantwell Date: Fri, 23 Oct 2020 23:47:02 +0100 Subject: [PATCH] Revert PETSc changes and shm-mem-size change. --- .gitlab-ci.yml | 2 +- cmake/ThirdPartyPETSc.cmake | 2 +- docker/nektar-env/bullseye_full_packages.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad7eb705b..13e942104 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ stages: - export ENV_IMAGE=$(docker build -q -f Dockerfile_tmp .) - mkdir -p log - if [ ! -d $CCACHE_DIR ]; then mkdir -p $CCACHE_DIR && chown 1000:1000 $CCACHE_DIR; fi - - docker run --name $CONTAINER_NAME -v ccache:/cache --shm-size=256000000 + - docker run --name $CONTAINER_NAME -v ccache:/cache -e "BUILD_TYPE=$BUILD_TYPE" -e "NUM_CPUS=$NUM_CPUS" -e "CCACHE_DIR=$CCACHE_DIR" diff --git a/cmake/ThirdPartyPETSc.cmake b/cmake/ThirdPartyPETSc.cmake index c8ea5a856..b068f47c0 100644 --- a/cmake/ThirdPartyPETSc.cmake +++ b/cmake/ThirdPartyPETSc.cmake @@ -57,7 +57,7 @@ IF (NEKTAR_USE_PETSC) # we use a MUMPS build in ordering here, in the future it might make # sense to hook it up with metis/scotch since this MIGHT be faster # disabled MUMPS due to bug in SCALAPACK - SET(PETSC_MUMPS "") + SET(PETSC_MUMPS --download-scalapack --download-mumps) SET(PETSC_DEPS "") IF(NOT BLAS_LAPACK_BUILTIN ) diff --git a/docker/nektar-env/bullseye_full_packages.txt b/docker/nektar-env/bullseye_full_packages.txt index b65e6e8c5..bbadf32e9 100644 --- a/docker/nektar-env/bullseye_full_packages.txt +++ b/docker/nektar-env/bullseye_full_packages.txt @@ -11,5 +11,6 @@ libptscotch-dev libtet1.5-dev libtriangle-dev mpi-default-dev +petsc-dev python3.9-dev python3-numpy -- GitLab