diff --git a/CMakeLists.txt b/CMakeLists.txt index 976c736f5f35..33529747f44c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,6 +233,8 @@ if(USE_TENSORRT) ${ONNX_PROTO_LIBRARY} ${ONNX_LIBRARY} ${PROTOBUF_LIBRARY}) endif() +# please note that when you enable this, you might run into an linker not being able to work properly due to large code injection. +# you can find more information here https://github.com/apache/incubator-mxnet/issues/15971 if(ENABLE_TESTCOVERAGE) message(STATUS "Compiling with test coverage support enabled. This will result in additional files being written to your source directory!") find_program( GCOV_PATH gcov ) diff --git a/Makefile b/Makefile index a14c29452f6e..4d823d0ac284 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,8 @@ endif CFLAGS += -I$(TPARTYDIR)/mshadow/ -I$(TPARTYDIR)/dmlc-core/include -fPIC -I$(NNVM_PATH)/include -I$(DLPACK_PATH)/include -I$(TPARTYDIR)/tvm/include -Iinclude $(MSHADOW_CFLAGS) LDFLAGS = -pthread -ldl $(MSHADOW_LDFLAGS) $(DMLC_LDFLAGS) +# please note that when you enable this, you might run into an linker not being able to work properly due to large code injection. +# you can find more information here https://github.com/apache/incubator-mxnet/issues/15971 ifeq ($(ENABLE_TESTCOVERAGE), 1) CFLAGS += --coverage LDFLAGS += --coverage diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 2518f4c7c64f..63c369827515 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -299,7 +299,6 @@ build_centos7_cpu() { make \ DEV=1 \ USE_LAPACK=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_LAPACK_PATH=/usr/lib64/liblapack.so \ USE_BLAS=openblas \ USE_MKLDNN=0 \ @@ -314,7 +313,6 @@ build_amzn_linux_cpu() { cmake \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DENABLE_TESTCOVERAGE=ON \ -DUSE_CUDA=OFF\ -DUSE_OPENCV=ON\ -DUSE_OPENMP=ON\ @@ -335,7 +333,6 @@ build_centos7_mkldnn() { build_ccache_wrappers make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_LAPACK=1 \ USE_LAPACK_PATH=/usr/lib64/liblapack.so \ USE_BLAS=openblas \ @@ -350,7 +347,6 @@ build_centos7_gpu() { build_ccache_wrappers make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_LAPACK=1 \ USE_LAPACK_PATH=/usr/lib64/liblapack.so \ USE_BLAS=openblas \ @@ -374,7 +370,6 @@ build_ubuntu_cpu_openblas() { build_ccache_wrappers make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_MKLDNN=0 \ @@ -392,7 +387,6 @@ build_ubuntu_cpu_mkl() { export CXX="ccache g++" make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=mkl \ USE_MKLDNN=0 \ @@ -410,7 +404,6 @@ build_ubuntu_cpu_cmake_debug() { cmake \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DENABLE_TESTCOVERAGE=ON \ -DUSE_CUDA=OFF \ -DUSE_MKL_IF_AVAILABLE=OFF \ -DUSE_OPENMP=OFF \ @@ -461,7 +454,6 @@ build_ubuntu_cpu_clang39() { export CC=clang-3.9 build_ccache_wrappers make \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_MKLDNN=0 \ @@ -479,7 +471,6 @@ build_ubuntu_cpu_clang60() { build_ccache_wrappers make \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_MKLDNN=0 \ @@ -525,7 +516,6 @@ build_ubuntu_cpu_clang39_mkldnn() { build_ccache_wrappers make \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_OPENMP=0 \ @@ -542,7 +532,6 @@ build_ubuntu_cpu_clang60_mkldnn() { build_ccache_wrappers make \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_OPENMP=1 \ @@ -557,7 +546,6 @@ build_ubuntu_cpu_mkldnn() { make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_SIGNAL_HANDLER=1 \ @@ -571,7 +559,6 @@ build_ubuntu_cpu_mkldnn_mkl() { make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=mkl \ USE_SIGNAL_HANDLER=1 \ @@ -635,7 +622,6 @@ build_ubuntu_gpu_tensorrt() { -DUSE_OPENMP=0 \ -DUSE_MKLDNN=0 \ -DUSE_MKL_IF_AVAILABLE=OFF \ - -DENABLE_TESTCOVERAGE=ON \ -DCUDA_ARCH_NAME=Manual \ -DCUDA_ARCH_BIN=$CI_CMAKE_CUDA_ARCH_BIN \ -G Ninja \ @@ -651,7 +637,6 @@ build_ubuntu_gpu_mkldnn() { make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_CPP_PACKAGE=1 \ USE_BLAS=openblas \ USE_CUDA=1 \ @@ -669,7 +654,6 @@ build_ubuntu_gpu_mkldnn_nocudnn() { make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_BLAS=openblas \ USE_CUDA=1 \ USE_CUDA_PATH=/usr/local/cuda \ @@ -684,7 +668,6 @@ build_ubuntu_gpu_cuda101_cudnn7() { build_ccache_wrappers make \ DEV=1 \ - ENABLE_TESTCOVERAGE=1 \ USE_BLAS=openblas \ USE_MKLDNN=0 \ USE_CUDA=1 \ @@ -706,8 +689,7 @@ build_ubuntu_amalgamation() { build_ccache_wrappers make -C amalgamation/ clean make -C amalgamation/ \ - USE_BLAS=openblas \ - ENABLE_TESTCOVERAGE=1 + USE_BLAS=openblas } build_ubuntu_amalgamation_min() { @@ -717,8 +699,7 @@ build_ubuntu_amalgamation_min() { make -C amalgamation/ clean make -C amalgamation/ \ USE_BLAS=openblas \ - MIN=1 \ - ENABLE_TESTCOVERAGE=1 + MIN=1 } build_ubuntu_gpu_cmake_mkldnn() { @@ -730,7 +711,6 @@ build_ubuntu_gpu_cmake_mkldnn() { -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DUSE_SIGNAL_HANDLER=ON \ - -DENABLE_TESTCOVERAGE=ON \ -DUSE_CUDA=1 \ -DUSE_CUDNN=1 \ -DUSE_MKLML_MKL=1 \ @@ -755,7 +735,6 @@ build_ubuntu_gpu_cmake() { -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DUSE_SIGNAL_HANDLER=ON \ - -DENABLE_TESTCOVERAGE=ON \ -DUSE_CUDA=ON \ -DUSE_CUDNN=ON \ -DUSE_MKL_IF_AVAILABLE=OFF \ @@ -781,7 +760,6 @@ build_ubuntu_cpu_large_tensor() { -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DUSE_SIGNAL_HANDLER=ON \ - -DENABLE_TESTCOVERAGE=ON \ -DUSE_CUDA=OFF \ -DUSE_CUDNN=OFF \ -DUSE_MKLDNN=OFF \ @@ -802,7 +780,6 @@ build_ubuntu_gpu_large_tensor() { -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DUSE_SIGNAL_HANDLER=ON \ - -DENABLE_TESTCOVERAGE=ON \ -DUSE_CUDA=ON \ -DUSE_CUDNN=ON \ -DUSE_MKL_IF_AVAILABLE=OFF \ diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index f653e0c5cb63..eaafc3dbcdd0 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -112,7 +112,7 @@ def compile_unix_cpu_openblas() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_openblas', false) - utils.pack_lib('cpu', mx_lib_cython, true) + utils.pack_lib('cpu', mx_lib_cython) } } } @@ -126,7 +126,7 @@ def compile_unix_openblas_debug_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_cmake_debug', false) - utils.pack_lib('cpu_debug', mx_cmake_lib_debug, true) + utils.pack_lib('cpu_debug', mx_cmake_lib_debug) } } } @@ -140,7 +140,7 @@ def compile_unix_int64_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_large_tensor', false) - utils.pack_lib('ubuntu_cpu_int64', mx_cmake_lib, true) + utils.pack_lib('ubuntu_cpu_int64', mx_cmake_lib) } } } @@ -154,7 +154,7 @@ def compile_unix_int64_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_large_tensor', false) - utils.pack_lib('ubuntu_gpu_int64', mx_cmake_lib, true) + utils.pack_lib('ubuntu_gpu_int64', mx_cmake_lib) } } } @@ -168,7 +168,7 @@ def compile_unix_mkl_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_mkl', false) - utils.pack_lib('cpu_mkl', mx_mkldnn_lib, true) + utils.pack_lib('cpu_mkl', mx_mkldnn_lib) } } } @@ -182,7 +182,7 @@ def compile_unix_mkldnn_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_mkldnn', false) - utils.pack_lib('mkldnn_cpu', mx_mkldnn_lib, true) + utils.pack_lib('mkldnn_cpu', mx_mkldnn_lib) } } } @@ -196,7 +196,7 @@ def compile_unix_mkldnn_mkl_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_mkldnn_mkl', false) - utils.pack_lib('mkldnn_mkl_cpu', mx_mkldnn_lib, true) + utils.pack_lib('mkldnn_mkl_cpu', mx_mkldnn_lib) } } } @@ -210,7 +210,7 @@ def compile_unix_mkldnn_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_mkldnn', false) - utils.pack_lib('mkldnn_gpu', mx_mkldnn_lib, true) + utils.pack_lib('mkldnn_gpu', mx_mkldnn_lib) } } } @@ -224,7 +224,7 @@ def compile_unix_mkldnn_nocudnn_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_mkldnn_nocudnn', false) - utils.pack_lib('mkldnn_gpu_nocudnn', mx_mkldnn_lib, true) + utils.pack_lib('mkldnn_gpu_nocudnn', mx_mkldnn_lib) } } } @@ -238,7 +238,7 @@ def compile_unix_full_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7', false) - utils.pack_lib('gpu', mx_lib_cpp_examples, true) + utils.pack_lib('gpu', mx_lib_cpp_examples) } } } @@ -252,7 +252,7 @@ def compile_unix_cmake_mkldnn_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_cmake_mkldnn', false) - utils.pack_lib('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib, true) + utils.pack_lib('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib) } } } @@ -266,7 +266,7 @@ def compile_unix_cmake_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_cmake', false) - utils.pack_lib('cmake_gpu', mx_cmake_lib_cython, true) + utils.pack_lib('cmake_gpu', mx_cmake_lib_cython) } } } @@ -280,7 +280,7 @@ def compile_unix_tensorrt_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_gpu_tensorrt', 'build_ubuntu_gpu_tensorrt', false) - utils.pack_lib('tensorrt', mx_tensorrt_lib, true) + utils.pack_lib('tensorrt', mx_tensorrt_lib) } } } @@ -294,7 +294,7 @@ def compile_centos7_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('centos7_cpu', 'build_centos7_cpu', false) - utils.pack_lib('centos7_cpu', mx_lib, true) + utils.pack_lib('centos7_cpu', mx_lib) } } } @@ -308,7 +308,7 @@ def compile_centos7_cpu_mkldnn() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('centos7_cpu', 'build_centos7_mkldnn', false) - utils.pack_lib('centos7_mkldnn', mx_mkldnn_lib, true) + utils.pack_lib('centos7_mkldnn', mx_mkldnn_lib) } } } @@ -322,7 +322,7 @@ def compile_centos7_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('centos7_gpu', 'build_centos7_gpu', false) - utils.pack_lib('centos7_gpu', mx_lib, true) + utils.pack_lib('centos7_gpu', mx_lib) } } } @@ -375,7 +375,7 @@ def compile_unix_clang_3_9_mkldnn_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang39_mkldnn', false) - utils.pack_lib('mkldnn_cpu_clang3', mx_mkldnn_lib, true) + utils.pack_lib('mkldnn_cpu_clang3', mx_mkldnn_lib) } } } @@ -389,7 +389,7 @@ def compile_unix_clang_6_mkldnn_cpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang60_mkldnn', false) - utils.pack_lib('mkldnn_cpu_clang6', mx_mkldnn_lib, true) + utils.pack_lib('mkldnn_cpu_clang6', mx_mkldnn_lib) } } } @@ -643,7 +643,7 @@ def test_unix_python2_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python2-cpu') { try { - utils.unpack_and_init('cpu', mx_lib_cython, true) + utils.unpack_and_init('cpu', mx_lib_cython) python2_ut_cython('ubuntu_cpu') utils.publish_test_coverage() } finally { @@ -661,7 +661,7 @@ def test_unix_python2_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-python2-gpu') { try { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) python2_gpu_ut('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { @@ -678,7 +678,7 @@ def test_unix_python2_quantize_gpu() { ws('workspace/ut-python2-quantize-gpu') { timeout(time: max_time, unit: 'MINUTES') { try { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_python2_quantization_gpu', true) utils.publish_test_coverage() } finally { @@ -695,7 +695,7 @@ def test_unix_python2_mkldnn_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-python2-mkldnn-gpu') { try { - utils.unpack_and_init('mkldnn_gpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_gpu', mx_mkldnn_lib) python2_gpu_ut('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { @@ -711,7 +711,7 @@ def test_unix_python3_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python3-cpu') { try { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) python3_ut('ubuntu_cpu') utils.publish_test_coverage() } finally { @@ -728,7 +728,7 @@ def test_unix_python3_mkl_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python3-cpu') { try { - utils.unpack_and_init('cpu_mkl', mx_lib, true) + utils.unpack_and_init('cpu_mkl', mx_lib) python3_ut('ubuntu_cpu') utils.publish_test_coverage() } finally { @@ -745,7 +745,7 @@ def test_unix_python3_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-python3-gpu') { try { - utils.unpack_and_init('gpu', mx_lib_cython, true) + utils.unpack_and_init('gpu', mx_lib_cython) python3_gpu_ut_cython('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { @@ -762,7 +762,7 @@ def test_unix_python3_quantize_gpu() { ws('workspace/ut-python3-quantize-gpu') { timeout(time: max_time, unit: 'MINUTES') { try { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_python3_quantization_gpu', true) utils.publish_test_coverage() } finally { @@ -779,7 +779,7 @@ def test_unix_python3_debug_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python3-cpu-debug') { try { - utils.unpack_and_init('cpu_debug', mx_cmake_lib_debug, true) + utils.unpack_and_init('cpu_debug', mx_cmake_lib_debug) python3_ut('ubuntu_cpu') } finally { utils.collect_test_results_unix('nosetests_unittest.xml', 'nosetests_python3_cpu_debug_unittest.xml') @@ -795,7 +795,7 @@ def test_unix_python2_mkldnn_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python2-mkldnn-cpu') { try { - utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib) python2_ut('ubuntu_cpu') utils.publish_test_coverage() } finally { @@ -813,7 +813,7 @@ def test_unix_python3_mkldnn_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python3-mkldnn-cpu') { try { - utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib) python3_ut_mkldnn('ubuntu_cpu') utils.publish_test_coverage() } finally { @@ -830,7 +830,7 @@ def test_unix_python3_mkldnn_mkl_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-python3-mkldnn-mkl-cpu') { try { - utils.unpack_and_init('mkldnn_mkl_cpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_mkl_cpu', mx_mkldnn_lib) python3_ut_mkldnn('ubuntu_cpu') utils.publish_test_coverage() } finally { @@ -847,7 +847,7 @@ def test_unix_python3_mkldnn_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-python3-mkldnn-gpu') { try { - utils.unpack_and_init('mkldnn_gpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_gpu', mx_mkldnn_lib) python3_gpu_ut('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { @@ -863,7 +863,7 @@ def test_unix_python3_mkldnn_nocudnn_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-python3-mkldnn-gpu-nocudnn') { try { - utils.unpack_and_init('mkldnn_gpu_nocudnn', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_gpu_nocudnn', mx_mkldnn_lib) python3_gpu_ut_nocudnn('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { @@ -880,7 +880,7 @@ def test_unix_python3_tensorrt_gpu() { ws('workspace/build-tensorrt') { timeout(time: max_time, unit: 'MINUTES') { try { - utils.unpack_and_init('tensorrt', mx_tensorrt_lib, true) + utils.unpack_and_init('tensorrt', mx_tensorrt_lib) utils.docker_run('ubuntu_gpu_tensorrt', 'unittest_ubuntu_tensorrt_gpu', true) utils.publish_test_coverage() } finally { @@ -897,7 +897,7 @@ def test_unix_python3_integration_gpu() { node(NODE_LINUX_GPU) { ws('workspace/it-python-gpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_python', true) utils.publish_test_coverage() } @@ -926,7 +926,7 @@ def test_unix_cpp_package_gpu() { node(NODE_LINUX_GPU) { ws('workspace/it-cpp-package') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('gpu', mx_lib_cpp_examples, true) + utils.unpack_and_init('gpu', mx_lib_cpp_examples) utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_cpp_package', true) utils.publish_test_coverage() } @@ -940,7 +940,7 @@ def test_unix_scala_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-scala-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_scala', false) utils.publish_test_coverage() } @@ -954,7 +954,7 @@ def test_unix_scala_mkldnn_cpu(){ node(NODE_LINUX_CPU) { ws('workspace/ut-scala-mkldnn-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib) utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_scala', false) utils.publish_test_coverage() } @@ -968,7 +968,7 @@ def test_unix_scala_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-scala-gpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_scala', true) utils.publish_test_coverage() } @@ -982,7 +982,7 @@ def test_unix_clojure_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-clojure-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_clojure', false) utils.publish_test_coverage() } @@ -996,7 +996,7 @@ def test_unix_clojure_integration_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-clojure-integration-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_clojure_integration', false) } } @@ -1009,7 +1009,7 @@ def test_unix_r_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-r-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpu_R', false) utils.publish_test_coverage() } @@ -1023,7 +1023,7 @@ def test_unix_r_mkldnn_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-r-mkldnn-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib, true) + utils.unpack_and_init('mkldnn_cpu', mx_mkldnn_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_minimal_R', false) utils.publish_test_coverage() } @@ -1037,7 +1037,7 @@ def test_unix_perl_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-perl-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'unittest_ubuntu_cpugpu_perl', false) utils.publish_test_coverage() } @@ -1051,7 +1051,7 @@ def test_unix_cpp_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-cpp-gpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cmake_gpu', mx_cmake_lib, true) + utils.unpack_and_init('cmake_gpu', mx_cmake_lib) utils.docker_run('ubuntu_gpu_cu101', 'unittest_cpp', true) utils.publish_test_coverage() } @@ -1065,7 +1065,7 @@ def test_unix_cpp_mkldnn_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-cpp-mkldnn-gpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib, true) + utils.unpack_and_init('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib) utils.docker_run('ubuntu_gpu_cu101', 'unittest_cpp', true) utils.publish_test_coverage() } @@ -1079,7 +1079,7 @@ def test_unix_cpp_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-cpp-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu_debug', mx_cmake_lib_debug, true) + utils.unpack_and_init('cpu_debug', mx_cmake_lib_debug) utils.docker_run('ubuntu_cpu', 'unittest_cpp', false) utils.publish_test_coverage() } @@ -1093,7 +1093,7 @@ def test_unix_perl_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-perl-gpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_cpugpu_perl', true) utils.publish_test_coverage() } @@ -1107,7 +1107,7 @@ def test_unix_r_gpu() { node(NODE_LINUX_GPU) { ws('workspace/ut-r-gpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_gpu_R', true) utils.publish_test_coverage() } @@ -1147,7 +1147,7 @@ def test_unix_onnx_cpu() { node(NODE_LINUX_CPU) { ws('workspace/it-onnx-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_onnx', false) utils.publish_test_coverage() } @@ -1161,7 +1161,7 @@ def test_unix_distributed_kvstore_cpu() { node(NODE_LINUX_CPU) { ws('workspace/it-dist-kvstore') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('cpu', mx_lib, true) + utils.unpack_and_init('cpu', mx_lib) utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_dist_kvstore', false) utils.publish_test_coverage() } @@ -1175,7 +1175,7 @@ def test_unix_distributed_kvstore_gpu() { node(NODE_LINUX_GPU) { ws('workspace/it-dist-kvstore') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('gpu', mx_lib, true) + utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_dist_kvstore', true) utils.publish_test_coverage() } @@ -1190,7 +1190,7 @@ def test_centos7_python3_cpu() { ws('workspace/build-centos7-cpu') { timeout(time: max_time, unit: 'MINUTES') { try { - utils.unpack_and_init('centos7_cpu', mx_lib, true) + utils.unpack_and_init('centos7_cpu', mx_lib) utils.docker_run('centos7_cpu', 'unittest_centos7_cpu', false) utils.publish_test_coverage() } finally { @@ -1209,7 +1209,7 @@ def test_centos7_python3_gpu() { ws('workspace/build-centos7-gpu') { timeout(time: max_time, unit: 'MINUTES') { try { - utils.unpack_and_init('centos7_gpu', mx_lib, true) + utils.unpack_and_init('centos7_gpu', mx_lib) utils.docker_run('centos7_gpu', 'unittest_centos7_gpu', true) utils.publish_test_coverage() } finally { @@ -1226,7 +1226,7 @@ def test_centos7_scala_cpu() { node(NODE_LINUX_CPU) { ws('workspace/ut-scala-centos7-cpu') { timeout(time: max_time, unit: 'MINUTES') { - utils.unpack_and_init('centos7_cpu', mx_lib, true) + utils.unpack_and_init('centos7_cpu', mx_lib) utils.docker_run('centos7_cpu', 'unittest_centos7_cpu_scala', false) utils.publish_test_coverage() } diff --git a/ci/jenkins/Jenkinsfile_clang b/ci/jenkins/Jenkinsfile_clang index c0af50dc3cee..029c7208107b 100644 --- a/ci/jenkins/Jenkinsfile_clang +++ b/ci/jenkins/Jenkinsfile_clang @@ -37,8 +37,8 @@ core_logic: { custom_steps.compile_unix_clang_3_9_cpu(), custom_steps.compile_unix_clang_6_cpu(), custom_steps.compile_unix_clang_tidy_cpu(), - custom_steps.compile_unix_clang_3_9_mkldnn_cpu() - // custom_steps.compile_unix_clang_6_mkldnn_cpu() + custom_steps.compile_unix_clang_3_9_mkldnn_cpu(), + custom_steps.compile_unix_clang_6_mkldnn_cpu() ]) } , diff --git a/include/mxnet/tuple.h b/include/mxnet/tuple.h index f018c8faabea..51f860995e74 100644 --- a/include/mxnet/tuple.h +++ b/include/mxnet/tuple.h @@ -199,7 +199,12 @@ class Tuple { * \return the corresponding dimension size */ inline ValueType& operator[](int i) { + // it fixes the false alarm of assuming signed overflow does not occur + // when assuming that (X - c) > X is always false [-Werror=strict-overflow] + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wstrict-overflow" CHECK(i >= 0 && i < ndim()) << "index = " << i << " must be in range [0, " << ndim() << ")"; + #pragma GCC diagnostic pop return begin()[i]; } /*! @@ -208,7 +213,12 @@ class Tuple { * \return the corresponding dimension size */ inline const ValueType& operator[](int i) const { + // it fixes the false alarm of assuming signed overflow does not occur + // when assuming that (X - c) > X is always false [-Werror=strict-overflow] + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wstrict-overflow" CHECK(i >= 0 && i < ndim()) << "index = " << i << " must be in range [0, " << ndim() << ")"; + #pragma GCC diagnostic pop return begin()[i]; } /*!