add set_model_dir and update ONNX (#6119)

This commit is contained in:
Chun-Wei Chen 2021-02-05 09:30:49 -08:00 committed by GitHub
parent 3b376da37c
commit f2ce3aae13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions

View file

@ -242,7 +242,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "174de7d086a768cba29374a56a7461eff87cfdb3",
"commitHash": "237926eab41de21fb9addc4b03b751fd6a3343ec",
"repositoryUrl": "https://github.com/onnx/onnx"
},
"comments": "git submodule at cmake/external/onnx"

2
cmake/external/onnx vendored

@ -1 +1 @@
Subproject commit 174de7d086a768cba29374a56a7461eff87cfdb3
Subproject commit 237926eab41de21fb9addc4b03b751fd6a3343ec

View file

@ -2265,6 +2265,9 @@ Status Graph::VerifyNodeAndOpMatch(const ResolveOptions& options) {
ctx.set_ir_version(gsl::narrow_cast<int>(IrVersion()));
ctx.set_opset_imports(DomainToVersionMap());
ctx.set_schema_registry(schema_registry_.get());
// Set the parent directory of model path to load external tensors if exist
ctx.set_model_dir(ToMBString(ModelPath().ParentPath().ToPathString()));
LexicalScopeContext lsc;
lsc.output_names.insert(resolve_context_.inputs_and_initializers.cbegin(),

View file

@ -3,7 +3,7 @@ mypy
pytest
setuptools>=41.4.0
wheel
git+http://github.com/onnx/onnx.git@174de7d086a768cba29374a56a7461eff87cfdb3#egg=onnx
git+http://github.com/onnx/onnx.git@237926eab41de21fb9addc4b03b751fd6a3343ec#egg=onnx
protobuf
sympy==1.1.1
flake8

View file

@ -4,7 +4,7 @@ mypy
pytest
setuptools>=41.4.0
wheel
git+http://github.com/onnx/onnx.git@174de7d086a768cba29374a56a7461eff87cfdb3#egg=onnx
git+http://github.com/onnx/onnx.git@237926eab41de21fb9addc4b03b751fd6a3343ec#egg=onnx
argparse
sympy==1.1.1
flake8