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

Fix nightly build #16773

Merged
merged 5 commits into from
Nov 14, 2019
Merged

Fix nightly build #16773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fd40b1
Remove dependency on tvmop.conf
Nov 11, 2019
10ce1f7
Fix binaries dependencies for ni nightly
Nov 11, 2019
ce817b2
Add comments
Nov 12, 2019
6dbdaba
Update tvmop.py
marcoabreu Nov 12, 2019
a555fef
Fix rebase
Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions python/mxnet/tvmop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

if Features().is_enabled("TVM_OP"):
import json
import logging

from ._ctypes.space import _set_tvm_op_config
from .base import check_call, _LIB, c_str
Expand All @@ -31,7 +32,12 @@
check_call(_LIB.MXLoadTVMOp(c_str(_LIB_TVM_OP[0])))

# op sch config
_CONF_TVM_OP = find_conf_path("tvmop")
with open(_CONF_TVM_OP[0], "r") as f:
ret = ConfigSpaces.from_json_dict(json.load(f))
_set_tvm_op_config(ret)
try:
_CONF_TVM_OP = find_conf_path("tvmop")
except RuntimeError as e:
logging.warning("TVM config file missing, falling back to default schedule", exc_info=True)
else:
logging.info("TVM op config has been loaded")
with open(_CONF_TVM_OP[0], "r") as f:
ret = ConfigSpaces.from_json_dict(json.load(f))
_set_tvm_op_config(ret)
6 changes: 3 additions & 3 deletions tests/nightly/JenkinsfileForBinaries
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
//
//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, 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/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, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, build/cpp-package/example/imagenet_inference'
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'

node('utility') {
// Loading the utilities requires a node context unfortunately
Expand Down
2 changes: 1 addition & 1 deletion tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
View file
Open in desktop
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, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
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'

node('restricted-utility') {
// Loading the utilities requires a node context unfortunately
Expand Down