Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Switch to GCC 8 for distribution build
Browse files Browse the repository at this point in the history
  • Loading branch information
leezu committed Sep 19, 2020
1 parent bf08ab0 commit 9f2c194
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 17 deletions.
4 changes: 2 additions & 2 deletions cd/mxnet_lib/static/Jenkins_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ libmxnet = 'lib/libmxnet.so'
licenses = 'licenses/*'

// libmxnet dependencies
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'
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'

// library type
// either static or dynamic - depending on how it links to its dependencies
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/Dockerfile.build.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ RUN yum -y check-update || true && \
protobuf-devel \
# CentOS Software Collections https://www.softwarecollections.org
devtoolset-7 \
devtoolset-8 \
rh-python36 \
rh-maven35 \
# Libraries
Expand All @@ -69,8 +70,8 @@ RUN yum -y check-update || true && \
libzstd-devel && \
yum clean all

# Make GCC7, Python 3.5 and Maven 3.3 Software Collections available by default
# during build and runtime of this container
# Make Python 3.6 and Maven 3.3 Software Collections available by default during
# the following build steps in this Dockerfile
SHELL [ "/usr/bin/scl", "enable", "devtoolset-7", "rh-python36", "rh-maven35" ]

# Install minimum required cmake version
Expand Down
12 changes: 6 additions & 6 deletions ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ build_dynamic_libmxnet() {
gather_licenses

cd /work/build
source /opt/rh/devtoolset-7/enable
source /opt/rh/devtoolset-8/enable
if [[ ${mxnet_variant} = "cpu" ]]; then
cmake -DUSE_MKL_IF_AVAILABLE=OFF \
-DUSE_MKLDNN=ON \
Expand Down Expand Up @@ -1229,7 +1229,7 @@ checkout() {
build_static_libmxnet() {
set -ex
pushd .
source /opt/rh/devtoolset-7/enable
source /opt/rh/devtoolset-8/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}
Expand Down Expand Up @@ -1294,17 +1294,17 @@ build_static_python_cpu() {
set -ex
pushd .
export mxnet_variant=cpu
source /opt/rh/devtoolset-7/enable
source /opt/rh/devtoolset-8/enable
source /opt/rh/rh-python36/enable
./ci/publish/python/build.sh
popd
}

build_static_python_cu92() {
build_static_python_cu102() {
set -ex
pushd .
export mxnet_variant=cu92
source /opt/rh/devtoolset-7/enable
export mxnet_variant=cu102
source /opt/rh/devtoolset-8/enable
source /opt/rh/rh-python36/enable
./ci/publish/python/build.sh
popd
Expand Down
5 changes: 3 additions & 2 deletions ci/jenkins/Jenkins_steps.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ 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.4, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h, include/mkldnn/dnnl_config.h'
mx_cd_lib = 'lib/libmxnet.so, licenses/*, lib/libgfortran.so.*, lib/libopenblas.so.0, include/mkldnn/dnnl_version.h, include/mkldnn/dnnl_config.h'


// Python unittest for CPU
// Python 3
Expand Down Expand Up @@ -634,7 +635,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_cu92', 'build_static_python_cu92')
utils.docker_run('centos7_gpu_cu102', 'build_static_python_cu102')
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions docs/static_site/src/pages/get_started/build_from_source.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-7
devtoolset-8
source /opt/rh/devtoolset-7/enable
```
Here `devtoolset-7` refers to the [Developer Toolset
7](https://www.softwarecollections.org/en/scls/rhscl/devtoolset-7/) created by
Here `devtoolset-8` refers to the [Developer Toolset
8](https://www.softwarecollections.org/en/scls/rhscl/devtoolset-8/) created by
Red Hat for developers working on CentOS or Red Hat Enterprise Linux platform
and providing the GNU Compiler Collection 7.
and providing the GNU Compiler Collection 9.

### macOS
```bash
Expand Down
5 changes: 5 additions & 0 deletions tools/dependencies/protobuf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
# 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"
Expand Down
5 changes: 4 additions & 1 deletion tools/pip/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,12 @@ def skip_markdown_comments(md):
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')
else:
elif os.path.exists(os.path.join(libdir, 'libgfortran.so.4')):
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')
Expand Down

0 comments on commit 9f2c194

Please sign in to comment.