From db341495dad482e27df5fc5f155664b104d08cc2 Mon Sep 17 00:00:00 2001 From: Manu Seth <22492939+mseth10@users.noreply.github.com> Date: Thu, 30 Apr 2020 16:02:55 -0700 Subject: [PATCH] Fix Nightly CD for GPU builds and switch CD to use cmake builds (#18205) * use cmake for cd static build, skip running kvstore tests * update dnnl headers stash location * remove unnecessary platform condition * remove 7.5 arch for cu100, cu101, cu102 Co-authored-by: Ubuntu --- cd/mxnet_lib/static/Jenkins_pipeline.groovy | 2 +- ci/docker/runtime_functions.sh | 4 +++- config/distribution/linux_cu100.cmake | 2 +- config/distribution/linux_cu101.cmake | 2 +- config/distribution/linux_cu102.cmake | 2 +- tools/pip/setup.py | 5 ++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cd/mxnet_lib/static/Jenkins_pipeline.groovy b/cd/mxnet_lib/static/Jenkins_pipeline.groovy index eb9be03ff3b5..5fa5bbb7efd9 100644 --- a/cd/mxnet_lib/static/Jenkins_pipeline.groovy +++ b/cd/mxnet_lib/static/Jenkins_pipeline.groovy @@ -33,7 +33,7 @@ licenses = 'licenses/*' // libmxnet dependencies mx_native_deps = 'lib/libgfortran.so.4, lib/libquadmath.so.0' -mx_deps = 'lib/libgfortran.so.4, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/dnnl_version.h, 3rdparty/mkldnn/build/install/include/dnnl_config.h' +mx_deps = 'lib/libgfortran.so.4, lib/libquadmath.so.0, include/mkldnn/dnnl_version.h, include/mkldnn/dnnl_config.h' // library type // either static or dynamic - depending on how it links to its dependencies diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 8bb19a4a1aff..e28d053c9215 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -989,7 +989,8 @@ cd_unittest_ubuntu() { # Adding these here as CI doesn't test all CUDA environments pytest example/image-classification/test_score.py - integrationtest_ubuntu_gpu_dist_kvstore + # TODO(szha): fix and reenable the hanging issue. tracked in #18098 + # integrationtest_ubuntu_gpu_dist_kvstore fi if [[ ${mxnet_variant} = *mkl ]]; then @@ -1885,6 +1886,7 @@ build_static_libmxnet() { source /opt/rh/devtoolset-7/enable source /opt/rh/rh-python36/enable export USE_SYSTEM_CUDA=1 + export CMAKE_STATICBUILD=1 local mxnet_variant=${1:?"This function requires a python command as the first argument"} source tools/staticbuild/build.sh ${mxnet_variant} popd diff --git a/config/distribution/linux_cu100.cmake b/config/distribution/linux_cu100.cmake index 250f494d0963..457a14f89a32 100644 --- a/config/distribution/linux_cu100.cmake +++ b/config/distribution/linux_cu100.cmake @@ -33,4 +33,4 @@ set(USE_F16C OFF CACHE BOOL "Build with x86 F16C instruction support") set(USE_LIBJPEG_TURBO ON CACHE BOOL "Build with libjpeg-turbo") set(CUDACXX "/usr/local/cuda-10.0/bin/nvcc" CACHE STRING "Cuda compiler") -set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0;7.5" CACHE STRING "Cuda architectures") +set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0" CACHE STRING "Cuda architectures") diff --git a/config/distribution/linux_cu101.cmake b/config/distribution/linux_cu101.cmake index ab11bcf69067..61089200f31f 100644 --- a/config/distribution/linux_cu101.cmake +++ b/config/distribution/linux_cu101.cmake @@ -35,4 +35,4 @@ set(USE_F16C OFF CACHE BOOL "Build with x86 F16C instruction support") set(USE_LIBJPEG_TURBO ON CACHE BOOL "Build with libjpeg-turbo") set(CUDACXX "/usr/local/cuda-10.1/bin/nvcc" CACHE STRING "Cuda compiler") -set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0;7.5" CACHE STRING "Cuda architectures") +set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0" CACHE STRING "Cuda architectures") diff --git a/config/distribution/linux_cu102.cmake b/config/distribution/linux_cu102.cmake index 9e2848c7fed6..9701b99a6a1f 100644 --- a/config/distribution/linux_cu102.cmake +++ b/config/distribution/linux_cu102.cmake @@ -33,4 +33,4 @@ set(USE_F16C OFF CACHE BOOL "Build with x86 F16C instruction support") set(USE_LIBJPEG_TURBO ON CACHE BOOL "Build with libjpeg-turbo") set(CUDACXX "/usr/local/cuda-10.2/bin/nvcc" CACHE STRING "Cuda compiler") -set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0;7.5" CACHE STRING "Cuda architectures") +set(MXNET_CUDA_ARCH "3.0;5.0;6.0;7.0" CACHE STRING "Cuda architectures") diff --git a/tools/pip/setup.py b/tools/pip/setup.py index 40d57ef085ee..7aaebf5add09 100644 --- a/tools/pip/setup.py +++ b/tools/pip/setup.py @@ -150,9 +150,8 @@ def skip_markdown_comments(md): package_data = {'mxnet': [os.path.join('mxnet', os.path.basename(LIB_PATH[0]))], 'dmlc_tracker': []} if variant.endswith('MKL'): - if platform.system() == 'Darwin': - shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/build/install/include'), - os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn')) + shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/build/install/include'), + os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn')) if platform.system() == 'Linux': libdir, mxdir = os.path.dirname(LIB_PATH[0]), os.path.join(CURRENT_DIR, 'mxnet') if os.path.exists(os.path.join(libdir, 'libgfortran.so.3')):