Skip to content

Commit

Permalink
Fix nightly tests pipeline (apache#17721)
Browse files Browse the repository at this point in the history
  • Loading branch information
leezu authored and anirudh2290 committed May 29, 2020
1 parent 72467bd commit ea80424
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tests/nightly/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/nnvm/lib/libnnvm.a'
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
Expand Down
12 changes: 5 additions & 7 deletions tests/nightly/JenkinsfileForBinaries
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +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 = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
mx_lib_cpp_example_mkl = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, build/cpp-package/example/imagenet_inference'
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, build/cpp-package/example/*'

node('utility') {
// Loading the utilities requires a node context unfortunately
Expand All @@ -37,7 +35,7 @@ core_logic: {
ws('workspace/build-mkldnn-gpu') {
utils.init_git()
utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_mkldnn', false)
utils.pack_lib('gpu', mx_lib_cpp_example_mkl)
utils.pack_lib('gpu', mx_lib)
}
}
},
Expand All @@ -46,7 +44,7 @@ core_logic: {
ws('workspace/build-cpu-int64') {
utils.init_git()
utils.docker_run('ubuntu_nightly_cpu', 'build_ubuntu_cpu_large_tensor', false)
utils.pack_lib('cpu_int64', mx_cmake_lib)
utils.pack_lib('cpu_int64', mx_lib)
}
}
}
Expand All @@ -64,7 +62,7 @@ core_logic: {
'ImageNet Inference: GPU': {
node(NODE_LINUX_GPU) {
ws('workspace/nt-ImageInferenceTest') {
utils.unpack_and_init('gpu', mx_lib_cpp_example_mkl)
utils.unpack_and_init('gpu', mx_lib)
utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true)
}
}
Expand All @@ -80,7 +78,7 @@ core_logic: {
'Test Large Tensor Size: CPU': {
node(NODE_LINUX_GPU) {
ws('workspace/large_tensor-cpu') {
utils.unpack_and_init('cpu_int64', mx_cmake_lib)
utils.unpack_and_init('cpu_int64', mx_lib)
utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_large_tensor', false)
utils.docker_run('ubuntu_nightly_cpu', 'nightly_test_large_vector', false)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
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
Expand Down

0 comments on commit ea80424

Please sign in to comment.