You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by la...@apache.org on 2020/04/30 23:04:05 UTC
[incubator-mxnet] branch master updated: Fix Nightly CD for GPU
builds and switch CD to use cmake builds (#18205)
This is an automated email from the ASF dual-hosted git repository.
lausen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 0b46d90 Fix Nightly CD for GPU builds and switch CD to use cmake builds (#18205)
0b46d90 is described below
commit 0b46d90ad04a20f2f14ada219361588da12c88e8
Author: Manu Seth <22...@users.noreply.github.com>
AuthorDate: Thu Apr 30 16:02:55 2020 -0700
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 <ub...@ip-172-31-3-62.us-west-2.compute.internal>
---
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 eb9be03..5fa5bbb 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 8bb19a4..e28d053 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 250f494d..457a14f 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 ab11bcf..6108920 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 9e2848c..9701b99 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 40d57ef..7aaebf5 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -150,9 +150,8 @@ short_description += ' This version uses {0}.'.format(' and '.join(libraries))
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')):