lebeg closed pull request #12850: Updated nvidia docker base image to CUDA 10.0
URL: https://github.com/apache/incubator-mxnet/pull/12850
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/3rdparty/ps-lite b/3rdparty/ps-lite
index 8a763892a97..226e82c5309 160000
--- a/3rdparty/ps-lite
+++ b/3rdparty/ps-lite
@@ -1 +1 @@
-Subproject commit 8a763892a973afc1acd3d4b469d05bb338a83a6e
+Subproject commit 226e82c53095d64866821245024d5342996787f4
diff --git a/ci/docker/Dockerfile.build.centos7_gpu
b/ci/docker/Dockerfile.build.centos7_gpu
index 8bf2442731a..d9878743fd5 100644
--- a/ci/docker/Dockerfile.build.centos7_gpu
+++ b/ci/docker/Dockerfile.build.centos7_gpu
@@ -18,7 +18,7 @@
#
# Dockerfile to build and run MXNet on CentOS 7 for GPU
-FROM nvidia/cuda:9.1-cudnn7-devel-centos7
+FROM nvidia/cuda:10.0-cudnn7-devel-centos7
WORKDIR /work/deps
@@ -34,6 +34,8 @@ COPY install/centos7_adduser.sh /work/
RUN /work/centos7_adduser.sh
ENV PYTHONPATH=./python/
+ENV CUDA_ARCH_LIST="5.2 7.0"
+
WORKDIR /work/mxnet
COPY runtime_functions.sh /work/
diff --git a/ci/docker/Dockerfile.build.ubuntu_base_gpu
b/ci/docker/Dockerfile.build.ubuntu_base_gpu
index 99b79f513be..61e3c5cb1b3 100644
--- a/ci/docker/Dockerfile.build.ubuntu_base_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_base_gpu
@@ -19,7 +19,7 @@
# Dockerfile to run the MXNet Installation Tests on Ubuntu 16.04
# This should run in an empty docker with ubuntu and cuda.
-FROM nvidia/cuda:9.1-cudnn7-devel
+FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
WORKDIR /work/deps
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda
b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index 9ed0cbbe3e5..0d1d02d1636 100644
--- a/ci/docker/Dockerfile.build.ubuntu_build_cuda
+++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda
@@ -21,7 +21,7 @@
# package generation, requiring the actual CUDA library to be
# present
-FROM nvidia/cuda:9.1-cudnn7-devel
+FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
WORKDIR /work/deps
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu
b/ci/docker/Dockerfile.build.ubuntu_gpu
index 8fcbcbbb967..72af6cb8720 100644
--- a/ci/docker/Dockerfile.build.ubuntu_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu
@@ -18,7 +18,7 @@
#
# Dockerfile to run MXNet on Ubuntu 16.04 for GPU
-FROM nvidia/cuda:9.1-cudnn7-devel
+FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
WORKDIR /work/deps
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
index deeed8b0d52..a5fd804650a 100644
--- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
@@ -15,10 +15,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
-# Dockerfile to run MXNet on Ubuntu 16.04 for CPU
-FROM nvidia/cuda:9.1-cudnn7-devel
+FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
WORKDIR /work/deps
diff --git a/ci/docker/install/centos7_core.sh
b/ci/docker/install/centos7_core.sh
index 577f9dba743..fb95f798d08 100755
--- a/ci/docker/install/centos7_core.sh
+++ b/ci/docker/install/centos7_core.sh
@@ -33,7 +33,18 @@ yum -y install opencv-devel
yum -y install openssl-devel
yum -y install gcc-c++-4.8.*
yum -y install make
-yum -y install cmake
+yum -y install cmake3
yum -y install wget
yum -y install unzip
yum -y install ninja-build
+yum -y install zeromq-devel
+yum -y install protobuf-devel
+yum -y install ninja-build
+
+alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \
+ --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \
+ --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \
+ --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
+ --family cmake
+
+alternatives --install /usr/local/bin/ninja ninja /usr/bin/ninja-build 20
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 39631f9dc7e..ac6f27fb870 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -292,20 +292,18 @@ build_centos7_mkldnn() {
build_centos7_gpu() {
set -ex
cd /work/mxnet
- # unfortunately this build has problems in 3rdparty dependencies with
ccache and make
- # build_ccache_wrappers
- make \
- DEV=1 \
- ENABLE_TESTCOVERAGE=1 \
- USE_LAPACK=1 \
- USE_LAPACK_PATH=/usr/lib64/liblapack.so \
- USE_BLAS=openblas \
- USE_CUDA=1 \
- USE_CUDA_PATH=/usr/local/cuda \
- USE_CUDNN=1 \
- USE_DIST_KVSTORE=1 \
- CUDA_ARCH="$CI_CUDA_COMPUTE_CAPABILITIES" \
- -j$(nproc)
+ cmake \
+ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+ -DENABLE_TESTCOVERAGE=ON \
+ -DUSE_CUDA=ON \
+ -DUSE_CUDNN=ON \
+ -DCUDA_ARCH_LIST="${CUDA_ARCH_LIST}" \
+ -DUSE_SIGNAL_HANDLER=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DUSE_DIST_KVSTORE=ON \
+ -G Ninja /work/mxnet
+ ninja -v
}
build_ubuntu_cpu() {
diff --git a/cmake/DownloadMKLML.cmake b/cmake/DownloadMKLML.cmake
index c2c1cd6916f..7f5a68e33ee 100644
--- a/cmake/DownloadMKLML.cmake
+++ b/cmake/DownloadMKLML.cmake
@@ -54,6 +54,7 @@ elseif(APPLE)
set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
message(STATUS "Setting MKLROOT path to ${MKLROOT}")
+ include_directories(${MKLROOT}/include)
elseif(UNIX)
set(MKL_NAME "mklml_lnx_${MKLML_RELEASE_FILE_SUFFIX}")
@@ -67,6 +68,7 @@ elseif(UNIX)
set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
message(STATUS "Setting MKLROOT path to ${MKLROOT}")
+ include_directories(${MKLROOT}/include)
else()
message(FATAL_ERROR "Wrong platform")
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
