Windowsai without fi

.gitignore

@@ -39,8 +39,6 @@ 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
-

cgmanifest.json

@@ -447,15 +447,6 @@
             "type": "git"
          }
       }
-      {
-         "component": {
-            "git": {
-               "commitHash": "006df6bff45dac59d378609fe85f6736a901ee93",
-               "repositoryUrl": "https://github.com/microsoft/FeaturizersLibrary.git"
-            },
-            "type": "git"
-         }
-      }
    ],
    "Version": 1
 }

cmake/CMakeLists.txt

@@ -84,6 +84,7 @@ 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)
 
@@ -716,8 +717,8 @@ include(onnxruntime_mlas.cmake)
 
 if(onnxruntime_USE_AUTOML)
   add_definitions(-DMICROSOFT_AUTOML)
-  # Fetch and build featurizers
-  include(external/featurizers.cmake)
+  # Build shared featurizer library
+  include(onnxruntime_automl_featurizers.cmake)
 endif()
 
 if(WIN32)

cmake/onnxruntime_automl_featurizers.cmake

@@ -0,0 +1,46 @@
+# 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
+
+file(GLOB automl_featurizers_srcs CONFIGURE_DEPENDS
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/*.h"
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/Featurizers/*.h"
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/Featurizers/*.cpp"
+)
+
+source_group(TREE ${ONNXRUNTIME_ROOT}/core/automl/ FILES ${onnxruntime_automl_featurizers_srcs})
+
+add_library(automl_featurizers ${automl_featurizers_srcs})
+
+target_include_directories(automl_featurizers PRIVATE ${ONNXRUNTIME_ROOT} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(automl_featurizers PROPERTIES FOLDER "AutoMLFeaturizers")
+
+# Individual featurizers unit tests added at bulk
+file(GLOB automl_featurizers_tests_srcs
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/*.cpp"
+)
+
+list(APPEND automl_featurizers_tests_srcs
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/UnitTests/Traits_UnitTests.cpp"
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/UnitTests/Featurizer_UnitTest.cpp"
+    "${ONNXRUNTIME_ROOT}/core/automl/featurizers/src/FeaturizerPrep/UnitTests/test_main.cpp"
+)
+
+add_executable(automl_featurizers_unittests ${automl_featurizers_tests_srcs})
+add_dependencies(automl_featurizers_unittests automl_featurizers)
+target_link_libraries(automl_featurizers_unittests PRIVATE gtest automl_featurizers)
+# Need make_unique
+target_include_directories(automl_featurizers_unittests PRIVATE ${ONNXRUNTIME_ROOT})
+source_group(TREE ${ONNXRUNTIME_ROOT}/core/automl/ FILES ${automl_featurizers_tests_srcs})
+set_target_properties(automl_featurizers_unittests PROPERTIES FOLDER "AutoMLFeaturizers")
+add_test(NAME automl_featurizers_unittests
+    COMMAND automl_featurizers_unittests
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:automl_featurizers_unittests>
+)
+
+
+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()

cmake/onnxruntime_graph.cmake

@@ -15,13 +15,10 @@ if (onnxruntime_DISABLE_CONTRIB_OPS)
 endif()
 
 if(NOT onnxruntime_USE_AUTOML)
-  file(GLOB_RECURSE automl_to_remove_graph_src
+  list(REMOVE_ITEM onnxruntime_graph_src
     "${ONNXRUNTIME_ROOT}/core/graph/automl_ops/*.h"
     "${ONNXRUNTIME_ROOT}/core/graph/automl_ops/*.cc"
     )
-  foreach(I in ${automl_to_remove_graph_src})
-    list(REMOVE_ITEM onnxruntime_graph_src ${I})
-  endforeach()
 endif()
 
 if(NOT onnxruntime_USE_DML)

cmake/onnxruntime_mlas.cmake

@@ -15,7 +15,6 @@ set(mlas_common_srcs
   ${ONNXRUNTIME_ROOT}/core/mlas/lib/logistic.cpp
   ${ONNXRUNTIME_ROOT}/core/mlas/lib/tanh.cpp
   ${ONNXRUNTIME_ROOT}/core/mlas/lib/erf.cpp
-  ${ONNXRUNTIME_ROOT}/core/mlas/lib/quantize.cpp
 )
 
 if(MSVC)
@@ -213,7 +212,7 @@ else()
       if(HAS_AVX512F)
         set_source_files_properties(${mlas_platform_srcs_avx512f} PROPERTIES COMPILE_FLAGS "-mavx512f")
       endif()
-
+      
       # AVX512BW support is only available if AVX512F support is present.
       check_cxx_compiler_flag("-mavx512bw" HAS_AVX512BW)
       if(HAS_AVX512BW)
@@ -226,7 +225,7 @@ else()
         }"
         AVX512BW_COMPILES
       )
-
+      
       if(AVX512BW_COMPILES)
         set(mlas_platform_srcs_avx512bw
           ${ONNXRUNTIME_ROOT}/core/mlas/lib/x86_64/QgemmU8S8KernelAvx512BW.S
@@ -236,12 +235,12 @@ else()
           ${ONNXRUNTIME_ROOT}/core/mlas/lib/x86_64/QgemmU8U8KernelAvx512BW.S
           ${ONNXRUNTIME_ROOT}/core/mlas/lib/x86_64/QgemmU8U8KernelAvx512Vnni.S
         )
-
+        
         if(HAS_AVX512BW)
           set_source_files_properties(${mlas_platform_srcs_avx512bw} PROPERTIES COMPILE_FLAGS "-mavx512bw")
         endif()
       else() # AVX512BW_COMPILES
-        #
+        # 
         set_source_files_properties(${mlas_common_srcs} PROPERTIES COMPILE_FLAGS "-DMLAS_AVX512BW_UNSUPPORTED")
       endif() # AVX512BW_COMPILES
     else() # AVX512F_COMPILES

cmake/onnxruntime_python.cmake

@@ -251,7 +251,7 @@ endif()
 
 if (onnxruntime_USE_NUPHAR)
   file(GLOB onnxruntime_python_nuphar_python_srcs CONFIGURE_DEPENDS
-    "${ONNXRUNTIME_ROOT}/core/providers/nuphar/scripts/*"
+    "${ONNXRUNTIME_ROOT}/core/providers/nuphar/scripts/*.*"
   )
   add_custom_command(
     TARGET onnxruntime_pybind11_state POST_BUILD

docs/Privacy.md

@@ -14,5 +14,5 @@ Currently telemetry is only implemented for Windows builds, but may be expanded
 #### Technical Details
 The Windows provider uses the [TraceLogging](https://docs.microsoft.com/en-us/windows/win32/tracelogging/trace-logging-about) API for its implementation.
 
-Windows ML and onnxruntime C APIs allow telemetry collection to be turned on/off (see API pages for details). It is turned off by default in all official builds.
+Windows ML and onnxruntime C APIs allow telemetry collection to be turned on/off (see API pages for details). In all Official builds, the Windows ML API enables telemetry collection. 
 * [C API](./C_API.md#telemetry)

onnxruntime/automl_ops/automl_featurizers.h

@@ -0,0 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// Cumulative header with automl featurizers includes exposed to
+// ORT
+#pragma once
+
+#include "core/automl/featurizers/src/FeaturizerPrep/Featurizers/DateTimeFeaturizer.h"

onnxruntime/automl_ops/automl_types.cc

@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "core/common/common.h"
+#include "core/framework/data_types.h"
+#include "core/framework/op_kernel.h"
+#include "core/session/automl_data_containers.h"
+
+#include "automl_ops/automl_types.h"
+#include "automl_ops/automl_featurizers.h"
+
+namespace dtf = Microsoft::Featurizer::DateTimeFeaturizer;
+
+namespace onnxruntime {
+
+// This temporary to register custom types so ORT is aware of it
+// although it still can not serialize such a type.
+// These character arrays must be extern so the resulting instantiated template
+// is globally unique
+
+extern const char kMsAutoMLDomain[] = "com.microsoft.automl";
+extern const char kTimepointName[] = "DateTimeFeaturizer_TimePoint";
+
+// Specialize for our type so we can convert to external struct
+// 
+template <>
+struct NonTensorTypeConverter<dtf::TimePoint> {
+  static void FromContainer(MLDataType dtype, const void* data, size_t data_size, OrtValue& output) {
+    ORT_ENFORCE(sizeof(DateTimeFeaturizerTimePointData) == data_size, "Expecting an instance of ExternalTimePoint");
+    const DateTimeFeaturizerTimePointData* dc = reinterpret_cast<const DateTimeFeaturizerTimePointData*>(data);
+    std::unique_ptr<dtf::TimePoint> tp(new dtf::TimePoint);
+    tp->year = dc->year;
+    tp->month = dc->month;
+    tp->day = dc->day;
+    tp->hour = dc->hour;
+    tp->minute = dc->minute;
+    tp->second = dc->second;
+    tp->dayOfWeek = dc->dayOfWeek;
+    tp->dayOfYear = dc->dayOfYear;
+    tp->quarterOfYear = dc->quarterOfYear;
+    tp->weekOfMonth = dc->weekOfMonth;
+    output.Init(tp.get(),
+                dtype,
+                dtype->GetDeleteFunc());
+    tp.release();
+  }
+  static void ToContainer(const OrtValue& input, size_t data_size, void* data) {
+    ORT_ENFORCE(sizeof(DateTimeFeaturizerTimePointData) == data_size, "Expecting an instance of ExternalTimePoint");
+    DateTimeFeaturizerTimePointData* dc = reinterpret_cast<DateTimeFeaturizerTimePointData*>(data);
+    const dtf::TimePoint& tp = input.Get<dtf::TimePoint>();
+    dc->year = tp.year;
+    dc->month = tp.month;
+    dc->day = tp.day;
+    dc->hour = tp.hour;
+    dc->minute = tp.minute;
+    dc->second = tp.second;
+    dc->dayOfWeek = tp.dayOfWeek;
+    dc->dayOfYear = tp.dayOfYear;
+    dc->quarterOfYear = tp.quarterOfYear;
+    dc->weekOfMonth = tp.weekOfMonth;
+  }
+};
+
+
+// This has to be under onnxruntime to properly specialize a function template
+ORT_REGISTER_OPAQUE_TYPE(dtf::TimePoint, kMsAutoMLDomain, kTimepointName);
+
+namespace automl {
+
+#define REGISTER_CUSTOM_PROTO(TYPE, reg_fn)            \
+  {                                                    \
+    MLDataType mltype = DataTypeImpl::GetType<TYPE>(); \
+    reg_fn(mltype);                                    \
+  }
+
+void RegisterAutoMLTypes(const std::function<void(MLDataType)>& reg_fn) {
+  REGISTER_CUSTOM_PROTO(dtf::TimePoint, reg_fn);
+}
+#undef REGISTER_CUSTOM_PROTO
+} // namespace automl
+} // namespace onnxruntime

onnxruntime/automl_ops/automl_types.h

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "core/framework/data_types.h"
+#include <functional>
+
+namespace onnxruntime {
+namespace automl {
+void RegisterAutoMLTypes(const std::function<void(MLDataType)>& reg_fn);
+} // namespace automl
+} // namespace onnxruntime