merge upstream/master

javierabosch2 · Apr 17, 2020 · 8228833 · 8228833
2 parents 1950391 + f822a54
commit 8228833
Show file tree

Hide file tree

Showing 307 changed files with 6,475 additions and 3,937 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -403,6 +403,8 @@ alias cmake="/usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$OECORE_NATIVE_SYSROOT/usr/sh
 ```
 cmake ../onnxruntime-arm-upstream/cmake -DONNX_CUSTOM_PROTOC_EXECUTABLE=/usr/bin/protoc -Donnxruntime_RUN_ONNX_TESTS=OFF -Donnxruntime_GENERATE_TEST_REPORTS=ON -Donnxruntime_DEV_MODE=ON -DPYTHON_EXECUTABLE=/usr/bin/python3 -Donnxruntime_USE_CUDA=OFF -Donnxruntime_USE_NSYNC=OFF -Donnxruntime_CUDNN_HOME= -Donnxruntime_USE_JEMALLOC=OFF -Donnxruntime_ENABLE_PYTHON=OFF -Donnxruntime_BUILD_CSHARP=OFF -Donnxruntime_BUILD_SHARED_LIB=ON -Donnxruntime_USE_EIGEN_FOR_BLAS=ON -Donnxruntime_USE_OPENBLAS=OFF -Donnxruntime_USE_ACL=ON -Donnxruntime_USE_DNNL=OFF -Donnxruntime_USE_MKLML=OFF -Donnxruntime_USE_OPENMP=ON -Donnxruntime_USE_TVM=OFF -Donnxruntime_USE_LLVM=OFF -Donnxruntime_ENABLE_MICROSOFT_INTERNAL=OFF -Donnxruntime_USE_BRAINSLICE=OFF -Donnxruntime_USE_NUPHAR=OFF -Donnxruntime_USE_EIGEN_THREADPOOL=OFF -Donnxruntime_BUILD_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
 ```
+The ```-Donnxruntime_USE_ACL=ON``` option will use, by default, the 19.05 version of the Arm Compute Library. To set the right version you can use:
+```-Donnxruntime_USE_ACL_1902=ON```, ```-Donnxruntime_USE_ACL_1905=ON``` or ```-Donnxruntime_USE_ACL_1908=ON```;
 
 2. Build ONNX Runtime library, test and performance application:
 ```

diff --git a/cgmanifest.json b/cgmanifest.json
@@ -450,7 +450,7 @@
       {
          "component": {
             "git": {
-               "commitHash": "9dfa77ad5c59abd07b77a4c463315ef8112daefc",
+               "commitHash": "7922489c1e7e7baf20c4b1557743d6c7ea72647d",
                "repositoryUrl": "https://github.com/microsoft/FeaturizersLibrary.git"
             },
             "type": "git"

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -57,7 +57,7 @@ option(onnxruntime_USE_OPENVINO "Build with OpenVINO support" OFF)
 option(onnxruntime_USE_EIGEN_FOR_BLAS "Use eign for blas" ON)
 option(onnxruntime_USE_NNAPI "Build with DNNLibrary for Android NNAPI support" OFF)
 option(onnxruntime_USE_DNNL "Build with DNNL support" OFF)
-option(onnxruntime_USE_MKLML "Build DNNL with MKL-ML binary dependency" OFF)
+option(onnxruntime_USE_MKLML "Build the default cpu provider with MKL-ML binary dependency" OFF)
 option(onnxruntime_USE_FEATURIZERS "Build ML Featurizers support" OFF)
 option(onnxruntime_USE_NGRAPH "Build with nGraph support" OFF)
 option(onnxruntime_USE_OPENBLAS "Use openblas" OFF)
@@ -91,6 +91,9 @@ 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_ACL_1902 "Build with ACL version 1902 support" OFF)
+option(onnxruntime_USE_ACL_1905 "Build with ACL version 1905 support" OFF)
+option(onnxruntime_USE_ACL_1908 "Build with ACL version 1908 support" OFF)
 option(onnxruntime_ENABLE_INSTRUMENT "Enable Instrument with Event Tracing for Windows (ETW)" OFF)
 option(onnxruntime_USE_TELEMETRY "Build with Telemetry" OFF)
 #The onnxruntime_PREFER_SYSTEM_LIB is mainly designed for package managers like apt/yum/vcpkg.
@@ -213,8 +216,8 @@ if (MSVC)
     set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib for gtest" FORCE)
   endif()
   #Always enable exception handling, even for Windows ARM
-  string(APPEND CMAKE_CXX_FLAGS " /EHsc")
-  string(APPEND CMAKE_C_FLAGS " /EHsc")
+  string(APPEND CMAKE_CXX_FLAGS " /EHsc /wd26812")
+  string(APPEND CMAKE_C_FLAGS " /EHsc /wd26812")
   if(onnxruntime_USE_AVX)
     string(APPEND CMAKE_CXX_FLAGS " /arch:AVX")
     string(APPEND CMAKE_C_FLAGS " /arch:AVX")
@@ -472,7 +475,18 @@ endfunction()
 set(onnxruntime_EXTERNAL_DEPENDENCIES onnx_proto)
 
 # ACL
-if (onnxruntime_USE_ACL)
+if (onnxruntime_USE_ACL OR onnxruntime_USE_ACL_1902 OR onnxruntime_USE_ACL_1905 OR onnxruntime_USE_ACL_1908)
+  set(onnxruntime_USE_ACL ON)
+  if(onnxruntime_USE_ACL_1902)
+    add_definitions(-DACL_1902=1)
+  else()
+    if(onnxruntime_USE_ACL_1908)
+      add_definitions(-DACL_1908=1)
+    else()
+      add_definitions(-DACL_1905=1)
+    endif()
+  endif()
+
   list(APPEND onnxruntime_EXTERNAL_LIBRARIES arm_compute acl arm_compute_graph arm_compute_core)
 endif()
 
@@ -571,7 +585,7 @@ if (WIN32)
     string(APPEND CMAKE_CXX_FLAGS " /wd4251")
     if (onnxruntime_ENABLE_STATIC_ANALYSIS)
         string(APPEND CMAKE_CXX_FLAGS
-            " /analyze:WX- "
+            " /analyze:stacksize 131072"
             # disable warning because there are many occurrences from test macros
             " /wd6326 " # potential comparison of a constant with another constant
         )
@@ -756,12 +770,12 @@ if (onnxruntime_USE_CUDA)
   set(CMAKE_CUDA_STANDARD 11)
   file(TO_CMAKE_PATH ${onnxruntime_CUDNN_HOME} onnxruntime_CUDNN_HOME)
   set(ONNXRUNTIME_CUDA_LIBRARIES ${CUDA_LIBRARIES})
-  list(APPEND ONNXRUNTIME_CUDA_LIBRARIES cublas cudnn curand)
+  list(APPEND ONNXRUNTIME_CUDA_LIBRARIES cublas cudnn curand cufft)
   if (WIN32)
     link_directories(${onnxruntime_CUDNN_HOME}/lib/x64)
 
     # delayload causes crash on exit, so disable for now
-    #file(GLOB cuda_dll_paths "${onnxruntime_CUDA_HOME}/bin/cublas64_*" "${onnxruntime_CUDA_HOME}/bin/cudart64_*" "${onnxruntime_CUDA_HOME}/bin/curand64_*")
+    #file(GLOB cuda_dll_paths "${onnxruntime_CUDA_HOME}/bin/cublas64_*" "${onnxruntime_CUDA_HOME}/bin/cudart64_*" "${onnxruntime_CUDA_HOME}/bin/curand64_*" "${onnxruntime_CUDA_HOME}/bin/cufft64_*")
     #set(onnxruntime_DELAYLOAD_FLAGS "${onnxruntime_DELAYLOAD_FLAGS} /DELAYLOAD:cudnn64_7.dll")
     #foreach(cuda_dll_path ${cuda_dll_paths})
     #    get_filename_component(cuda_dll_file_name ${cuda_dll_path} NAME)
@@ -867,7 +881,7 @@ else()
   list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${CMAKE_DL_LIBS} Threads::Threads)
 endif()
 
-# Default version parts for Windows.AI.MachineLearning.dll and onnxruntime.dll in non-ADO pipeline local builds
+# Default version parts for Microsoft.AI.MachineLearning.dll and onnxruntime.dll in non-ADO pipeline local builds
 set(VERSION_MAJOR_PART   0 CACHE STRING "First part of numeric file/product version.")
 set(VERSION_MINOR_PART   0 CACHE STRING "Second part of numeric file/product version.")
 set(VERSION_BUILD_PART       0 CACHE STRING "Third part of numeric file/product version.")

diff --git a/cmake/CMakeSettings.json b/cmake/CMakeSettings.json
@@ -16,6 +16,10 @@
           "value": "True",
           "type": "BOOL"
         },
+        {
+          "name": "onnxruntime_WINML_NAMESPACE_OVERRIDE",
+          "value": "Microsoft"
+        },
         {
           "name": "onnxruntime_USE_DML",
           "value": "True",
@@ -45,6 +49,10 @@
           "value": "True",
           "type": "BOOL"
         },
+        {
+          "name": "onnxruntime_WINML_NAMESPACE_OVERRIDE",
+          "value": "Microsoft"
+        },
         {
           "name": "onnxruntime_USE_DML",
           "value": "True",

diff --git a/cmake/external/FeaturizersLibrary b/cmake/external/FeaturizersLibrary
diff --git a/cmake/external/dnnl.cmake b/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 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DNNL_INSTALL}
+    CMAKE_ARGS -DDNNL_BUILD_TESTS=OFF -DDNNL_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DNNL_INSTALL}
   )
   link_directories(${DNNL_LIB_DIR})
   #if (onnxruntime_USE_MKLML)

diff --git a/cmake/onnxruntime_dependencies.dot b/cmake/onnxruntime_dependencies.dot
diff --git a/cmake/onnxruntime_java.cmake b/cmake/onnxruntime_java.cmake
@@ -75,6 +75,12 @@ endif()
 if (onnxruntime_USE_NUPHAR)
   target_compile_definitions(onnxruntime4j_jni PRIVATE USE_NUPHAR=1)
 endif()
+if (onnxruntime_USE_ACL)
+  target_compile_definitions(onnxruntime4j_jni PRIVATE USE_ACL=1)
+endif()
+if (onnxruntime_USE_DML)
+  target_compile_definitions(onnxruntime4j_jni PRIVATE USE_DIRECTML=1)
+endif()
 
 # depend on java sources. if they change, the JNI should recompile
 add_dependencies(onnxruntime4j_jni onnxruntime4j)

diff --git a/cmake/onnxruntime_mlas.cmake b/cmake/onnxruntime_mlas.cmake
@@ -263,3 +263,6 @@ endif()
 add_library(onnxruntime_mlas STATIC ${mlas_common_srcs} ${mlas_platform_srcs})
 target_include_directories(onnxruntime_mlas PRIVATE ${ONNXRUNTIME_ROOT}/core/mlas/inc ${ONNXRUNTIME_ROOT}/core/mlas/lib ${ONNXRUNTIME_ROOT}/core/mlas/lib/amd64)
 set_target_properties(onnxruntime_mlas PROPERTIES FOLDER "ONNXRuntime")
+if (WIN32)
+  target_compile_options(onnxruntime_mlas PRIVATE "/wd6385")
+endif()
diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake
@@ -28,6 +28,9 @@ function(AddTest)
     #TODO: fix the warnings, they are dangerous
     target_compile_options(${_UT_TARGET} PRIVATE "/wd4244")
   endif()
+  if (MSVC)
+    target_compile_options(${_UT_TARGET} PRIVATE "/wd6330")
+  endif()
   source_group(TREE ${TEST_SRC_DIR} FILES ${_UT_SOURCES})
   set_target_properties(${_UT_TARGET} PROPERTIES FOLDER "ONNXRuntimeTest")
 
@@ -474,7 +477,7 @@ add_library(onnx_test_data_proto ${TEST_SRC_DIR}/proto/tml.proto)
 add_dependencies(onnx_test_data_proto onnx_proto ${onnxruntime_EXTERNAL_DEPENDENCIES})
 
 if(WIN32)
-  target_compile_options(onnx_test_data_proto PRIVATE "/wd4125" "/wd4456" "/wd4100" "/wd4267")
+  target_compile_options(onnx_test_data_proto PRIVATE "/wd4125" "/wd4456" "/wd4100" "/wd4267" "/wd6011" "/wd6387" "/wd28182")
 else()
   if(HAS_UNUSED_PARAMETER)
     target_compile_options(onnx_test_data_proto PRIVATE "-Wno-unused-parameter")
@@ -588,6 +591,8 @@ if(onnxruntime_BUILD_BENCHMARKS)
   if(WIN32)
     target_compile_options(onnxruntime_benchmark PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler /wd4141>"
                       "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/wd4141>")
+    target_compile_options(onnxruntime_benchmark PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:--compiler-options /utf-8>"
+            "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/utf-8>")
   endif()
   target_link_libraries(onnxruntime_benchmark PRIVATE onnx_test_runner_common benchmark ${onnx_test_libs})
   add_dependencies(onnxruntime_benchmark ${onnxruntime_EXTERNAL_DEPENDENCIES})
@@ -751,7 +756,7 @@ if(UNIX)
   if (APPLE)
     set(ONNXRUNTIME_CUSTOM_OP_LIB_LINK_FLAG "-Xlinker -dead_strip")
   else()
-    set(ONNXRUNTIME_CUSTOM_OP_LIB_LINK_FLAG "-Xlinker --no-undefined -Xlinker --gc-sections")
+    set(ONNXRUNTIME_CUSTOM_OP_LIB_LINK_FLAG "-Xlinker --version-script=${REPO_ROOT}/onnxruntime/test/testdata/custom_op_library/custom_op_library.lds -Xlinker --no-undefined -Xlinker --gc-sections -z noexecstack")
   endif()
 else()
   set(ONNXRUNTIME_CUSTOM_OP_LIB_LINK_FLAG "-DEF:${REPO_ROOT}/onnxruntime/test/testdata/custom_op_library/custom_op_library.def")
+7 −0		.gitignore
+1 −4		src/Featurizers/Base/NormalizeFeaturizer.h
+4 −10		src/Featurizers/Components/UnitTests/VectorNormsEstimator_UnitTest.cpp
+1 −18		src/Featurizers/Components/VectorNormsEstimator.h
+67 −26		src/Featurizers/ForecastingPivotFeaturizer.h
+5 −2		src/Featurizers/TruncatedSVDFeaturizer.h
+47 −26		src/Featurizers/UnitTests/ForecastingPivotFeaturizer_UnitTests.cpp
+1 −1		src/Featurizers/UnitTests/TruncatedSVDFeaturizer_UnitTests.cpp
+6 −6		src/SharedLibrary/GeneratedCode/SharedLibrary_Common.h
+1,221 −0		src/SharedLibrary/GeneratedCode/SharedLibrary_ForecastingPivotFeaturizer.cpp
+65 −0		src/SharedLibrary/GeneratedCode/SharedLibrary_ForecastingPivotFeaturizer.h
+10 −10		src/SharedLibrary/GeneratedCode/SharedLibrary_L1NormalizeFeaturizer.cpp
+10 −10		src/SharedLibrary/GeneratedCode/SharedLibrary_L2NormalizeFeaturizer.cpp
+10 −10		src/SharedLibrary/GeneratedCode/SharedLibrary_MaxNormalizeFeaturizer.cpp
+22 −8		src/SharedLibrary/GeneratedCode/SharedLibrary_PCAFeaturizer.cpp
+2 −2		src/SharedLibrary/GeneratedCode/SharedLibrary_PCAFeaturizer.h
+22 −8		src/SharedLibrary/GeneratedCode/SharedLibrary_TruncatedSVDFeaturizer.cpp
+2 −2		src/SharedLibrary/GeneratedCode/SharedLibrary_TruncatedSVDFeaturizer.h
+1 −0		src/SharedLibrary/IntegrationTests/CMakeLists.txt
+12 −12		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_AnalyticalRollingWindowFeaturizer.h
+288 −288		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_BackwardFillImputerFeaturizer.h
+37 −37		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_CatImputerFeaturizer.h
+10 −10		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_CountVectorizerFeaturizer.h
+5 −5		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_DateTimeFeaturizer.h
+439 −0		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_ForecastingPivotFeaturizer.h
+37 −37		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_ForwardFillImputerFeaturizer.h
+37 −37		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_FromStringFeaturizer.h
+60 −60		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_HashOneHotVectorizerFeaturizer.h
+36 −36		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_ImputationMarkerFeaturizer.h
+120 −120		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_L1NormalizeFeaturizer.h
+120 −120		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_L2NormalizeFeaturizer.h
+36 −36		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_LabelEncoderFeaturizer.h
+115 −115		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_LagLeadOperatorFeaturizer.h
+30 −30		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MaxAbsScalerFeaturizer.h
+120 −120		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MaxNormalizeFeaturizer.h
+30 −30		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MeanImputerFeaturizer.h
+37 −37		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MedianImputerFeaturizer.h
+37 −37		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MinMaxImputerFeaturizer.h
+30 −30		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MinMaxScalerFeaturizer.h
+36 −36		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_MissingDummiesFeaturizer.h
+37 −37		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_ModeImputerFeaturizer.h
+36 −36		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_NumericalizeFeaturizer.h
+60 −60		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_OneHotEncoderFeaturizer.h
+12 −12		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_PCAFeaturizer.h
+30 −30		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_RobustScalerFeaturizer.h
+3 −3		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_ShortGrainDropperFeaturizer.h
+12 −12		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_SimpleRollingWindowFeaturizer.h
+30 −30		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_StandardScaleWrapperFeaturizer.h
+48 −48		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_StringFeaturizer.h
+10 −10		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_TfidfVectorizerFeaturizer.h
+12 −12		src/SharedLibrary/IntegrationTests/GeneratedCode/SharedLibraryTests_TruncatedSVDFeaturizer.h
+77 −0		src/SharedLibrary/IntegrationTests/SharedLibrary_ForecastingPivot_IntegrationTest.cpp
+2 −0		src/SharedLibrary/cmake/Featurizers.cmake
+56 −17		src/Tools/CodeGenerator/Featurizers.yaml
+6 −6		src/Tools/CodeGenerator/Plugins/SharedLibraryPlugin.py
+12 −5		src/Tools/CodeGenerator/Plugins/SharedLibraryPluginImpl/MatrixTypeInfo.py
+24 −10		src/Tools/CodeGenerator/Plugins/SharedLibraryPluginImpl/VectorTypeInfo.py
+4 −1		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPlugin.py
+8 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/DatetimeTypeInfo.py
+32 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/MatrixTypeInfo.py
+15 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/ScalarTypeInfos.py
+8 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/SingleValueSparseVectorTypeInfo.py
+8 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/SparseVectorTypeInfo.py
+8 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/StringTypeInfo.py
+11 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/StructTypeInfos.py
+8 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/TupleTypeInfo.py
+17 −2		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/TypeInfo.py
+8 −0		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/UniqueIdTypeInfo.py
+21 −17		src/Tools/CodeGenerator/Plugins/SharedLibraryTestsPluginImpl/VectorTypeInfo.py
+55 −6		src/Traits.h
+24 −0		src/UnitTests/Traits_UnitTest.cpp