From f06add74ac81ef907df87eceba20efaa464635a9 Mon Sep 17 00:00:00 2001 From: Pranav Sharma Date: Tue, 27 Nov 2018 16:22:00 -0800 Subject: [PATCH 1/3] Minor changes in documentation --- .clang-tidy | 2 +- .gitignore | 2 +- CONTRIBUTING.md | 3 ++- docs/HighLevelDesign.md | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 811af89e68a95..665bb05778fe8 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -2,7 +2,7 @@ # turn off readability-braces-around-statements to allow single line statement like 'if (x == y) doSomething();' Checks: '-*,cppcoreguidelines-*,google-*,readability-*,modernize-*,-readability-braces-around-statements,-google-runtime-references,-cppcoreguidelines-pro-type-reinterpret-cast' WarningsAsErrors: '' -HeaderFilterRegex: '.*lotus\/core\/.*' +HeaderFilterRegex: '.*onnxruntime\/core\/.*' AnalyzeTemporaryDtors: false FormatStyle: none CheckOptions: diff --git a/.gitignore b/.gitignore index 7d69fe5c943db..a73fe987ba3c1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ gen .vs TestResults/ .idea/ -lotus.egg-info +onnxruntime.egg-info nuget_root/ .packages/ .vscode/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eeba2307ab6ec..97e4258f2dfba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,8 @@ git commit -m "my changes" git push origin HEAD ``` To request merge into master send a pull request from the web ui -https://github.com/Microsoft/onnxruntime +https://github.com/Microsoft/onnxruntime and add 'Microsoft/onnxruntime' as a reviewer. + New code *must* be accompanied by unit tests. # Build diff --git a/docs/HighLevelDesign.md b/docs/HighLevelDesign.md index 84e15e5fdc50b..d27fb2b5c1e78 100644 --- a/docs/HighLevelDesign.md +++ b/docs/HighLevelDesign.md @@ -55,8 +55,7 @@ provider). Conceptually, each partition is reduced to a single fused operator. It is created by invoking the execution provider's Compile() method and wrap it as a -custom operator. We support both sync and async modes of execution for custom -operators. We also support both strict and non-strict invocations. An execution +custom operator. Currently we support only sync mode of execution. An execution provider exposes its memory allocator, which is used to allocate the input tensors for the execution provider. The rewriting and partitioning transform the initial model graph into a new graph composed with operators assigned to either From b68f268dd8a4cd2ccb3a14c924c18f7de35e87a9 Mon Sep 17 00:00:00 2001 From: Pranav Sharma Date: Tue, 27 Nov 2018 17:05:11 -0800 Subject: [PATCH 2/3] Synchronous, not sync --- docs/HighLevelDesign.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/HighLevelDesign.md b/docs/HighLevelDesign.md index d27fb2b5c1e78..7b9dc27e9afa7 100644 --- a/docs/HighLevelDesign.md +++ b/docs/HighLevelDesign.md @@ -55,7 +55,7 @@ provider). Conceptually, each partition is reduced to a single fused operator. It is created by invoking the execution provider's Compile() method and wrap it as a -custom operator. Currently we support only sync mode of execution. An execution +custom operator. Currently we support only synchronous mode of execution. An execution provider exposes its memory allocator, which is used to allocate the input tensors for the execution provider. The rewriting and partitioning transform the initial model graph into a new graph composed with operators assigned to either From 33ad557fd699aada2c6d27a0ef6bc9fe0e52d71a Mon Sep 17 00:00:00 2001 From: Pranav Sharma Date: Tue, 27 Nov 2018 17:14:17 -0800 Subject: [PATCH 3/3] Add remaining build options after mkldnn fix --- tools/ci_build/github/azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml index 6b78c4be7ae07..c559257b54c47 100644 --- a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml +++ b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml @@ -44,7 +44,7 @@ jobs: - task: BatchScript@1 inputs: filename: build.bat - arguments: ' --enable_onnx_tests --enable_pybind' + arguments: ' --enable_pybind --use_mkldnn --use_mklml --build_shared_lib --enable_onnx_tests' workingFolder: "$(Build.SourcesDirectory)" - task: CmdLine@1