User/orilevari/windowsai master merge (#2674)

merge resolutions included pulling in telemetry logic that was merged to master and not windowsai and dereferencing InferenceSession::sessionstate now that it is a unique pointer

.gitignore

@@ -39,3 +39,8 @@ onnxprofile_profile_test_*.json
 /csharp/packages
 /csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.targets
 /csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.props
+cmake/external/FeaturizersLibrary/
+# Java specific ignores
+java/src/main/native/ai_onnxruntime_*.h
+java/.gradle
+

.gitmodules

@@ -40,10 +40,12 @@
 [submodule "cmake/external/cub"]
 	path = cmake/external/cub
 	url = https://github.com/NVlabs/cub.git
-[submodule "cmake/external/onnx-tensorrt"]
-	path = cmake/external/onnx-tensorrt
-	url = https://github.com/onnx/onnx-tensorrt.git
 [submodule "cmake/external/wil"]
 	path = cmake/external/wil
 	url = https://github.com/microsoft/wil
-
+[submodule "cmake/external/onnx-tensorrt"]
+	path = cmake/external/onnx-tensorrt
+	url = https://github.com/onnx/onnx-tensorrt.git
+[submodule "cmake/external/json"]
+	path = cmake/external/json
+	url = https://github.com/nlohmann/json

BUILD.md

@@ -100,7 +100,7 @@ The complete list of build options can be found by running `./build.sh (or .\bui
 * [Intel DNNL/MKL-ML](#DNNL-and-MKLML)
 * [Intel nGraph](#nGraph)
 * [Intel OpenVINO](#openvino)
-* [Android NNAPI](#Android)
+* [Android NNAPI](#Android-NNAPI)
 * [Nuphar Model Compiler](#Nuphar)
 * [DirectML](#DirectML)
 
@@ -112,6 +112,7 @@ The complete list of build options can be found by running `./build.sh (or .\bui
 **Architectures**
 * [x86](#x86)
 * [ARM](#ARM)
+* [Android](#Android)
 
 ---
 
@@ -190,7 +191,7 @@ See more information on the TensorRT Execution Provider [here](./docs/execution_
    * The path to the CUDA `bin` directory must be added to the PATH environment variable so that `nvcc` is found.
    * The path to the cuDNN installation (path to folder that contains libcudnn.so) must be provided via the cuDNN_PATH environment variable, or `--cudnn_home parameter`.
  * Install [TensorRT](https://developer.nvidia.com/nvidia-tensorrt-download)
-   * The TensorRT execution provider for ONNX Runtime is built and tested with TensorRT 6.0.1.5 but validated with the feature set equivalent to TensorRT 5. Some TensorRT 6 new features such as dynamic shape is not available at this time.
+   * The TensorRT execution provider for ONNX Runtime is built and tested with TensorRT 6.0.1.5.
    * The path to TensorRT installation must be provided via the `--tensorrt_home parameter`.
 
 #### Build Instructions
@@ -277,18 +278,9 @@ For more information on OpenVINO Execution Provider's ONNX Layer support, To
 
 ---
 
-### Android
-
-#### Cross compiling on Linux
-
-1. Get Android NDK from https://developer.android.com/ndk/downloads. Please unzip it after downloading.
+### Android NNAPI
 
-2. Get a pre-compiled protoc from [here](https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip). Please unzip it after downloading.
-
-3. Denote the unzip destination in step 1 as $ANDROID_NDK, append `-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DONNX_CUSTOM_PROTOC_EXECUTABLE=path/to/protoc` to your cmake args, run cmake and make to build it.
-
-#### Notes
-* For 32-bit devices, replace `-DANDROID_ABI=arm64-v8a` with `-DANDROID_ABI=armeabi-v7a`.
+See information on the NNAPI Execution Provider [here](./docs/execution_providers/NNAPI-ExecutionProvider.md).
 
 ---
 
@@ -541,3 +533,27 @@ ls -l /code/onnxruntime/build/Linux/MinSizeRel/dist/*.whl
 
 2. Use `.\build.bat` and specify `--arm` or `--arm64` as the build option to start building. Preferably use `Developer Command Prompt for VS` or make sure all the installed cross-compilers are findable from the command prompt being used to build using the PATH environmant variable.
 
+---
+
+### Android
+
+#### Pre-Requisites
+
+Install Android NDK from https://developer.android.com/ndk/downloads
+
+#### Build Instructions
+
+##### Cross compiling on Windows
+
+```bash
+./build.bat --android --android_ndk_path <android ndk path> --android_abi <android abi, e.g., arm64-v8a (default) or armeabi-v7a> --android_api <android api level, e.g., 27 (default)>
+```
+
+##### Cross compiling on Linux
+
+```bash
+./build.sh --android --android_ndk_path <android ndk path> --android_abi <android abi, e.g., arm64-v8a (default) or armeabi-v7a> --android_api <android api level, e.g., 27 (default)>
+```
+
+If you want to use NNAPI Execution Provider on Android, see [docs/execution_providers/NNAPI-ExecutionProvider.md](/docs/execution_providers/NNAPI-ExecutionProvider.md).
+

README.md

@@ -88,6 +88,7 @@ Additional dockerfiles can be found [here](./dockerfiles).
 * [C](docs/C_API.md)
 * [C#](docs/CSharp_API.md)
 * [C++](./include/onnxruntime/core/session/onnxruntime_cxx_api.h)
+* [Java](docs/Java_API.md)
 * [Ruby](https://github.com/ankane/onnxruntime) (external project)
 
 ### Official Builds
@@ -107,6 +108,7 @@ system.
 	 * Version: **CUDA 10.0** and **cuDNN 7.6**
   * Older ONNX Runtime releases: used **CUDA 9.1** and **cuDNN 7.1** - please refer to [prior release notes](https://github.com/microsoft/onnxruntime/releases) for more details.
 * Python binaries are compatible with **Python 3.5-3.7**. See [Python Dev Notes](./docs/Python_Dev_Notes.md). If using `pip` to be download the Python binaries, run `pip install --upgrade pip` prior to downloading. 
+* The Java API is compatible with **Java 8-13**.
 * Certain operators makes use of system locales. Installation of the **English language package** and configuring `en_US.UTF-8 locale` is required.
   * For Ubuntu install [language-pack-en package](https://packages.ubuntu.com/search?keywords=language-pack-en)
   * Run the following commands:

ThirdPartyNotices.txt

@@ -3794,4 +3794,30 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
+SOFTWARE
+
+-----
+
+nlohmann/json
+
+MIT License 
+
+Copyright (c) 2013-2019 Niels Lohmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

VERSION_NUMBER

@@ -1 +1 @@
-1.0.0
+1.1.0

cgmanifest.json

@@ -437,6 +437,24 @@
             },
             "type": "git"
          }
+      },
+      {
+         "component": {
+            "git": {
+               "commitHash": "d98bf0278d6f59a58271425963a8422ff48fe249",
+               "repositoryUrl": "https://github.com/nlohmann/json.git"
+            },
+            "type": "git"
+         }
+      }
+      {
+         "component": {
+            "git": {
+               "commitHash": "006df6bff45dac59d378609fe85f6736a901ee93",
+               "repositoryUrl": "https://github.com/microsoft/FeaturizersLibrary.git"
+            },
+            "type": "git"
+         }
       }
    ],
    "Version": 1

cmake/CMakeLists.txt

@@ -84,8 +84,8 @@ option(onnxruntime_DEBUG_NODE_INPUTS_OUTPUTS "Dump node input shapes and output
 option(onnxruntime_USE_DML "Build with DirectML support" OFF)
 option(onnxruntime_USE_WINML "Build with WinML support" OFF)
 option(onnxruntime_USE_ACL "Build with ACL support" OFF)
-option(onnxruntime_USE_TELEMETRY "Build with Telemetry" OFF)
 option(onnxruntime_ENABLE_INSTRUMENT "Enable Instrument with Event Tracing for Windows (ETW)" OFF)
+option(onnxruntime_USE_TELEMETRY "Build with Telemetry" OFF)
 
 set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build protobuf tests" FORCE)
 #nsync tests failed on Mac Build
@@ -101,6 +101,13 @@ if(NOT WIN32)
     message(WARNING "Instrument is only supported on Windows now")
     set(onnxruntime_ENABLE_INSTRUMENT OFF)
   endif()
+else()
+  check_cxx_compiler_flag(/d2FH4- HAS_D2FH4)
+  if (HAS_D2FH4)
+    message("Enabling /d2FH4-")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /d2FH4-")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2FH4-")
+  endif()
 endif()
 
 if(onnxruntime_USE_OPENMP)
@@ -282,6 +289,12 @@ else()
   add_library(protobuf::libprotobuf ALIAS libprotobuf-lite)
 endif()
 add_executable(protobuf::protoc ALIAS protoc)
+
+if(UNIX AND onnxruntime_ENABLE_LTO)
+  #https://github.com/protocolbuffers/protobuf/issues/5923
+  target_link_options(protoc PRIVATE "-Wl,--no-as-needed")
+endif()
+
 include(protobuf_function.cmake)
 
 if (onnxruntime_DISABLE_CONTRIB_OPS)
@@ -703,8 +716,8 @@ include(onnxruntime_mlas.cmake)
 
 if(onnxruntime_USE_AUTOML)
   add_definitions(-DMICROSOFT_AUTOML)
-  # Build shared featurizer library
-  include(onnxruntime_automl_featurizers.cmake)
+  # Fetch and build featurizers
+  include(external/featurizers.cmake)
 endif()
 
 if(WIN32)
@@ -743,6 +756,11 @@ if (onnxruntime_BUILD_SERVER)
   include(onnxruntime_server.cmake)
 endif()
 
+if (onnxruntime_BUILD_JAVA)
+  message(STATUS "Java Build is enabled")
+  include(onnxruntime_java.cmake)
+endif()
+
 # some of the tests rely on the shared libs to be
 # built; hence the ordering
 if (onnxruntime_BUILD_UNIT_TESTS)
@@ -773,3 +791,4 @@ if (onnxruntime_BUILD_CSHARP)
 #  set_property(GLOBAL PROPERTY VS_DOTNET_TARGET_FRAMEWORK_VERSION "netstandard2.0")
   include(onnxruntime_csharp.cmake)
 endif()
+

cmake/external/dnnl.cmake

@@ -77,7 +77,7 @@ if (onnxruntime_USE_DNNL)
     GIT_TAG ${DNNL_TAG}
     # PATCH_COMMAND ${MKLDNN_PATCH_DISCARD_COMMAND} COMMAND ${DNNL_PATCH_COMMAND}
     SOURCE_DIR ${DNNL_SOURCE}
-    CMAKE_ARGS -DDNNL_PRODUCT_BUILD_MODE=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DNNL_INSTALL} -DMKLROOT=${MKML_DIR}
+    CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DNNL_INSTALL}
   )
   link_directories(${DNNL_LIB_DIR})
   #if (onnxruntime_USE_MKLML)

cmake/external/featurizers.cmake

@@ -0,0 +1,85 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+# This source code should not depend on the onnxruntime and may be built independently
+
+set(featurizers_URL "https://github.com/microsoft/FeaturizersLibrary.git")
+set(featurizers_TAG "006df6bff45dac59d378609fe85f6736a901ee93")
+
+set(featurizers_pref FeaturizersLibrary)
+set(featurizers_ROOT ${PROJECT_SOURCE_DIR}/external/${featurizers_pref})
+set(featurizers_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/${featurizers_pref})
+
+# Only due to GIT_CONFIG
+# Uncoment UPDATE_COMMAND if you work locally
+# on the featurizers so cmake does not undo your changes.
+if (WIN32)
+    ExternalProject_Add(featurizers_lib
+            PREFIX ${featurizers_pref}
+            GIT_REPOSITORY ${featurizers_URL}
+            GIT_TAG ${featurizers_TAG}
+            # Need this to properly checkout crlf
+            GIT_CONFIG core.autocrlf=input
+            SOURCE_DIR ${featurizers_ROOT}
+            # Location of CMakeLists.txt
+            SOURCE_SUBDIR src/Featurizers
+            BINARY_DIR ${featurizers_BINARY_DIR}
+#            UPDATE_COMMAND ""
+            INSTALL_COMMAND ""
+        )
+else()
+    ExternalProject_Add(featurizers_lib
+            PREFIX ${featurizers_pref}
+            GIT_REPOSITORY ${featurizers_URL}
+            GIT_TAG ${featurizers_TAG}
+            SOURCE_DIR ${featurizers_ROOT}
+            # Location of CMakeLists.txt
+            SOURCE_SUBDIR src/Featurizers
+            BINARY_DIR ${featurizers_BINARY_DIR}
+            CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+#            UPDATE_COMMAND ""
+            INSTALL_COMMAND ""
+        )
+endif()
+
+add_library(automl_featurizers STATIC IMPORTED)
+add_dependencies(automl_featurizers featurizers_lib)
+target_include_directories(automl_featurizers INTERFACE ${featurizers_ROOT}/src)
+
+if(MSVC)
+  set_property(TARGET automl_featurizers PROPERTY IMPORTED_LOCATION
+    ${CMAKE_CURRENT_BINARY_DIR}/external/${featurizers_pref}/${CMAKE_BUILD_TYPE}/FeaturizersCode.lib)
+else()
+  set_property(TARGET automl_featurizers PROPERTY IMPORTED_LOCATION
+    ${CMAKE_CURRENT_BINARY_DIR}/external/${featurizers_pref}/libFeaturizersCode.a)
+endif()
+
+if (WIN32)
+    # Add Code Analysis properties to enable C++ Core checks. Have to do it via a props file include.
+    set_target_properties(automl_featurizers PROPERTIES VS_USER_PROPS ${PROJECT_SOURCE_DIR}/ConfigureVisualStudioCodeAnalysis.props)
+endif()
+
+# Build this in CentOS
+# foreach(_test_name IN ITEMS
+    # CatImputerFeaturizer_UnitTests
+    # DateTimeFeaturizer_UnitTests
+    # HashOneHotVectorizerFeaturizer_UnitTests
+    # ImputationMarkerFeaturizer_UnitTests
+    # LabelEncoderFeaturizer_UnitTests
+    # MaxAbsScalarFeaturizer_UnitTests
+    # MinMaxScalarFeaturizer_UnitTests
+    # MissingDummiesFeaturizer_UnitTests
+    # OneHotEncoderFeaturizer_UnitTests
+    # RobustScalarFeaturizer_UnitTests
+    # SampleAddFeaturizer_UnitTest
+    # StringFeaturizer_UnitTest
+    # Structs_UnitTest
+    # TimeSeriesImputerFeaturizer_UnitTest
+# )
+    # add_executable(${_test_name} ${featurizers_ROOT}/src/Featurizers/UnitTests/${_test_name}.cpp)
+    # add_dependencies(${_test_name} automl_featurizers)
+    # target_include_directories(${_test_name} PRIVATE ${featurizers_ROOT}/src)
+    # target_link_libraries(${_test_name} automl_featurizers)
+    # list(APPEND featurizers_TEST_SRC ${featurizers_ROOT}/src/Featurizers/UnitTests/${_test_name}.cpp)
+# endforeach()
+
+# source_group(TREE ${featurizers_ROOT}/src/Featurizers/UnitTests FILES ${featurizers_TEST_SRC})