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

Commit

Permalink
Fix Jenkins tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
zheng-da committed Apr 28, 2018
1 parent 2ef04dd commit d15110a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
13 changes: 7 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ mx_dist_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3r
// mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, build/3rdparty/mkldnn/src/libmkldnn.so, build/3rdparty/mkldnn/src/libmkldnn.so.0'
mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libiomp5.so, lib/libmkldnn.so.0, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/nnvm/lib/libnnvm.a, build/tests/cpp/mxnet_unit_tests'
mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libiomp5.so, lib/libmkldnn.so.0, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/nnvm/lib/libnnvm.a'
mx_mkldnn_test_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libiomp5.so, lib/libmkldnn.so.0, lib/libmklml_intel.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/nnvm/lib/libnnvm.a, build/tests/cpp/mxnet_unit_tests'
// command to start a docker container
docker_run = 'tests/ci_build/ci_build.sh'
// timeout in minutes
Expand Down Expand Up @@ -231,8 +232,8 @@ try {
ws('workspace/build-mkldnn-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
init_git()
sh "ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_mkldnn"
pack_lib('mkldnn_cpu', mx_mkldnn_lib)
sh "ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_mkldnn_test"
pack_lib('mkldnn_test_cpu', mx_mkldnn_test_lib)
}
}
}
Expand Down Expand Up @@ -465,7 +466,7 @@ try {
node('mxnetlinux-cpu') {
ws('workspace/ut-python2-mkldnn-cpu') {
init_git()
unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
unpack_lib('mkldnn_test_cpu', mx_mkldnn_test_lib)
python2_ut('ubuntu_cpu')
}
}
Expand All @@ -483,7 +484,7 @@ try {
node('mxnetlinux-cpu') {
ws('workspace/ut-python3-mkldnn-cpu') {
init_git()
unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
unpack_lib('mkldnn_test_cpu', mx_mkldnn_test_lib)
python3_ut_mkldnn('ubuntu_cpu')
}
}
Expand Down Expand Up @@ -579,7 +580,7 @@ try {
ws('workspace/ut-cpp-mkldnn-cpu') {
timeout(time: max_time, unit: 'MINUTES') {
init_git()
unpack_lib('mkldnn_cpu', mx_mkldnn_lib)
unpack_lib('mkldnn_test_cpu', mx_mkldnn_test_lib)
sh "ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh unittest_ubuntu_cpu_cpp"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ build_ubuntu_cpu_mkldnn() {
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
-j$(nproc)
-j$(nproc) test
}

build_ubuntu_gpu_mkldnn() {
Expand Down

0 comments on commit d15110a

Please sign in to comment.