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/09/19 00:22:59 UTC
[incubator-mxnet] branch master updated: Revert "Switch to GCC 8
for distribution build (#19034)" (#19179)
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 bf08ab0 Revert "Switch to GCC 8 for distribution build (#19034)" (#19179)
bf08ab0 is described below
commit bf08ab06e939e3461a0d76e3fac516e5a4ba6488
Author: Leonard Lausen <la...@amazon.com>
AuthorDate: Fri Sep 18 17:21:23 2020 -0700
Revert "Switch to GCC 8 for distribution build (#19034)" (#19179)
This reverts commit adbc17bd21245e7a97198ac62fb7a7f90c7021af as there is an incompatibility with oneDNN v1.6.
---
cd/mxnet_lib/static/Jenkins_pipeline.groovy | 4 ++--
ci/docker/Dockerfile.build.centos7 | 5 ++---
ci/docker/runtime_functions.sh | 12 ++++++------
ci/jenkins/Jenkins_steps.groovy | 5 ++---
docs/static_site/src/pages/get_started/build_from_source.md | 8 ++++----
tools/dependencies/protobuf.sh | 5 -----
tools/pip/setup.py | 5 +----
7 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/cd/mxnet_lib/static/Jenkins_pipeline.groovy b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
index 0998320..00653b6 100644
--- a/cd/mxnet_lib/static/Jenkins_pipeline.groovy
+++ b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
@@ -32,8 +32,8 @@ libmxnet = 'lib/libmxnet.so'
licenses = 'licenses/*'
// libmxnet dependencies
-mx_native_deps = 'lib/libgfortran.so.*, lib/libopenblas.so.0'
-mx_deps = 'lib/libgfortran.so.*, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h, include/mkldnn/dnnl_config.h'
+mx_native_deps = 'lib/libgfortran.so.4, lib/libopenblas.so.0'
+mx_deps = 'lib/libgfortran.so.4, lib/libopenblas.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/Dockerfile.build.centos7 b/ci/docker/Dockerfile.build.centos7
index 6ae6df7..adba465 100644
--- a/ci/docker/Dockerfile.build.centos7
+++ b/ci/docker/Dockerfile.build.centos7
@@ -53,7 +53,6 @@ RUN yum -y check-update || true && \
protobuf-devel \
# CentOS Software Collections https://www.softwarecollections.org
devtoolset-7 \
- devtoolset-8 \
rh-python36 \
rh-maven35 \
# Libraries
@@ -70,8 +69,8 @@ RUN yum -y check-update || true && \
libzstd-devel && \
yum clean all
-# Make Python 3.6 and Maven 3.3 Software Collections available by default during
-# the following build steps in this Dockerfile
+# Make GCC7, Python 3.5 and Maven 3.3 Software Collections available by default
+# during build and runtime of this container
SHELL [ "/usr/bin/scl", "enable", "devtoolset-7", "rh-python36", "rh-maven35" ]
# Install minimum required cmake version
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 6435e0d..5bdd01e 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -111,7 +111,7 @@ build_dynamic_libmxnet() {
gather_licenses
cd /work/build
- source /opt/rh/devtoolset-8/enable
+ source /opt/rh/devtoolset-7/enable
if [[ ${mxnet_variant} = "cpu" ]]; then
cmake -DUSE_MKL_IF_AVAILABLE=OFF \
-DUSE_MKLDNN=ON \
@@ -1229,7 +1229,7 @@ checkout() {
build_static_libmxnet() {
set -ex
pushd .
- source /opt/rh/devtoolset-8/enable
+ source /opt/rh/devtoolset-7/enable
source /opt/rh/rh-python36/enable
local mxnet_variant=${1:?"This function requires a python command as the first argument"}
source tools/staticbuild/build.sh ${mxnet_variant}
@@ -1294,17 +1294,17 @@ build_static_python_cpu() {
set -ex
pushd .
export mxnet_variant=cpu
- source /opt/rh/devtoolset-8/enable
+ source /opt/rh/devtoolset-7/enable
source /opt/rh/rh-python36/enable
./ci/publish/python/build.sh
popd
}
-build_static_python_cu102() {
+build_static_python_cu92() {
set -ex
pushd .
- export mxnet_variant=cu102
- source /opt/rh/devtoolset-8/enable
+ export mxnet_variant=cu92
+ source /opt/rh/devtoolset-7/enable
source /opt/rh/rh-python36/enable
./ci/publish/python/build.sh
popd
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 9e20c08..c5aea91 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -37,8 +37,7 @@ mx_tensorrt_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, buil
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.*, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h, include/mkldnn/dnnl_config.h'
-
+mx_cd_lib = 'lib/libmxnet.so, licenses/*, lib/libgfortran.so.4, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h, include/mkldnn/dnnl_config.h'
// Python unittest for CPU
// Python 3
@@ -635,7 +634,7 @@ def compile_static_python_gpu() {
ws('workspace/ut-publish-python-gpu') {
timeout(time: max_time, unit: 'MINUTES') {
utils.init_git()
- utils.docker_run('centos7_gpu_cu102', 'build_static_python_cu102')
+ utils.docker_run('centos7_gpu_cu92', 'build_static_python_cu92')
}
}
}
diff --git a/docs/static_site/src/pages/get_started/build_from_source.md b/docs/static_site/src/pages/get_started/build_from_source.md
index 3bcfa20..a80a3d3 100644
--- a/docs/static_site/src/pages/get_started/build_from_source.md
+++ b/docs/static_site/src/pages/get_started/build_from_source.md
@@ -74,13 +74,13 @@ sudo apt-get install -y build-essential git ninja-build ccache libopenblas-dev l
sudo yum install epel-release centos-release-scl
sudo yum install git make ninja-build automake autoconf libtool protobuf-compiler protobuf-devel \
atlas-devel openblas-devel lapack-devel opencv-devel openssl-devel zeromq-devel python3 \
- devtoolset-8
+ devtoolset-7
source /opt/rh/devtoolset-7/enable
```
-Here `devtoolset-8` refers to the [Developer Toolset
-8](https://www.softwarecollections.org/en/scls/rhscl/devtoolset-8/) created by
+Here `devtoolset-7` refers to the [Developer Toolset
+7](https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/) created by
Red Hat for developers working on CentOS or Red Hat Enterprise Linux platform
-and providing the GNU Compiler Collection 9.
+and providing the GNU Compiler Collection 7.
### macOS
```bash
diff --git a/tools/dependencies/protobuf.sh b/tools/dependencies/protobuf.sh
index 7da4c25..4b58a1c 100755
--- a/tools/dependencies/protobuf.sh
+++ b/tools/dependencies/protobuf.sh
@@ -20,11 +20,6 @@
# This script builds the static library of protobuf along with protoc, that can be used as dependency of mxnet.
set -ex
PROTOBUF_VERSION=3.5.1
-if [[ $PLATFORM == 'darwin' ]]; then
- DY_EXT="dylib"
-else
- DY_EXT="so"
-fi
LIBPROTOBUF="$DEPS_PATH/lib/libprotobuf.$DY_EXT"
LIBPROTOC="$DEPS_PATH/lib/libprotoc.$DY_EXT"
diff --git a/tools/pip/setup.py b/tools/pip/setup.py
index 9e560a1..bf007ea 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -150,12 +150,9 @@ if platform.system() == 'Linux':
if os.path.exists(os.path.join(libdir, 'libgfortran.so.3')):
shutil.copy(os.path.join(libdir, 'libgfortran.so.3'), mxdir)
package_data['mxnet'].append('mxnet/libgfortran.so.3')
- elif os.path.exists(os.path.join(libdir, 'libgfortran.so.4')):
+ else:
shutil.copy(os.path.join(libdir, 'libgfortran.so.4'), mxdir)
package_data['mxnet'].append('mxnet/libgfortran.so.4')
- elif os.path.exists(os.path.join(libdir, 'libgfortran.so.5')):
- shutil.copy(os.path.join(libdir, 'libgfortran.so.5'), mxdir)
- package_data['mxnet'].append('mxnet/libgfortran.so.5')
if os.path.exists(os.path.join(libdir, 'libopenblas.so.0')):
shutil.copy(os.path.join(libdir, 'libopenblas.so.0'), mxdir)
package_data['mxnet'].append('mxnet/libopenblas.so.0')