microsoft · jchen351 · Sep 26, 2023 · Oct 3, 2023 · Oct 4, 2023 · Oct 4, 2023
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -42,7 +42,7 @@ include(CheckFunctionExists)
 include(GNUInstallDirs) # onnxruntime_providers_* require CMAKE_INSTALL_* variables
 
 # TODO: update this once all system adapt c++20
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT onnxruntime_USE_QNN))
 set(CMAKE_CXX_STANDARD 20)
 else()
 set(CMAKE_CXX_STANDARD 17)

diff --git a/include/onnxruntime/core/common/gpu_profiler_common.h b/include/onnxruntime/core/common/gpu_profiler_common.h
@@ -325,8 +325,8 @@ class GPUTracerManager {
     auto p_event_list = GetEventListForUniqueCorrelationId(unique_correlation_id);
     if (p_event_list != nullptr) {
       p_event_list->insert(p_event_list->end(),
-                           std::make_move_iterator(events.begin()),
-                           std::make_move_iterator(events.end()));
+                           std::make_move_iterator(events.begin()).base(),
+                           std::make_move_iterator(events.end()).base());
     }
   }
 
@@ -379,8 +379,8 @@ class GPUProfilerBase : public EpProfiler {
   void MergeEvents(std::map<uint64_t, Events>& events_to_merge, Events& events) {
     Events merged_events;
 
-    auto event_iter = std::make_move_iterator(events.begin());
-    auto event_end = std::make_move_iterator(events.end());
+    auto event_iter = std::make_move_iterator(events.begin()).base();
+    auto event_end = std::make_move_iterator(events.end()).base();
     for (auto& map_iter : events_to_merge) {
       if (map_iter.second.empty()) {
         continue;
@@ -423,8 +423,8 @@ class GPUProfilerBase : public EpProfiler {
       }
 
       merged_events.insert(merged_events.end(),
-                           std::make_move_iterator(map_iter.second.begin()),
-                           std::make_move_iterator(map_iter.second.end()));
+                           std::make_move_iterator(map_iter.second.begin()).base(),
+                           std::make_move_iterator(map_iter.second.end()).base());
     }
 
     // move any remaining events

diff --git a/include/onnxruntime/core/common/logging/logging.h b/include/onnxruntime/core/common/logging/logging.h
@@ -18,8 +18,11 @@
 #include "core/common/logging/severity.h"
 #include "core/common/logging/sink_types.h"
 #include "core/platform/ort_mutex.h"
-#include "date/date.h"
 
+// date.h is from https://github.com/HowardHinnant/date, which is no longer supporing C++20. So we need replace it with std::chrono::operator<<
+#if !(__cplusplus >= 202002L && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 140400L || _WIN32))
+#include "date/date.h"
+#endif
 /*
 
   Logging overview and expected usage:
@@ -61,7 +64,7 @@
 // TODO: When other compilers support std::chrono::operator<<, update this.
 // TODO: Check support for other compilers' version before enable C++20 for other compilers.
 // Xcode added support for C++20's std::chrono::operator<< in SDK version 14.4.
-#if __cplusplus >= 202002L && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140400L
+#if __cplusplus >= 202002L && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 140400L || _WIN32)
 namespace timestamp_ns = std::chrono;
 #else
 namespace timestamp_ns = ::date;

diff --git a/onnxruntime/core/common/logging/sinks/ostream_sink.cc b/onnxruntime/core/common/logging/sinks/ostream_sink.cc
@@ -66,16 +66,18 @@ void OStreamSink::SendImpl(const Timestamp& timestamp, const std::string& logger
 #else
 void WOStreamSink::SendImpl(const Timestamp& timestamp, const std::string& logger_id, const Capture& message) {
   // operator for formatting of timestamp in ISO8601 format including microseconds
-  using date::operator<<;
-
+  using timestamp_ns::operator<<;
   // Two options as there may be multiple calls attempting to write to the same sink at once:
   // 1) Use mutex to synchronize access to the stream.
   // 2) Create the message in an ostringstream and output in one call.
   //
   // Going with #2 as it should scale better at the cost of creating the message in memory first
   // before sending to the stream.
-
+#ifdef _WIN32
   std::wostringstream msg;
+#else
+  std::ostringstream msg;
+#endif
 
 #ifndef ORT_MINIMAL_BUILD
   if (message.Severity() == Severity::kWARNING) {

diff --git a/onnxruntime/core/framework/bfc_arena.cc b/onnxruntime/core/framework/bfc_arena.cc
@@ -108,7 +108,7 @@ Status BFCArena::Extend(size_t rounded_bytes) {
                            " is smaller than requested bytes of ", rounded_bytes);
   }
 
-  auto safe_alloc = [this](size_t alloc_bytes) {
+  auto safe_alloc = [this](size_t alloc_bytes) -> void* {
     void* new_mem = nullptr;
     ORT_TRY {
       new_mem = device_allocator_->Alloc(alloc_bytes);

diff --git a/onnxruntime/core/platform/apple/logging/apple_log_sink.mm b/onnxruntime/core/platform/apple/logging/apple_log_sink.mm
@@ -7,8 +7,6 @@
 
 #include <sstream>
 
-#include "date/date.h"
-
 namespace onnxruntime {
 namespace logging {
 

diff --git a/onnxruntime/core/platform/posix/logging/syslog_sink.cc b/onnxruntime/core/platform/posix/logging/syslog_sink.cc
@@ -4,15 +4,14 @@
 #include "core/common/logging/logging.h"
 #include "core/common/logging/capture.h"
 #include "syslog_sink.h"
-#include "date/date.h"
 
 namespace onnxruntime {
 namespace logging {
 
 constexpr const char* SYSLOG_LEVEL = "76432";
 
 void SysLogSink::SendImpl(const Timestamp& timestamp, const std::string& logger_id, const Capture& message) {
-  using date::operator<<;
+  using timestamp_ns::operator<<;
   std::stringstream msg;
 
   // syslog has it own timestamp but not as accurate as our timestamp. So we are going to keep both,

diff --git a/onnxruntime/core/platform/windows/logging/etw_sink.cc b/onnxruntime/core/platform/windows/logging/etw_sink.cc
@@ -3,6 +3,7 @@
 
 // EtwSink.h must come before the windows includes
 #include "core/platform/windows/logging/etw_sink.h"
+#include <assert.h>
 
 #ifdef ETW_TRACE_LOGGING_SUPPORTED
 

diff --git a/onnxruntime/core/platform/windows/logging/etw_sink.h b/onnxruntime/core/platform/windows/logging/etw_sink.h
@@ -16,7 +16,6 @@
 
 #ifdef ETW_TRACE_LOGGING_SUPPORTED
 
-#include <date/date.h>
 #include <atomic>
 #include <iostream>
 #include <string>

diff --git a/onnxruntime/core/providers/cpu/tensor/upsample_antialias.h b/onnxruntime/core/providers/cpu/tensor/upsample_antialias.h
@@ -193,13 +193,13 @@ void SetupUpsampleFilterAntiAlias(FilterParamsAntiAlias<T>& p,
       }
 
       float total_weight_inv = total_weight == 0.0f ? 1.f : 1.0f / total_weight;
-      auto* scale_buffer_int = reinterpret_cast<int32_t*>(scale_buffer);
       for (x = 0; x < xmax_cut - xmin_cut; x++) {
         scale_buffer[x] *= total_weight_inv;
 
         // normalize the scale to 1 << 22 for int8/uint8
         if constexpr (std::is_same<T, int32_t>::value) {
-          scale_buffer_int[x] = static_cast<int32_t>(std::round(scale_buffer[x] * ConstValue::mag_factor_x_2));
+          reinterpret_cast<int32_t*>(scale_buffer)[x] =
+              static_cast<int32_t>(std::round(scale_buffer[x] * ConstValue::mag_factor_x_2));
         }
       }
       /*for (; x < window_size; x++) {

diff --git a/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h b/onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h
@@ -55,7 +55,7 @@ class QnnBackendManager {
   ORT_DISALLOW_COPY_ASSIGNMENT_AND_MOVE(QnnBackendManager);
 
   ~QnnBackendManager();
-  char* DlError() {
+  const char* DlError() {
 #ifdef _WIN32
     return "";
 #else

diff --git a/onnxruntime/test/util/include/capturing_sink.h b/onnxruntime/test/util/include/capturing_sink.h
@@ -3,11 +3,8 @@
 
 #pragma once
 
-#include "core/common/logging/logging.h"
 #include "core/common/logging/isink.h"
 
-#include "date/date.h"
-
 namespace onnxruntime {
 namespace test {
 
@@ -17,7 +14,7 @@ class CapturingSink : public logging::ISink {
  public:
   void SendImpl(const Timestamp& timestamp, const std::string& logger_id, const Capture& message) override {
     // operator for formatting of timestamp in ISO8601 format including microseconds
-    using date::operator<<;
+    using timestamp_ns::operator<<;
     std::ostringstream msg;
 
     msg << timestamp << " [" << message.SeverityPrefix() << ":" << message.Category() << ":" << logger_id << ", "

diff --git a/winml/test/api/LearningModelBindingAPITest.cpp b/winml/test/api/LearningModelBindingAPITest.cpp
@@ -274,7 +274,7 @@ static void ZipMapString() {
     WINML_EXPECT_TRUE(iter2.HasCurrent());
     const auto& pair1 = iter1.Current();
     const auto& pair2 = iter2.Current();
-    WINML_LOG_COMMENT((std::ostringstream() << "key: " << pair1.Key().c_str() << ", value " << pair2.Value()).str());
+    WINML_LOG_COMMENT((std::wostringstream() << "key: " << pair1.Key().c_str() << ", value " << pair2.Value()).str());
     WINML_EXPECT_TRUE(std::wstring(pair1.Key().c_str()).compare(labels[i]) == 0);
     WINML_EXPECT_TRUE(std::wstring(pair2.Key().c_str()).compare(labels[i]) == 0);
     WINML_EXPECT_TRUE(pair1.Value() == inputs[i] && pair2.Value() == inputs[i]);

diff --git a/winml/test/image/imagetests.cpp b/winml/test/image/imagetests.cpp
@@ -47,7 +47,7 @@ class ImageTests : public ::testing::Test {
     WINML_EXPECT_NO_THROW(m_model = LearningModel::LoadFromFilePath(full_path));
   }
 
-  void ImageTests::PrepareModelSessionBinding(
+  void PrepareModelSessionBinding(
     const std::wstring& model_file_name,
     LearningModelDeviceKind device_kind,
     std::optional<uint32_t> optimized_batch_size
@@ -834,7 +834,7 @@ TEST_F(ImageTests, ImageBindingInputAndOutput_BindInputTensorAsInspectable) {
 }
 
 static void TestImageBindingStyleTransfer(
-  const wchar_t* model_file_name, const wchar_t* input_data_image_filename, wchar_t* output_data_image_filename
+  const wchar_t* model_file_name, const wchar_t* input_data_image_filename, const wchar_t* output_data_image_filename
 ) {
   GPUTEST;