This is an automated email from the ASF dual-hosted git repository.
zhasheng 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 d52d9c6 Revert "Add SOVERSION when build shared libmxnet.so library
(#17815)" (#18882)
d52d9c6 is described below
commit d52d9c6f802291713db3330d19bb801a7b9854d5
Author: Sheng Zha <[email protected]>
AuthorDate: Sun Aug 9 13:33:03 2020 -0700
Revert "Add SOVERSION when build shared libmxnet.so library (#17815)"
(#18882)
This reverts commit d101c3c2d81c2e7e813243e163bfc5aa7a0b3aa3.
---
CMakeLists.txt | 13 +++---------
cd/Jenkinsfile_utils.groovy | 2 +-
cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy | 2 +-
cd/mxnet_lib/static/Jenkins_pipeline.groovy | 2 +-
cd/utils/test_artifact_repository.py | 10 ++++-----
ci/docker/runtime_functions.sh | 2 +-
ci/jenkins/Jenkins_steps.groovy | 24 +++++++++++-----------
tests/nightly/Jenkinsfile | 2 +-
tests/nightly/JenkinsfileForBinaries | 2 +-
.../JenkinsfileForMBCC | 2 +-
tools/staticbuild/build_lib.sh | 2 +-
11 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63c25ac..b494fdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,12 @@
cmake_minimum_required(VERSION 3.13)
-file(READ "include/mxnet/base.h" ver)
-string(REGEX MATCH "MXNET_MAJOR ([0-9]*)" _ ${ver})
-set(ver_major ${CMAKE_MATCH_1})
-string(REGEX MATCH "MXNET_MINOR ([0-9]*)" _ ${ver})
-set(ver_minor ${CMAKE_MATCH_1})
-string(REGEX MATCH "MXNET_PATCH ([0-9]*)" _ ${ver})
-set(ver_patch ${CMAKE_MATCH_1})
-
# workaround to store CMAKE_CROSSCOMPILING because is getting reset by the
project command
if(CMAKE_CROSSCOMPILING)
set(__CMAKE_CROSSCOMPILING ${CMAKE_CROSSCOMPILING})
set(__CMAKE_CROSSCOMPILING_OVERRIDE ON)
endif()
-project(mxnet VERSION ${ver_major}.${ver_minor}.${ver_patch} LANGUAGES C CXX)
+project(mxnet C CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON) # GNU extensions used by
src/operator/random/shuffle_op.cc
@@ -111,6 +103,8 @@ if(USE_TVM_OP)
add_definitions(-DMXNET_USE_TVM_OP=1)
endif()
+message(STATUS "CMake version '${CMAKE_VERSION}' using generator
'${CMAKE_GENERATOR}'")
+project(mxnet C CXX)
if(USE_CUDA)
cmake_minimum_required(VERSION 3.13.2) # CUDA 10 (Turing) detection
available starting 3.13.2
include(CheckLanguage)
@@ -711,7 +705,6 @@ elseif(MSVC)
target_link_libraries(mxnet PUBLIC mshadow)
endif()
endif()
-set_target_properties(mxnet PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION
${PROJECT_VERSION_MAJOR})
target_compile_definitions(mxnet PUBLIC
DMLC_LOG_FATAL_THROW=$<BOOL:${LOG_FATAL_THROW}>)
# extension libraries (custom operators, custom subgraphs) are built by default
diff --git a/cd/Jenkinsfile_utils.groovy b/cd/Jenkinsfile_utils.groovy
index 942079f..b345d4e 100644
--- a/cd/Jenkinsfile_utils.groovy
+++ b/cd/Jenkinsfile_utils.groovy
@@ -131,7 +131,7 @@ def restore_artifact(variant, libtype) {
// move libraries to lib directory
dir('lib') {
- sh "mv ../mxnet_artifact/libmxnet.so* ."
+ sh "mv ../mxnet_artifact/libmxnet.so ."
if (fileExists('../mxnet_artifact/dependencies')) {
sh """find "../mxnet_artifact/dependencies" -type f -name "*.so*" -exec
mv {} . \\;"""
sh "ls ."
diff --git a/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy
b/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy
index 4f0e30f..4862e89 100644
--- a/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy
+++ b/cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy
@@ -24,7 +24,7 @@
// NOTE: the following variables are referenced in the mxnet_lib_pipeline
jenkins file imported bellow
// libmxnet location
-libmxnet = 'build/libmxnet.so*'
+libmxnet = 'build/libmxnet.so'
// licenses
licenses = 'licenses/*'
diff --git a/cd/mxnet_lib/static/Jenkins_pipeline.groovy
b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
index 594c5d0..19f2a38 100644
--- a/cd/mxnet_lib/static/Jenkins_pipeline.groovy
+++ b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
@@ -26,7 +26,7 @@
// NOTE: the following variables are referenced in the mxnet_lib_pipeline
jenkins file imported bellow
// libmxnet location
-libmxnet = 'lib/libmxnet.so*'
+libmxnet = 'lib/libmxnet.so'
// licenses
licenses = 'licenses/*'
diff --git a/cd/utils/test_artifact_repository.py
b/cd/utils/test_artifact_repository.py
index 879031b..2ab5d91 100644
--- a/cd/utils/test_artifact_repository.py
+++ b/cd/utils/test_artifact_repository.py
@@ -164,7 +164,7 @@ class TestArtifactRepositoryTool(unittest.TestCase):
Tests 'native' is returned if MKLDNN and CUDA features are OFF
"""
mock_features.return_value = {'MKLDNN': False, 'CUDA': False}
- self.assertEqual(probe_mxnet_variant('libmxnet.so*'), 'native')
+ self.assertEqual(probe_mxnet_variant('libmxnet.so'), 'native')
@patch('artifact_repository.get_libmxnet_features')
def test_probe_variant_cpu(self, mock_features):
@@ -172,7 +172,7 @@ class TestArtifactRepositoryTool(unittest.TestCase):
Tests 'cpu' is returned if MKLDNN is ON and CUDA is OFF
"""
mock_features.return_value = {'MKLDNN': True, 'CUDA': False}
- self.assertEqual(probe_mxnet_variant('libmxnet.so*'), 'cpu')
+ self.assertEqual(probe_mxnet_variant('libmxnet.so'), 'cpu')
@patch('artifact_repository.get_libmxnet_features')
@patch('artifact_repository.get_cuda_version')
@@ -182,7 +182,7 @@ class TestArtifactRepositoryTool(unittest.TestCase):
"""
mock_features.return_value = {'MKLDNN': True, 'CUDA': True}
mock_cuda_version.return_value = '100'
- self.assertEqual(probe_mxnet_variant('libmxnet.so*'), 'cu100')
+ self.assertEqual(probe_mxnet_variant('libmxnet.so'), 'cu100')
@patch('artifact_repository.get_libmxnet_features')
def test_probe_variant_cuda_returns_none_on_no_features(self,
mock_features):
@@ -190,7 +190,7 @@ class TestArtifactRepositoryTool(unittest.TestCase):
Tests None is returned if the mxnet features could not be extracted
from the libmxnet.so file
"""
mock_features.return_value = None
- self.assertIsNone(probe_mxnet_variant('libmxnet.so*'))
+ self.assertIsNone(probe_mxnet_variant('libmxnet.so'))
@patch('artifact_repository.get_libmxnet_features')
@patch('artifact_repository.get_cuda_version')
@@ -201,7 +201,7 @@ class TestArtifactRepositoryTool(unittest.TestCase):
mock_features.return_value = {'MKLDNN': True, 'CUDA': True}
mock_cuda_version.return_value = None
with self.assertRaises(RuntimeError):
- probe_mxnet_variant('libmxnet.so*')
+ probe_mxnet_variant('libmxnet.so')
def test_probe_artifact_repository_bucket(self):
"""
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 920e9cf..1e988db 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -82,7 +82,7 @@ build_wheel() {
unzip -d ${TMPDIR} ${WHEEL}
rm ${WHEEL}
cd ${TMPDIR}
- mv *.data/data/mxnet/libmxnet.so* mxnet
+ mv *.data/data/mxnet/libmxnet.so mxnet
zip -r ${WHEEL} .
cp ${WHEEL} ${BUILD_DIR}
rm -rf ${TMPDIR}
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 7f38c0c..e2b0b04 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -23,21 +23,21 @@
utils = load('ci/Jenkinsfile_utils.groovy')
// mxnet libraries
-mx_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
-mx_lib_cython = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, python/mxnet/_cy3/*.so,
build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_ffi/_cy3/*.so'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
+mx_lib_cython = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, python/mxnet/_cy3/*.so,
build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_ffi/_cy3/*.so'
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static
library by default.
-mx_cmake_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/tests/mxnet_unit_tests,
build/3rdparty/openmp/runtime/src/libomp.so'
-mx_cmake_lib_no_tvm_op = 'build/libmxnet.so*, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
-mx_cmake_lib_cython = 'build/libmxnet.so*,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so,
python/mxnet/_cy3/*.so*, python/mxnet/_ffi/_cy3/*.so*'
+mx_cmake_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/tests/mxnet_unit_tests,
build/3rdparty/openmp/runtime/src/libomp.so'
+mx_cmake_lib_no_tvm_op = 'build/libmxnet.so, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
+mx_cmake_lib_cython = 'build/libmxnet.so,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so,
python/mxnet/_cy3/*.so, python/mxnet/_ffi/_cy3/*.so'
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static
library by default.
-mx_cmake_lib_debug = 'build/libmxnet.so*,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/libcustomop_lib.so, build/libcustomop_gpu_lib.so,
build/libsubgraph_lib.so, build/tests/mxnet_unit_tests'
-mx_mkldnn_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so'
-mx_tensorrt_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so, lib/libnvonnxparser_runtime.so.0,
lib/libnvonnxparser.so.0, lib/libonnx_proto.so, lib/libonnx.so'
-mx_lib_cpp_examples = 'build/libmxnet.so*,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, python/mxnet/_cy3/*.so,
python/mxnet/_ffi/_cy3/*.so'
-mx_lib_cpp_examples_no_tvm_op = 'build/libmxnet.so*, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_cy3/*.so,
python/mxnet/_ffi/_cy3/*.so'
-mx_lib_cpp_examples_cpu = 'build/libmxnet.so*,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so'
-mx_cd_lib = 'lib/libmxnet.so*, licenses/*, lib/libgfortran.so.4,
lib/libquadmath.so.0, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h,
include/mkldnn/dnnl_config.h'
+mx_cmake_lib_debug = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/tests/mxnet_unit_tests'
+mx_mkldnn_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so'
+mx_tensorrt_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so, lib/libnvonnxparser_runtime.so.0,
lib/libnvonnxparser.so.0, lib/libonnx_proto.so, lib/libonnx.so'
+mx_lib_cpp_examples = 'build/libmxnet.so,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, python/mxnet/_cy3/*.so,
python/mxnet/_ffi/_cy3/*.so'
+mx_lib_cpp_examples_no_tvm_op = 'build/libmxnet.so, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_cy3/*.so,
python/mxnet/_ffi/_cy3/*.so'
+mx_lib_cpp_examples_cpu = 'build/libmxnet.so,
build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf,
build/3rdparty/openmp/runtime/src/libomp.so'
+mx_cd_lib = 'lib/libmxnet.so, licenses/*, lib/libgfortran.so.4,
lib/libquadmath.so.0, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h,
include/mkldnn/dnnl_config.h'
// Python unittest for CPU
// Python 3
diff --git a/tests/nightly/Jenkinsfile b/tests/nightly/Jenkinsfile
index 6c40299..32fa15d 100755
--- a/tests/nightly/Jenkinsfile
+++ b/tests/nightly/Jenkinsfile
@@ -18,7 +18,7 @@
//
//This is a Jenkinsfile for nightly tests. The format and some functions have
been picked up from the top-level Jenkinsfile
-mx_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
node('utility') {
// Loading the utilities requires a node context unfortunately
diff --git a/tests/nightly/JenkinsfileForBinaries
b/tests/nightly/JenkinsfileForBinaries
index 1e030ad..22061d9 100755
--- a/tests/nightly/JenkinsfileForBinaries
+++ b/tests/nightly/JenkinsfileForBinaries
@@ -18,7 +18,7 @@
//
//This is a Jenkinsfile for nightly tests. The format and some functions have
been picked up from the top-level Jenkinsfile
-mx_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
node('utility') {
// Loading the utilities requires a node context unfortunately
diff --git
a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
index 8d7524f..453cfc9 100644
--- a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
+++ b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
@@ -18,7 +18,7 @@
//
//This is a Jenkinsfile for the model backwards compatibility checker. The
format and some functions have been picked up from the top-level Jenkinsfile.
-mx_lib = 'build/libmxnet.so*, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
+mx_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
build/libtvmop.so, build/tvmop.conf, build/libcustomop_lib.so,
build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so,
build/3rdparty/openmp/runtime/src/libomp.so'
node('restricted-utility') {
// Loading the utilities requires a node context unfortunately
diff --git a/tools/staticbuild/build_lib.sh b/tools/staticbuild/build_lib.sh
index bfaf92b..5261b2a 100755
--- a/tools/staticbuild/build_lib.sh
+++ b/tools/staticbuild/build_lib.sh
@@ -37,7 +37,7 @@ cd -
# Move to lib
rm -rf lib; mkdir lib;
if [[ $PLATFORM == 'linux' ]]; then
- cp -L build/libmxnet.so* lib/
+ cp -L build/libmxnet.so lib/libmxnet.so
cp -L staticdeps/lib/libopenblas.so lib/libopenblas.so.0
cp -L $(ldd lib/libmxnet.so | grep libgfortran | awk '{print $3}') lib/
cp -L $(ldd lib/libmxnet.so | grep libquadmath | awk '{print $3}') lib/
