diff --git a/.clang-tidy b/.clang-tidy index 811af89e68..665bb05778 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 7d69fe5c94..a73fe987ba 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/BUILD.md b/BUILD.md index 5bbdd1d526..f21a989998 100644 --- a/BUILD.md +++ b/BUILD.md @@ -49,7 +49,7 @@ The complete list of build options can be found by running `./build.sh (or ./bui | Linux_CI_Dev | Ubuntu 16.04 | python=3.5 | Unit tests; ONNXModelZoo | [script](tools/ci_build/github/linux/run_build.sh) | | Linux_CI_GPU_Dev | Ubuntu 16.04 | python=3.5; nvidia-docker | Unit tests; ONNXModelZoo | [script](tools/ci_build/github/linux/run_build.sh) | | Windows_CI_Dev | Windows Server 2016 | python=3.5 | Unit tests; ONNXModelZoo | [script](build.bat) | -| Windows_CI_GPU_Dev | Windows Server 2016 | cuda=9.0; cudnn=7.0; python=3.5 | Unit tests; ONNXModelZoo | [script](build.bat) | +| Windows_CI_GPU_Dev | Windows Server 2016 | cuda=9.1; cudnn=7.1; python=3.5 | Unit tests; ONNXModelZoo | [script](build.bat) | ## Additional Build Flavors The complete list of build flavors can be seen by running `./build.sh --help` or `./build.bat --help`. Here are some common flavors. @@ -57,7 +57,7 @@ The complete list of build flavors can be seen by running `./build.sh --help` or ### Windows CUDA Build ONNX Runtime supports CUDA builds. You will need to download and install [CUDA](https://developer.nvidia.com/cuda-toolkit) and [CUDNN](https://developer.nvidia.com/cudnn). -ONNX Runtime is built and tested with CUDA 9.0 and CUDNN 7.0 using the Visual Studio 2017 14.11 toolset (i.e. Visual Studio 2017 v15.3). +ONNX Runtime is built and tested with CUDA 9.1 and CUDNN 7.1 using the Visual Studio 2017 14.11 toolset (i.e. Visual Studio 2017 v15.3). CUDA versions up to 9.2 and CUDNN version 7.1 should also work with versions of Visual Studio 2017 up to and including v15.7, however you may need to explicitly install and use the 14.11 toolset due to CUDA and CUDNN only being compatible with earlier versions of Visual Studio 2017. To install the Visual Studio 2017 14.11 toolset, see diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eeba2307ab..97e4258f2d 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/README.md b/README.md index 91f47ca686..2959a524b1 100644 --- a/README.md +++ b/README.md @@ -15,30 +15,33 @@ In order to support popular and leading AI models, the runtime stays up-to-date ## Cross Platform ONNX Runtime offers: -* APIs for Python, C#, and C +* APIs for Python, C#, and C (experimental) * Available for Linux, Windows, and Mac  See API documentation and package installation instructions [below](#Installation). ## High Performance -You can use the ONNX Runtime with both CPU and GPU hardware. You can also plug in additional execution providers to ONNX Runtime. With many graph optimizations and various accelerators, ONNX Runtime can often provide lower latency and higher efficiency compared to other runtimes. This provides smoother end-to-end customer experiences and lower costs from improved machine utilization. +You can use ONNX Runtime with both CPU and GPU hardware. You can also plug in additional execution providers to ONNX Runtime. With many graph optimizations and various accelerators, ONNX Runtime can often provide lower latency and higher efficiency compared to other runtimes. This provides smoother end-to-end customer experiences and lower costs from improved machine utilization. -Currently ONNX Runtime supports CUDA, MKL, and MKL-DNN for computation acceleration, with more coming soon. To add an execution provider, please refer to [this page](docs/AddingExecutionProvider.md). +Currently ONNX Runtime supports CUDA and MKL-DNN (with option to build with MKL) for computation acceleration, with more coming soon. To add an execution provider, please refer to [this page](docs/AddingExecutionProvider.md). # Getting Started If you need a model: * Check out the [ONNX Model Zoo](https://github.com/onnx/models) for ready-to-use pre-trained models. * To get an ONNX model by exporting from various frameworks, see [ONNX Tutorials](https://github.com/onnx/tutorials). -If you already have an ONNX model, just [install the runtime](#Installation) for your machine to try it out. One easy way to operationalize the model on the cloud is by using [Azure Machine Learning](https://azure.microsoft.com/en-us/services/machine-learning-service). See a how-to guide [here](https://docs.microsoft.com/en-us/azure/machine-learning/service/how-to-build-deploy-onnx). +If you already have an ONNX model, just [install the runtime](#Installation) for your machine to try it out. One easy way to deploy the model on the cloud is by using [Azure Machine Learning](https://azure.microsoft.com/en-us/services/machine-learning-service). See detailed instructions [here](https://docs.microsoft.com/en-us/azure/machine-learning/service/how-to-build-deploy-onnx). # Installation ## APIs and Official Builds | API Documentation | CPU package | GPU package | |-----|-------------|-------------| -| [Python](https://docs.microsoft.com/en-us/python/api/overview/azure/onnx/intro?view=azure-onnx-py) | [Windows](TODO)
[Linux](https://pypi.org/project/onnxruntime/)
[Mac](TODO)| [Windows](TODO)
[Linux](https://pypi.org/project/onnxruntime-gpu/) | +| [Python](https://docs.microsoft.com/en-us/python/api/overview/azure/onnx/intro?view=azure-onnx-py) | [Windows](https://pypi.org/project/onnxruntime/)
[Linux](https://pypi.org/project/onnxruntime/)
[Mac](https://pypi.org/project/onnxruntime/)| [Windows](https://pypi.org/project/onnxruntime-gpu)
[Linux](https://pypi.org/project/onnxruntime-gpu/) | | [C#](docs/CSharp_API.md) | [Windows](TODO)
Linux - Coming Soon
Mac - Coming Soon| Coming Soon | -| [C](docs/C_API.md) | [Windows](TODO)
[Linux](TODO) | Coming Soon | +| [C (experimental)](docs/C_API.md) | Coming Soon | Coming Soon | + +

+ONNX Runtime also provides a non ABI [C++ API](onnxruntime/core/session/inference_session.h) ## Build Details For details on the build configurations and information on how to create a build, see [Build ONNX Runtime](BUILD.md). @@ -51,11 +54,11 @@ For an overview of the high level architecture and key decisions in the technica ONNX Runtime is built with an extensible design that makes it versatile to support a wide array of models with high performance. -* [Add a custom operator/kernel](AddingCustomOp.md) -* [Add an execution provider](AddingExecutionProvider.md) +* [Add a custom operator/kernel](docs/AddingCustomOp.md) +* [Add an execution provider](docs/AddingExecutionProvider.md) * [Add a new graph -transform](../include/onnxruntime/core/graph/graph_transformer.h) -* [Add a new rewrite rule](../include/onnxruntime/core/graph/rewrite_rule.h) +transform](include/onnxruntime/core/graph/graph_transformer.h) +* [Add a new rewrite rule](include/onnxruntime/core/graph/rewrite_rule.h) # Contribute We welcome your contributions! Please see the [contribution guidelines](CONTRIBUTING.md). diff --git a/docs/ABI.md b/docs/ABI.md index d57e7b94d1..5895b507db 100644 --- a/docs/ABI.md +++ b/docs/ABI.md @@ -1,6 +1,6 @@ -# ONNXRuntime ABI +# ONNX Runtime ABI -We release ONNXRuntime as both static library and shared library on Windows, Linux and Mac OS X. [ABI (Application Binary Interface)](https://en.wikipedia.org/wiki/Application_binary_interface) is only for the shared library. It allows you upgrade ONNXRuntime to a newer version without recompiling. +We release ONNX Runtime as both static library and shared library on Windows, Linux and Mac OS X. [ABI (Application Binary Interface)](https://en.wikipedia.org/wiki/Application_binary_interface) is only for the shared library. It allows you upgrade ONNX Runtime to a newer version without recompiling. The ABI contains: @@ -11,31 +11,28 @@ The ABI contains: [C API](C_API.md) # Integration -Q: Should I statically link to ONNXRuntime or dynamically? -A: On Windows, Any custom op DLL must dynamically link to ONNXRuntime. -Dynamical linking also helps on solving diamond dependency problem. For example, if part of your program depends on ONNX 1.2 but ONNXRuntime depends on ONNX 1.3, then dynamically linking to them would be better. +Q: Should I statically link to ONNX Runtime or dynamically? +A: On Windows, Any custom op DLL must dynamically link to ONNX Runtime. +Dynamical linking also helps on solving diamond dependency problem. For example, if part of your program depends on ONNX 1.2 but ONNX Runtime depends on ONNX 1.3, then dynamically linking to them would be better. -Q: Any requirement on CUDA version? My program depends on CUDA 9.0, but the ONNXRuntime binary was built with CUDA 9.1. Is it ok to put them together? -A: Yes. Because ONNXRuntime statically linked to CUDA. +Q: Any requirement on CUDA version? My program depends on CUDA 9.0, but the ONNX Runtime binary was built with CUDA 9.1. Is it ok to put them together? +A: Yes. Because ONNX Runtime statically linked to CUDA. # Dev Notes ## Global Variables -Global variables may get constructed or destructed inside "DllMain". There are significant limits on what you can safely do in a DLL entry point. See ['DLL General Best Practices'](https://docs.microsoft.com/en-us/windows/desktop/dlls/dynamic-link-library-best-practices). For example, you can't put a ONNXRuntime InferenceSession into a global variable. - -## Component Object Model (COM) -ONNXRuntime doesn't contain a COM interface, whether it's on Windows or Linux. Because .Net Core doesn't support COM on Linux and we need to make ONNXRuntime available to .Net Core. +Global variables may get constructed or destructed inside "DllMain". There are significant limits on what you can safely do in a DLL entry point. See ['DLL General Best Practices'](https://docs.microsoft.com/en-us/windows/desktop/dlls/dynamic-link-library-best-practices). For example, you can't put a ONNX Runtime InferenceSession into a global variable. ## Undefined symbols in a shared library On Windows, you can't build a DLL with undefined symbols. Every symbol must be get resolved at link time. On Linux, you can. In this project, we setup a rule: when building a shared library, every symbol must get resolved at link time, unless it's a custom op. -For custom op, on Linux, don't pass any libraries(except libc, pthreads) to linker. So that, even the application is statically linked to ONNXRuntime, they can still use the same custom op binary. +For custom op, on Linux, don't pass any libraries(except libc, pthreads) to linker. So that, even the application is statically linked to ONNX Runtime, they can still use the same custom op binary. ## Default visibility -On POSIX systems, please always specify "-fvisibility=hidden" and "-fPIC" when compiling any code in ONNXRuntime shared library. +On POSIX systems, please always specify "-fvisibility=hidden" and "-fPIC" when compiling any code in ONNX Runtime shared library. See [pybind11 FAQ](https://github.com/pybind/pybind11/blob/master/docs/faq.rst#someclass-declared-with-greater-visibility-than-the-type-of-its-field-someclassmember--wattributes) @@ -43,4 +40,4 @@ On POSIX systems, please always specify "-fvisibility=hidden" and "-fPIC" when c ## RTLD_LOCAL vs RTLD_GLOBAL RTLD_LOCAL and RTLD_GLOBAL are two flags of [dlopen(3)](http://pubs.opengroup.org/onlinepubs/9699919799/functions/dlopen.html) function on Linux. By default, it's RTLD_LOCAL. And basically you can say, there no corresponding things like RTLD_GLOBAL on Windows. -If your application is a shared library, which statically linked to ONNXRuntime, and your application needs to dynamically load a custom op, then your application must be loaded with RTLD_GLOBAL. In all other cases, you should use RTLD_LOCAL. ONNXRuntime python binding is a good example of why sometimes RTLD_GLOBAL is needed. +If your application is a shared library, which statically linked to ONNX Runtime, and your application needs to dynamically load a custom op, then your application must be loaded with RTLD_GLOBAL. In all other cases, you should use RTLD_LOCAL. ONNX Runtime python binding is a good example of why sometimes RTLD_GLOBAL is needed. diff --git a/docs/C_API.md b/docs/C_API.md index 5c2cbe567b..696c255a0e 100644 --- a/docs/C_API.md +++ b/docs/C_API.md @@ -1,20 +1,9 @@ # C API -# Q: Why have a C API? -Q: Why not just live in a C++ world? Why C? -A: We want to distribute the onnxruntime as a DLL, which can be used in .Net languages through [P/Invoke](https://docs.microsoft.com/en-us/cpp/dotnet/how-to-call-native-dlls-from-managed-code-using-pinvoke). -This is the only option we have. +**NOTE: The C API is PRE-RELEASE and subject to change. Please do not rely on this file not changing.** -Q: Is it only for .Net? -A: No. It is designed for: -1. Creating language bindings for the onnxruntime. e.g. C#, python, java, ... -2. Dynamic linking has some benefits. For example, solving diamond dependency problems. +## Features -Q: Can I export C++ types and functions across DLL or "Shared Object" Library(.so) boundaries? -A: Well, you can, but it's not a good practice. We won't do it in this project. - - -## What's inside * Creating an InferenceSession from an on-disk model file and a set of SessionOptions. * Registering customized loggers. * Registering customized allocators. @@ -26,7 +15,7 @@ A: Well, you can, but it's not a good practice. We won't do it in this project. ## How to use it -1. Include [onnxruntime_c_api.h](include/onnxruntime/core/session/onnxruntime_c_api.h). +1. Include [onnxruntime_c_api.h](/include/onnxruntime/core/session/onnxruntime_c_api.h). 2. Call ONNXRuntimeInitialize 3. Create Session: ONNXRuntimeCreateInferenceSession(env, model_uri, nullptr,...) 4. Create Tensor diff --git a/docs/HighLevelDesign.md b/docs/HighLevelDesign.md index 84e15e5fdc..7b9dc27e9a 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 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 diff --git a/docs/ReleaseManagement.md b/docs/ReleaseManagement.md index 27c5413ced..d70908689e 100644 --- a/docs/ReleaseManagement.md +++ b/docs/ReleaseManagement.md @@ -1,11 +1,4 @@ # Release Management -This describes the process by which versions of ONNX Runtime are officially -released to the public. - -## Releases Releases are versioned according to -[docs/Versioning.md](Versioning/md). We plan to release ONNX Runtime packages -every 6 months. - -(TBD: Add more here later) +[Versioning](Versioning/md). Official releases of ONNX Runtime are managed by the core ONNX Runtime team and packages will be published at least every 6 months. diff --git a/docs/Versioning.md b/docs/Versioning.md index 292538ab00..d4eead6945 100644 --- a/docs/Versioning.md +++ b/docs/Versioning.md @@ -13,7 +13,7 @@ The version number of the current stable release can be found [here](../VERSION_NUMBER) ## Release cadence -See [docs/ReleaseManagement.md](ReleaseManagement.md) +See [Release Management](ReleaseManagement.md) ## Compatibility with ONNX opsets ONNX Runtime supports both backwards and forward compatibility. diff --git a/onnxruntime/core/framework/mem_pattern_planner.h b/onnxruntime/core/framework/mem_pattern_planner.h index 97a35eeee6..be1e987bd7 100644 --- a/onnxruntime/core/framework/mem_pattern_planner.h +++ b/onnxruntime/core/framework/mem_pattern_planner.h @@ -1,3 +1,17 @@ +//Part of the algo is derived from tensorflow. + +/* Copyright 2017 The TensorFlow Authors. All Rights Reserved. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +==============================================================================*/ + // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. diff --git a/rename_manylinux.sh b/rename_manylinux.sh index 707cc1c9c9..5634a5ef44 100755 --- a/rename_manylinux.sh +++ b/rename_manylinux.sh @@ -3,7 +3,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -# hack script to modify modify whl as manylinux whl +# hack script to modify whl as manylinux whl whl=(*whl) renamed_whl=`echo $whl | sed --expression='s/linux/manylinux1/g'` basename=`echo $whl | awk -F'-cp3' '{print $1}'` diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml new file mode 100644 index 0000000000..770c284362 --- /dev/null +++ b/tools/ci_build/github/azure-pipelines/azure-pipelines-py-packaging.yml @@ -0,0 +1,184 @@ +jobs: +- job: Ubuntu1604_py_Wheels + pool: Linux-CPU + strategy: + matrix: + Python35: + python.version: '3.5' + Python36: + python.version: '3.6' + Python37: + python.version: '3.7' + steps: + - task: ShellScript@2 + displayName: 'Run build script' + inputs: + scriptPath: 'tools/ci_build/github/linux/run_dockerbuild.sh' + args: '-c Release -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -p $(python.version) -x "--build_wheel --use_mkldnn"' + + - task: CopyFiles@2 + displayName: 'Copy Python Wheel to: $(Build.ArtifactStagingDirectory)' + inputs: + SourceFolder: '$(Build.BinariesDirectory)' + Contents: 'Release/dist/onnxruntime-*-manylinux1_x86_64.whl' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: ONNXRuntime python wheel' + inputs: + ArtifactName: onnxruntime + + - script: 'sudo rm -rf $(Agent.BuildDirectory)' + displayName: 'Clean build folders/files' + condition: always() + +- job: Ubuntu1604_py_GPU_Wheels + pool: Linux-GPU + strategy: + matrix: + Python35: + python.version: '3.5' + Python36: + python.version: '3.6' + Python37: + python.version: '3.7' + steps: + - task: ShellScript@2 + displayName: 'Run build script' + inputs: + scriptPath: 'tools/ci_build/github/linux/run_dockerbuild.sh' + args: '-c Release -o ubuntu16.04 -d gpu -r $(Build.BinariesDirectory) -p $(python.version) -x "--build_wheel --use_mkldnn"' + + - task: CopyFiles@2 + displayName: 'Copy Python Wheel to: $(Build.ArtifactStagingDirectory)' + inputs: + SourceFolder: '$(Build.BinariesDirectory)' + Contents: 'Release/dist/onnxruntime*-manylinux1_x86_64.whl' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: ONNXRuntime python wheel' + inputs: + ArtifactName: onnxruntime_gpu + + - script: 'sudo rm -rf $(Agent.BuildDirectory)' + displayName: 'Clean build folders/files' + condition: always() + +- job: Windows_py_Wheels + pool: Win-CPU + strategy: + matrix: + Python35: + python.version: '3.5' + Python36: + python.version: '3.6' + variables: + buildDirectory: '$(Build.SourcesDirectory)\build' + steps: + - task: CondaEnvironment@1 + inputs: + createCustomEnvironment: true + environmentName: 'py$(python.version)' + packageSpecs: 'python=$(python.version)' + cleanEnvironment: true + + - task: BatchScript@1 + displayName: 'Run build script' + inputs: + filename: 'build.bat' + arguments: ' --build_dir $(buildDirectory) --config Release --build_wheel --use_mkldnn' + workingFolder: "$(Build.SourcesDirectory)" + + - task: CopyFiles@2 + displayName: 'Copy Python Wheel to: $(Build.ArtifactStagingDirectory)' + inputs: + SourceFolder: '$(buildDirectory)' + Contents: '**\dist\onnxruntime-*.whl' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: ONNXRuntime python wheel' + inputs: + ArtifactName: onnxruntime + + - task: CmdLine@1 + displayName: 'Clean build folders/files' + inputs: + filename: rd + arguments: '/s /q $(Agent.BuildDirectory)' + continueOnError: true + condition: always() + + - task: CmdLine@1 + displayName: 'Deactivating Conda Environment' + inputs: + filename: deactivate + continueOnError: true + condition: always() + +- job: Windows_py_GPU_Wheels + pool: Win-GPU + variables: + buildDirectory: '$(Build.SourcesDirectory)\build' + CUDA_VERSION: '9.1' + strategy: + matrix: + Python35: + python.version: '3.5' + Python36: + python.version: '3.6' + steps: + - task: CondaEnvironment@1 + inputs: + createCustomEnvironment: true + environmentName: 'py$(python.version)' + packageSpecs: 'python=$(python.version)' + cleanEnvironment: true + + - task: PowerShell@1 + displayName: 'Set CUDA path' + inputs: + scriptName: 'tools/ci_build/github/windows/set_cuda_path.ps1' + arguments: '-CudaMsbuildPath C:\local\cudaMsbuildIntegration-9.1.85-windows10-x64-0 -CudaVersion $(CUDA_VERSION)' + + - task: BatchScript@1 + displayName: 'Setup VS2017 env vars' + inputs: + filename: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat' + arguments: 'amd64 -vcvars_ver=14.11' + modifyEnvironment: true + + - task: BatchScript@1 + displayName: 'Run build script' + inputs: + filename: 'build.bat' + arguments: ' --use_cuda --cuda_home="C:\local\cuda-9.1.85-windows10-x64-0" --cudnn_home="C:\local\cudnn-9.1-windows10-x64-v7.1\cuda" --build_dir $(buildDirectory) --config Release --build_wheel' + workingFolder: "$(Build.SourcesDirectory)" + + - task: CopyFiles@2 + displayName: 'Copy Python Wheel to: $(Build.ArtifactStagingDirectory)' + inputs: + SourceFolder: '$(buildDirectory)' + Contents: '**\dist\onnxruntime_gpu-*.whl' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: ONNXRuntime python wheel' + inputs: + ArtifactName: onnxruntime_gpu + + - task: CmdLine@1 + displayName: 'Clean build folders/files' + inputs: + filename: rd + arguments: '/s /q $(Agent.BuildDirectory)' + continueOnError: true + condition: always() + + - task: CmdLine@1 + displayName: 'Deactivating Conda Environment' + inputs: + filename: deactivate + continueOnError: true + condition: always() diff --git a/tools/ci_build/github/azure-pipelines/azure-pipelines.yml b/tools/ci_build/github/azure-pipelines/azure-pipelines.yml index c14fd80e90..1ebfce85de 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 --use_mkldnn --use_openmp --enable_pybind --build_shared_lib --build_csharp' + arguments: ' --enable_pybind --use_mkldnn --use_mklml --use_openmp --build_shared_lib --build_csharp --enable_onnx_tests' workingFolder: "$(Build.SourcesDirectory)" - task: CmdLine@1 diff --git a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh index 9aacae059e..163342d157 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_ubuntu.sh @@ -45,6 +45,7 @@ if [ $PYTHON_VER != "3.5" ]; then update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VER} 1 update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 2 update-alternatives --set python3 /usr/bin/python${PYTHON_VER} + /usr/bin/python${PYTHON_VER} -m pip install --upgrade --force-reinstall numpy fi rm -rf /var/lib/apt/lists/* diff --git a/tools/ci_build/github/linux/run_build.sh b/tools/ci_build/github/linux/run_build.sh index bdfa0f0891..083204a6a6 100755 --- a/tools/ci_build/github/linux/run_build.sh +++ b/tools/ci_build/github/linux/run_build.sh @@ -9,16 +9,19 @@ while getopts c:d:x: parameter_Option do case "${parameter_Option}" in d) BUILD_DEVICE=${OPTARG};; +x) BUILD_EXTR_PAR=${OPTARG};; esac done if [ -z "$AZURE_BLOB_KEY" ]; then echo "AZURE_BLOB_KEY is blank" + BUILD_EXTR_PAR="${BUILD_EXTR_PAR}" + echo "Extra parameters: ${BUILD_EXTR_PAR}" else echo "Downloading test data from azure" mkdir -p /home/onnxruntimedev/models/ azcopy --recursive --source:https://onnxruntimetestdata.blob.core.windows.net/onnx-model-zoo-20181018 --destination:/home/onnxruntimedev/models/ --source-key:$AZURE_BLOB_KEY - BUILD_EXTR_PAR="--enable_onnx_tests" + BUILD_EXTR_PAR="${BUILD_EXTR_PAR} --enable_onnx_tests" fi if [ $BUILD_DEVICE = "gpu" ]; then