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

Commit a7c6606

Browse files
leezuleezu
authored
Remove Makefile build support (#18721)
Replaced by cmake buildsystem as per #16167
1 parent 1aec483 commit a7c6606

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+52
-5105
lines changed

‎Makefile‎

Lines changed: 0 additions & 768 deletions
This file was deleted.

‎ci/dev_menu.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def provision_virtualenv(venv_path=DEFAULT_PYENV):
122122
"pytest -v tests/python/unittest/"
123123
),
124124
('[Docker] Build the MXNet binary - outputs to "lib/"',
125-
"ci/build.py --platform ubuntu_cpu_lite /work/runtime_functions.sh build_ubuntu_cpu_docs"),
125+
"ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_docs"),
126126
('[Docker] Build the Jekyll website - outputs to "docs/static_site/build/html/"',
127127
"ci/build.py --platform ubuntu_cpu_jekyll /work/runtime_functions.sh build_jekyll_docs"),
128128
('[Docker] Build the Python API docs - outputs to "docs/python_docs/python/build/_build/html/"',

‎ci/docker/Dockerfile.build.ubuntu_cpu_lite‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎ci/docker/runtime_functions.sh‎

Lines changed: 3 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -321,21 +321,6 @@ build_centos7_cpu() {
321321
ninja
322322
}
323323

324-
build_centos7_cpu_make() {
325-
set -ex
326-
cd /work/mxnet
327-
source /opt/rh/devtoolset-7/enable
328-
make \
329-
DEV=1 \
330-
USE_LAPACK=1 \
331-
USE_LAPACK_PATH=/usr/lib64/liblapack.so \
332-
USE_BLAS=openblas \
333-
USE_MKLDNN=0 \
334-
USE_DIST_KVSTORE=1 \
335-
USE_SIGNAL_HANDLER=1 \
336-
-j$(nproc)
337-
}
338-
339324
build_centos7_mkldnn() {
340325
set -ex
341326
cd /work/build
@@ -384,24 +369,6 @@ build_ubuntu_cpu_openblas() {
384369
ninja
385370
}
386371

387-
build_ubuntu_cpu_openblas_make() {
388-
set -ex
389-
export CC=gcc-7
390-
export CXX=g++-7
391-
build_ccache_wrappers
392-
make \
393-
DEV=1 \
394-
USE_TVM_OP=1 \
395-
USE_CPP_PACKAGE=1 \
396-
USE_BLAS=openblas \
397-
USE_MKLDNN=0 \
398-
USE_DIST_KVSTORE=1 \
399-
USE_LIBJPEG_TURBO=1 \
400-
USE_SIGNAL_HANDLER=1 \
401-
-j$(nproc)
402-
make cython PYTHON=python3
403-
}
404-
405372
build_ubuntu_cpu_mkl() {
406373
set -ex
407374
cd /work/build
@@ -589,22 +556,6 @@ build_ubuntu_cpu_clang100_mkldnn() {
589556
ninja
590557
}
591558

592-
build_ubuntu_cpu_mkldnn_make() {
593-
set -ex
594-
595-
export CC=gcc-7
596-
export CXX=g++-7
597-
build_ccache_wrappers
598-
599-
make \
600-
DEV=1 \
601-
USE_CPP_PACKAGE=1 \
602-
USE_TVM_OP=1 \
603-
USE_BLAS=openblas \
604-
USE_SIGNAL_HANDLER=1 \
605-
-j$(nproc)
606-
}
607-
608559
build_ubuntu_cpu_mkldnn() {
609560
set -ex
610561
cd /work/build
@@ -754,45 +705,6 @@ build_ubuntu_gpu_cuda101_cudnn7_debug() {
754705
ninja
755706
}
756707

757-
build_ubuntu_gpu_cuda101_cudnn7_make() {
758-
set -ex
759-
export CC=gcc-7
760-
export CXX=g++-7
761-
build_ccache_wrappers
762-
make \
763-
USE_BLAS=openblas \
764-
USE_MKLDNN=0 \
765-
USE_CUDA=1 \
766-
USE_CUDA_PATH=/usr/local/cuda \
767-
USE_CUDNN=1 \
768-
USE_CPP_PACKAGE=1 \
769-
USE_DIST_KVSTORE=1 \
770-
CUDA_ARCH="$CI_CUDA_COMPUTE_CAPABILITIES" \
771-
USE_SIGNAL_HANDLER=1 \
772-
-j$(nproc)
773-
make cython PYTHON=python3
774-
}
775-
776-
build_ubuntu_gpu_cuda101_cudnn7_mkldnn_cpp_test() {
777-
set -ex
778-
export CC=gcc-7
779-
export CXX=g++-7
780-
build_ccache_wrappers
781-
make \
782-
USE_BLAS=openblas \
783-
USE_MKLDNN=1 \
784-
USE_CUDA=1 \
785-
USE_CUDA_PATH=/usr/local/cuda \
786-
USE_CUDNN=1 \
787-
USE_CPP_PACKAGE=1 \
788-
USE_DIST_KVSTORE=1 \
789-
CUDA_ARCH="$CI_CUDA_COMPUTE_CAPABILITIES" \
790-
USE_SIGNAL_HANDLER=1 \
791-
-j$(nproc)
792-
make test USE_CPP_PACKAGE=1 -j$(nproc)
793-
make cython PYTHON=python3
794-
}
795-
796708
build_ubuntu_gpu_cmake() {
797709
set -ex
798710
cd /work/build
@@ -878,8 +790,8 @@ build_ubuntu_blc() {
878790
sanity_check() {
879791
set -ex
880792
tools/license_header.py check
881-
make cpplint
882-
make pylint
793+
3rdparty/dmlc-core/scripts/lint.py mxnet cpp include src plugin tests --exclude_path src/operator/contrib/ctc_include include/mkldnn
794+
python3 -m pylint --rcfile=ci/other/pylintrc --ignore-patterns=".*\.so$$,.*\.dll$$,.*\.dylib$$" python/mxnet
883795
OMP_NUM_THREADS=$(expr $(nproc) / 4) pytest -n 4 tests/tutorials/test_sanity_tutorials.py
884796
}
885797

@@ -1257,19 +1169,7 @@ build_docs_setup() {
12571169
}
12581170

12591171
build_ubuntu_cpu_docs() {
1260-
set -ex
1261-
export CC="gcc-7"
1262-
export CXX="g++-7"
1263-
build_ccache_wrappers
1264-
make \
1265-
DEV=1 \
1266-
USE_CPP_PACKAGE=1 \
1267-
USE_BLAS=openblas \
1268-
USE_MKLDNN=0 \
1269-
USE_DIST_KVSTORE=1 \
1270-
USE_LIBJPEG_TURBO=1 \
1271-
USE_SIGNAL_HANDLER=1 \
1272-
-j$(nproc)
1172+
build_ubuntu_cpu_openblas
12731173
}
12741174

12751175

@@ -1399,8 +1299,6 @@ build_static_libmxnet() {
13991299
pushd .
14001300
source /opt/rh/devtoolset-7/enable
14011301
source /opt/rh/rh-python36/enable
1402-
export USE_SYSTEM_CUDA=1
1403-
export CMAKE_STATICBUILD=1
14041302
local mxnet_variant=${1:?"This function requires a python command as the first argument"}
14051303
source tools/staticbuild/build.sh ${mxnet_variant}
14061304
popd
@@ -1474,7 +1372,6 @@ build_static_python_cu92() {
14741372
set -ex
14751373
pushd .
14761374
export mxnet_variant=cu92
1477-
export USE_SYSTEM_CUDA=1
14781375
source /opt/rh/devtoolset-7/enable
14791376
source /opt/rh/rh-python36/enable
14801377
./ci/publish/python/build.sh

‎ci/jenkins/Jenkins_steps.groovy‎

Lines changed: 4 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ utils = load('ci/Jenkinsfile_utils.groovy')
2525
// mxnet libraries
2626
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'
2727
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'
28-
mx_lib_make = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, build/libcustomop_lib.so, build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
2928

3029
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
3130
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'
@@ -34,11 +33,8 @@ mx_cmake_lib_cython = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so,
3433
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
3534
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'
3635
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'
37-
mx_mkldnn_lib_make = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, build/libcustomop_lib.so, build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
3836
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'
3937
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'
40-
mx_lib_cpp_examples_make = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, build/libcustomop_lib.so, build/libcustomop_gpu_lib.so, build/libsubgraph_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, python/mxnet/_cy3/*.so, python/mxnet/_ffi/_cy3/*.so'
41-
mx_lib_cpp_capi_make = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, libsample_lib.so, lib/libmkldnn.so.1, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, python/mxnet/_cy3/*.so, python/mxnet/_ffi/_cy3/*.so, build/tests/cpp/mxnet_unit_tests'
4238
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'
4339
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'
4440
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'
@@ -95,20 +91,6 @@ def compile_unix_cpu_openblas(lib_name) {
9591
}]
9692
}
9793

98-
def compile_unix_cpu_openblas_make(lib_name) {
99-
return ['CPU: Openblas Makefile': {
100-
node(NODE_LINUX_CPU) {
101-
ws('workspace/build-cpu-openblas') {
102-
timeout(time: max_time, unit: 'MINUTES') {
103-
utils.init_git()
104-
utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_openblas_make', false)
105-
utils.pack_lib(lib_name, mx_lib_make)
106-
}
107-
}
108-
}
109-
}]
110-
}
111-
11294
def compile_unix_openblas_debug_cpu(lib_name) {
11395
return ['CPU: Openblas, cmake, debug': {
11496
node(NODE_LINUX_CPU) {
@@ -192,20 +174,6 @@ def compile_unix_mkldnn_cpu(lib_name) {
192174
}]
193175
}
194176

195-
def compile_unix_mkldnn_cpu_make(lib_name) {
196-
return ['CPU: MKLDNN Makefile': {
197-
node(NODE_LINUX_CPU) {
198-
ws('workspace/build-mkldnn-cpu') {
199-
timeout(time: max_time, unit: 'MINUTES') {
200-
utils.init_git()
201-
utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_mkldnn_make', false)
202-
utils.pack_lib(lib_name, mx_mkldnn_lib_make)
203-
}
204-
}
205-
}
206-
}]
207-
}
208-
209177
def compile_unix_mkldnn_mkl_cpu(lib_name) {
210178
return ['CPU: MKLDNN_MKL': {
211179
node(NODE_LINUX_CPU) {
@@ -262,21 +230,6 @@ def compile_unix_full_gpu(lib_name) {
262230
}]
263231
}
264232

265-
def compile_unix_full_gpu_make(lib_name) {
266-
return ['GPU: CUDA10.1+cuDNN7 Makefile': {
267-
node(NODE_LINUX_CPU) {
268-
ws('workspace/build-gpu') {
269-
timeout(time: max_time, unit: 'MINUTES') {
270-
utils.init_git()
271-
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7_make', false)
272-
utils.pack_lib(lib_name, mx_lib_cpp_examples_make)
273-
}
274-
}
275-
}
276-
}]
277-
}
278-
279-
280233
def compile_unix_full_gpu_debug(lib_name) {
281234
return ['GPU: CUDA10.1+cuDNN7, debug': {
282235
node(NODE_LINUX_CPU) {
@@ -291,20 +244,6 @@ def compile_unix_full_gpu_debug(lib_name) {
291244
}]
292245
}
293246

294-
def compile_unix_full_gpu_mkldnn_cpp_test(lib_name) {
295-
return ['GPU: CUDA10.1+cuDNN7+MKLDNN+CPPTEST Makefile': {
296-
node(NODE_LINUX_CPU) {
297-
ws('workspace/build-gpu-mkldnn-cpp') {
298-
timeout(time: max_time, unit: 'MINUTES') {
299-
utils.init_git()
300-
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7_mkldnn_cpp_test', false)
301-
utils.pack_lib(lib_name, mx_lib_cpp_capi_make)
302-
}
303-
}
304-
}
305-
}]
306-
}
307-
308247
def compile_unix_cmake_gpu(lib_name) {
309248
return ['GPU: CMake': {
310249
node(NODE_LINUX_CPU) {
@@ -361,20 +300,6 @@ def compile_centos7_cpu(lib_name) {
361300
}]
362301
}
363302

364-
def compile_centos7_cpu_make(lib_name) {
365-
return ['CPU: CentOS 7 Makefile': {
366-
node(NODE_LINUX_CPU) {
367-
ws('workspace/build-centos7-cpu') {
368-
timeout(time: max_time, unit: 'MINUTES') {
369-
utils.init_git()
370-
utils.docker_run('centos7_cpu', 'build_centos7_cpu_make', false)
371-
utils.pack_lib(lib_name, mx_lib_make)
372-
}
373-
}
374-
}
375-
}]
376-
}
377-
378303
def compile_centos7_cpu_mkldnn() {
379304
return ['CPU: CentOS 7 MKLDNN': {
380305
node(NODE_LINUX_CPU) {
@@ -897,7 +822,7 @@ def test_unix_onnx_cpu(lib_name) {
897822
node(NODE_LINUX_CPU) {
898823
ws('workspace/it-onnx-cpu') {
899824
timeout(time: max_time, unit: 'MINUTES') {
900-
utils.unpack_and_init(lib_name, mx_lib_make)
825+
utils.unpack_and_init(lib_name, mx_lib)
901826
utils.docker_run('ubuntu_cpu', 'integrationtest_ubuntu_cpu_onnx', false)
902827
utils.publish_test_coverage()
903828
}
@@ -1126,8 +1051,8 @@ def compile_unix_lite(lib_name) {
11261051
ws('workspace/docs') {
11271052
timeout(time: max_time, unit: 'MINUTES') {
11281053
utils.init_git()
1129-
utils.docker_run('ubuntu_cpu_lite', 'build_ubuntu_cpu_docs', false)
1130-
utils.pack_lib(lib_name, 'lib/libmxnet.so', false)
1054+
utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_docs', false)
1055+
utils.pack_lib(lib_name, mx_lib, false)
11311056
}
11321057
}
11331058
}
@@ -1155,7 +1080,7 @@ def docs_python(lib_name) {
11551080
node(NODE_LINUX_CPU) {
11561081
ws('workspace/docs') {
11571082
timeout(time: max_time, unit: 'MINUTES') {
1158-
utils.unpack_and_init(lib_name, 'lib/libmxnet.so', false)
1083+
utils.unpack_and_init(lib_name, mx_lib, false)
11591084
utils.docker_run('ubuntu_cpu_python', 'build_python_docs', false)
11601085
if (should_pack_website()) {
11611086
utils.pack_lib('python-artifacts', 'docs/_build/python-artifacts.tgz', false)

‎ci/jenkins/Jenkinsfile_centos_cpu‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ utils.main_wrapper(
3535
core_logic: {
3636
utils.parallel_stage('Build', [
3737
custom_steps.compile_centos7_cpu('centos7_cpu'),
38-
custom_steps.compile_centos7_cpu_make('centos7_cpu_make'),
3938
custom_steps.compile_centos7_cpu_mkldnn(),
4039
custom_steps.compile_static_python_cpu(),
4140
custom_steps.compile_static_cd_cpu('centos7_cpu_cd')

0 commit comments

Comments
 (0)