Trying to fix Trilinos-CUDA build problems: 1) Disable package auto-u…

…pgrade for libcublas; 2) Increase core count to 3
GEOS-DEV · Sep 6, 2020 · 29cdb92 · 29cdb92
1 parent d1ee89f
commit 29cdb92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/configure_tpl_build.sh b/docker/configure_tpl_build.sh
@@ -23,7 +23,7 @@ python ${TPL_SRC_DIR}/scripts/config-build.py \
        --buildtype Release \
        --buildpath ${TPL_BUILD_DIR} \
        --installpath ${GEOSX_TPL_DIR} \
-       -DTRILINOS_NUM_PROC=2 \
+       -DTRILINOS_NUM_PROC=3 \
        -DNUM_PROC=$(nproc) \
        $*
 # Note that since docker is not used for mac,\

diff --git a/docker/gcc-cuda/Dockerfile b/docker/gcc-cuda/Dockerfile
@@ -36,7 +36,7 @@ ENV NVIDIA_REQUIRE_CUDA "cuda>=10.1 brand=tesla,driver>=384,driver<385 brand=tes
 
 FROM nvidia-base AS nvidia-runtime 
 
-RUN yum install -y \
+RUN yum install -y --setopt=obsoletes=0 \
     cuda-libraries-$CUDA_PKG_VERSION \
     cuda-nvtx-$CUDA_PKG_VERSION \
     libcublas10-10.2.1.243-1 \
@@ -46,7 +46,7 @@ RUN yum install -y \
 
 FROM nvidia-runtime AS nvidia-develop 
 
-RUN yum install -y \
+RUN yum install -y --setopt=obsoletes=0 \
     cuda-nvml-dev-$CUDA_PKG_VERSION \
     cuda-command-line-tools-$CUDA_PKG_VERSION \
     cuda-libraries-dev-$CUDA_PKG_VERSION \