Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Updated nvidia docker base image to CUDA 10.0 #12850

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/ps-lite
4 changes: 3 additions & 1 deletion ci/docker/Dockerfile.build.centos7_gpu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!


WORKDIR /work/deps

Expand All @@ -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/
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.ubuntu_base_gpu
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.ubuntu_build_cuda
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions ci/docker/Dockerfile.build.ubuntu_nightly_gpu
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 12 additions & 1 deletion ci/docker/install/centos7_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 12 additions & 14 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions cmake/DownloadMKLML.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand All @@ -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")
Expand Down