saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-06 00:03:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ONNX (#9462)

Browse source
This commit is contained in:
Hariharan Seshadri 2021-10-29 10:33:40 -07:00 committed by GitHub
parent 7744cc1013
commit b5f7bb7d10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 49 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cgmanifests/submodules/cgmanifest.json
View file

@ -264,7 +264,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35",
"commitHash": "be76ca7148396176784ba8733133b9fb1186ea0d",
"repositoryUrl": "https://github.com/onnx/onnx"
},
"comments": "git submodule at cmake/external/onnx"

2
cmake/external/onnx vendored

@ -1 +1 @@
Subproject commit 1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35
Subproject commit be76ca7148396176784ba8733133b9fb1186ea0d

2
js/web/docs/operators.md
View file

@ -67,7 +67,7 @@ See [Compatibility](../README.md#Compatibility) for a list of the supported plat
| [HardSigmoid](https://github.com/onnx/onnx/blob/master/docs/Operators.md#HardSigmoid) | |
| [HardSwish](https://github.com/onnx/onnx/blob/master/docs/Operators.md#HardSwish) | |
| [Hardmax](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Hardmax) | |
| [Identity](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Identity) | [1-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-1), [13](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-13), [14+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-14) |
| [Identity](https://github.com/onnx/onnx/blob/master/docs/Operators.md#Identity) | [1-12](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-1), [13](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-13), [14-15](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-14), [16+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Identity-16) |
| [If](https://github.com/onnx/onnx/blob/master/docs/Operators.md#If) | |
| [InstanceNormalization](https://github.com/onnx/onnx/blob/master/docs/Operators.md#InstanceNormalization) | [6+](https://github.com/onnx/onnx/blob/master/docs/Changelog.md#InstanceNormalization-6) |
| [IsInf](https://github.com/onnx/onnx/blob/master/docs/Operators.md#IsInf) | |

25
onnxruntime/test/onnx/main.cc
View file

@ -311,8 +311,8 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
if (enable_tensorrt) {
#ifdef USE_TENSORRT
OrtCUDAProviderOptions cuda_options;
cuda_options.device_id=device_id;
cuda_options.do_copy_in_default_stream=true;
cuda_options.device_id = device_id;
cuda_options.do_copy_in_default_stream = true;
// TODO: Support arena configuration for users of test runner
Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_Tensorrt(sf, device_id));
sf.AppendExecutionProvider_CUDA(cuda_options);
@ -334,7 +334,7 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
if (enable_cuda) {
#ifdef USE_CUDA
OrtCUDAProviderOptions cuda_options;
cuda_options.do_copy_in_default_stream=true;
cuda_options.do_copy_in_default_stream = true;
// TODO: Support arena configuration for users of test runner
sf.AppendExecutionProvider_CUDA(cuda_options);
#else
@ -406,7 +406,7 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
if (enable_rocm) {
#ifdef USE_ROCM
OrtROCMProviderOptions rocm_options;
rocm_options.do_copy_in_default_stream=true;
rocm_options.do_copy_in_default_stream = true;
// TODO: Support arena configuration for users of test runner
sf.AppendExecutionProvider_ROCM(rocm_options);
#else
@ -586,11 +586,18 @@ int real_main(int argc, char* argv[], Ort::Env& env) {
{"bernoulli_seed", "By design. Test data is for informational purpose because the generator is non deterministic."},
{"bernoulli_seed_expanded", "By design. Test data is for informational purpose because the generator is non deterministic."},
{"bernoulli_expanded", "By design. Test data is for informational purpose because the generator is non deterministic."},
{"test_optional_get_element", "opset15 updates not supported yet."},
{"test_optional_get_element_sequence", "opset15 updates not supported yet."},
{"test_optional_has_element", "opset15 updates not supported yet."},
{"test_optional_has_element_empty", "opset15 updates not supported yet."},
{"test_optional_get_element", "Optional type not supported yet."},
{"test_optional_get_element_sequence", "Optional type not supported yet."},
{"test_optional_has_element", "Optional type not supported yet."},
{"test_optional_has_element_empty", "Optional type not supported yet."},
{"test_if_opt", "Optional type not supported yet."},
{"test_loop16_seq_none", "Optional type not supported yet."},
{"test_identity", "Opset 16 not supported yet."},
{"test_roialign_aligned_true", "Opset 16 not supported yet."},
{"test_roialign_aligned_false", "Opset 16 not supported yet."},
{"test_scatternd_add", "Opset 16 not supported yet."},
{"test_scatternd_multiply", "Opset 16 not supported yet."},
{"test_scatter_elements_with_duplicate_indices", "Opset 16 not supported yet."},
};
#ifdef DISABLE_ML_OPS

9
onnxruntime/test/testdata/onnx_backend_test_series_filters.jsonc vendored
View file

@ -66,8 +66,15 @@
"^test_mul_uint8_cpu",
"^test_add_uint8_cpu",
"^test_div_uint8_cpu",
// Following tests are for opset 15 ops and are not yet implemented in ORT
// Optional type support not implemented in ORT
"^test_optional_*",
"^test_if_opt",
"^test_loop16_seq_none",
// Following tests are for opset 16 ops and are not yet implemented in ORT
"^test_identity",
"^test_roialign_aligned_*",
"^test_scatternd_*",
"^test_scatter_elements_with_duplicate_indices",
//GPU failures
"^test_batchnorm_epsilon_training_mode_cuda",
"^test_batchnorm_example_training_mode_cuda",

28
orttraining/orttraining/test/framework/slice_concatenate_test.cc
View file

@ -96,8 +96,18 @@ void CompareVector(const std::vector<float>& result, const std::vector<float>& e
}
}
static std::unique_ptr<onnxruntime::Model> MakeModel() {
std::unordered_map<std::string, int> domain_to_version;
domain_to_version.insert({"", 15}); // Create an opset 15 model
auto model = std::make_unique<onnxruntime::Model>(
"test", false, ModelMetaData(), PathString(), IOnnxRuntimeOpSchemaRegistryList(),
domain_to_version, std::vector<ONNX_NAMESPACE::FunctionProto>{},
DefaultLoggingManager().DefaultLogger());
return model;
}
TEST(PipelineParallel, FloatTensorSlice2d) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -133,7 +143,7 @@ TEST(PipelineParallel, FloatTensorSlice2d) {
}
TEST(PipelineParallel, FloatTensorSlice1d) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -200,7 +210,7 @@ TEST(PipelineParallel, FloatTensorSlice1d) {
}
TEST(PipelineParallel, FloatTensorSlice3d) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -223,7 +233,7 @@ TEST(PipelineParallel, FloatTensorSlice3d) {
#ifdef USE_CUDA
TEST(PipelineParallel, FloatTensorSlice3dGpu) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -246,7 +256,7 @@ TEST(PipelineParallel, FloatTensorSlice3dGpu) {
#endif
TEST(PipelineParallel, FloatTensorConcat1d) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -269,7 +279,7 @@ TEST(PipelineParallel, FloatTensorConcat1d) {
}
TEST(PipelineParallel, FloatTensorConcat2d) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -295,7 +305,7 @@ TEST(PipelineParallel, FloatTensorConcat2d) {
}
TEST(PipelineParallel, FloatTensorConcat3d) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -324,7 +334,7 @@ TEST(PipelineParallel, FloatTensorConcat3d) {
}
TEST(PipelineParallel, FloatTensorConcat3dMore) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());
@ -358,7 +368,7 @@ TEST(PipelineParallel, FloatTensorConcat3dMore) {
#ifdef USE_CUDA
TEST(PipelineParallel, FloatTensorConcat1dGpu) {
std::unique_ptr<onnxruntime::Model> model = std::make_unique<onnxruntime::Model>("test", false, DefaultLoggingManager().DefaultLogger());
std::unique_ptr<onnxruntime::Model> model = MakeModel();
CreateFakeGraph(model->MainGraph());

2
tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/scripts/requirements.txt
View file

@ -1,4 +1,4 @@
numpy
git+http://github.com/onnx/onnx.git@1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35#egg=onnx
git+http://github.com/onnx/onnx.git@be76ca7148396176784ba8733133b9fb1186ea0d#egg=onnx
protobuf
flatbuffers

2
tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt
View file

@ -3,7 +3,7 @@ mypy
pytest
setuptools>=41.4.0
wheel
git+http://github.com/onnx/onnx.git@1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35#egg=onnx
git+http://github.com/onnx/onnx.git@be76ca7148396176784ba8733133b9fb1186ea0d#egg=onnx
protobuf
sympy==1.1.1
flatbuffers

2
tools/ci_build/github/linux/docker/scripts/requirements.txt
View file

@ -4,7 +4,7 @@ mypy
pytest
setuptools>=41.4.0
wheel
git+http://github.com/onnx/onnx.git@1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35#egg=onnx
git+http://github.com/onnx/onnx.git@be76ca7148396176784ba8733133b9fb1186ea0d#egg=onnx
argparse
sympy==1.1.1
flatbuffers