stash

snnn · snnn · commit 4b639c88360f · 2025-09-19T11:24:08.000-07:00
diff --git a/c_cxx/CMakeLists.txt b/c_cxx/CMakeLists.txt
@@ -19,7 +19,7 @@ option(LIBPNG_ROOTDIR "libpng root dir")
 option(ONNXRUNTIME_ROOTDIR "onnxruntime root dir")
 include(FetchContent)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if(NOT ONNXRUNTIME_ROOTDIR)
   if(WIN32)
@@ -41,14 +41,14 @@ link_directories("${ONNXRUNTIME_ROOTDIR}/lib")
 
 if(WIN32)
   add_library(wil INTERFACE)
-
+  set(WIL_BUILD_PACKAGING OFF CACHE BOOL "" FORCE)
+  set(WIL_BUILD_TESTS OFF CACHE BOOL "" FORCE)
   FetchContent_Declare(
       microsoft_wil
-      URL https://github.com/microsoft/wil/archive/refs/tags/v1.0.220914.1.zip
+      URL https://github.com/microsoft/wil/archive/refs/tags/v1.0.250325.1.zip
     )
-  FetchContent_Populate(microsoft_wil)
-  target_include_directories(wil INTERFACE ${microsoft_wil_SOURCE_DIR}/include)
-  set(WIL_LIB wil)
+  FetchContent_MakeAvailable(microsoft_wil)
+  set(WIL_LIB "WIL::WIL")
 endif()
 
 # On Linux the samples use libjpeg and libpng for decoding images.
@@ -97,4 +97,4 @@ add_subdirectory(squeezenet)
 if(WIN32 OR PNG_FOUND)
   add_subdirectory(fns_candy_style_transfer)
 endif()
-add_subdirectory(model-explorer)
+add_subdirectory(model-explorer)
diff --git a/c_cxx/README.md b/c_cxx/README.md
@@ -21,7 +21,7 @@ Note: These build instructions are for the Windows examples only.
 
 ## Prerequisites
 1. Visual Studio 2019 or 2022
-2. cmake(version >=3.13)
+2. cmake(version >=4.0)
 3. (optional) [libpng 1.6](https://libpng.sourceforge.io/)
 
 ## Install ONNX Runtime
diff --git a/c_cxx/imagenet/controller.cc b/c_cxx/imagenet/controller.cc
@@ -5,7 +5,9 @@
 
 Controller::Controller() : cleanup_group_(CreateThreadpoolCleanupGroup()), event_(CreateOnnxRuntimeEvent()) {
   InitializeThreadpoolEnvironment(&env_);
+  #pragma warning(disable : 6387)  // The doc didn't say if the default pool could be used as callback pool or not
   SetThreadpoolCallbackPool(&env_, nullptr);
+  #pragma warning(default : 6387)
   SetThreadpoolCallbackCleanupGroup(&env_, cleanup_group_, nullptr);
 }
 
@@ -37,7 +39,7 @@ void Controller::SetFailBit(_Inout_opt_ ONNXRUNTIME_CALLBACK_INSTANCE pci, _In_
   }
 }
 
-bool Controller::SetEof(ONNXRUNTIME_CALLBACK_INSTANCE pci) {
+bool Controller::SetEof(_Inout_opt_ ONNXRUNTIME_CALLBACK_INSTANCE pci) {
   std::lock_guard<std::mutex> g(m_);
   if (state_ == State::RUNNING) {
     state_ = State::SHUTDOWN;
diff --git a/c_cxx/imagenet/image_loader_wic.cc b/c_cxx/imagenet/image_loader_wic.cc
@@ -8,6 +8,37 @@
 #include <sstream>
 
 #include "image_loader.h"
+#include "string_utils.h"
+#include "assert.h"
+
+std::string ToMBString(std::wstring_view s) {
+  if (s.size() >= static_cast<size_t>(std::numeric_limits<int>::max())) throw std::runtime_error("length overflow");
+
+  const int src_len = static_cast<int>(s.size() + 1);
+  const int len = WideCharToMultiByte(CP_ACP, 0, s.data(), src_len, nullptr, 0, nullptr, nullptr);
+  assert(len > 0);
+  std::string ret(static_cast<size_t>(len) - 1, '\0');
+#pragma warning(disable : 4189)
+  const int r = WideCharToMultiByte(CP_ACP, 0, s.data(), src_len, (char*)ret.data(), len, nullptr, nullptr);
+  assert(len == r);
+#pragma warning(default : 4189)
+  return ret;
+}
+
+std::string ToUTF8String(std::wstring_view s) {
+  if (s.size() >= static_cast<size_t>(std::numeric_limits<int>::max())) throw std::runtime_error("length overflow");
+
+  const int src_len = static_cast<int>(s.size() + 1);
+  const int len = WideCharToMultiByte(CP_UTF8, 0, s.data(), src_len, nullptr, 0, nullptr, nullptr);
+  assert(len > 0);
+  std::string ret(static_cast<size_t>(len) - 1, '\0');
+#pragma warning(disable : 4189)
+  const int r = WideCharToMultiByte(CP_UTF8, 0, s.data(), src_len, (char*)ret.data(), len, nullptr, nullptr);
+  assert(len == r);
+#pragma warning(default : 4189)
+  return ret;
+}
+
 
 bool CreateImageLoader(void** out) {
   IWICImagingFactory* piFactory;
@@ -84,24 +115,24 @@ OrtStatus* LoadImageFromFileAndCrop(void* loader, const ORTCHAR_T* filename, dou
     rect.Width = bbox_w_size;
 
     ATLENSURE_SUCCEEDED(ppIFormatConverter->CopyPixels(&rect, stride, static_cast<UINT>(data.size()), data.data()));
-    float* float_file_data = new float[data.size()];
+    std::unique_ptr<float[]> float_file_data(new float[data.size()]);    
     size_t len = data.size();
     for (size_t i = 0; i != len; ++i) {
-      float_file_data[i] = static_cast<float>(data[i]) / 255;
+      float_file_data.get()[i] = static_cast<float>(data[i]) / 255;
     }
 
-    *out = float_file_data;
+    *out = float_file_data.release();
     *out_width = bbox_w_size;
     *out_height = bbox_h_size;
     return nullptr;
   } catch (const std::exception& ex) {
-    std::ostringstream oss;
+    std::basic_ostringstream<ORTCHAR_T> oss;
     oss << "Load " << filename << " failed:" << ex.what();
-    return Ort::GetApi().CreateStatus(ORT_FAIL, oss.str().c_str());
+    return Ort::GetApi().CreateStatus(ORT_FAIL, ToUTF8String(oss.str()).c_str());
   } catch (const CAtlException& ex) {
-    std::ostringstream oss;
+    std::basic_ostringstream<ORTCHAR_T> oss;
     oss << "Load " << filename << " failed:";
     PrintErrorDescription(ex.m_hr, oss);
-    return Ort::GetApi().CreateStatus(ORT_FAIL, oss.str().c_str());
+    return Ort::GetApi().CreateStatus(ORT_FAIL, ToUTF8String(oss.str()).c_str());
   }
 }
diff --git a/c_cxx/imagenet/local_filesystem_win.cc b/c_cxx/imagenet/local_filesystem_win.cc
@@ -4,8 +4,7 @@
 #include "local_filesystem.h"
 #include <assert.h>
 #include <mutex>
-
-static std::mutex m;
+#include "string_utils.h"
 
 void ReadFileAsString(const ORTCHAR_T* fname, void*& p, size_t& len) {
   if (!fname) {
@@ -15,17 +14,17 @@ void ReadFileAsString(const ORTCHAR_T* fname, void*& p, size_t& len) {
   HANDLE hFile = CreateFileW(fname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
   if (hFile == INVALID_HANDLE_VALUE) {
     int err = GetLastError();
-    std::ostringstream oss;
+    std::basic_ostringstream<ORTCHAR_T> oss;
     oss << "open file " << fname << " fail, errcode =" << err;
-    throw std::runtime_error(oss.str().c_str());
+    throw std::runtime_error(ToMBString(oss.str()));
   }
   std::unique_ptr<void, decltype(&CloseHandle)> handler_holder(hFile, CloseHandle);
   LARGE_INTEGER filesize;
   if (!GetFileSizeEx(hFile, &filesize)) {
     int err = GetLastError();
-    std::ostringstream oss;
+    std::basic_ostringstream<ORTCHAR_T> oss;
     oss << "GetFileSizeEx file " << fname << " fail, errcode =" << err;
-    throw std::runtime_error(oss.str().c_str());
+    throw std::runtime_error(ToMBString(oss.str()));
   }
   if (static_cast<ULONGLONG>(filesize.QuadPart) > std::numeric_limits<size_t>::max()) {
     throw std::runtime_error("ReadFileAsString: File is too large");
@@ -53,16 +52,16 @@ void ReadFileAsString(const ORTCHAR_T* fname, void*& p, size_t& len) {
       int err = GetLastError();
       p = nullptr;
       len = 0;
-      std::ostringstream oss;
+      std::basic_ostringstream<ORTCHAR_T> oss;
       oss << "ReadFile " << fname << " fail, errcode =" << err;
-      throw std::runtime_error(oss.str().c_str());
+      throw std::runtime_error(ToMBString(oss.str()));
     }
     if (bytes_read != bytes_to_read) {
       p = nullptr;
       len = 0;
-      std::ostringstream oss;
+      std::basic_ostringstream<ORTCHAR_T> oss;
       oss << "ReadFile " << fname << " fail: unexpected end";
-      throw std::runtime_error(oss.str().c_str());
+      throw std::runtime_error(ToMBString(oss.str()));
     }
   }
   p = buffer.release();
diff --git a/c_cxx/imagenet/main.cc b/c_cxx/imagenet/main.cc
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#include <chrono>
 #include <string>
 #include <string.h>
 #include <sstream>
@@ -27,7 +28,7 @@
 #ifdef _WIN32
 #include <atlbase.h>
 #endif
-
+#include "string_utils.h"
 using namespace std::chrono;
 
 
@@ -44,10 +45,10 @@ class Validator : public OutputCollector<TCharString> {
       if (!line.empty()) labels.push_back(line);
     }
     if (labels.size() != expected_line_count) {
-      std::ostringstream oss;
+      std::basic_ostringstream<ORTCHAR_T> oss;
       oss << "line count mismatch, expect " << expected_line_count << " from " << file_path.c_str() << ", got "
           << labels.size();
-      throw std::runtime_error(oss.str());
+      throw std::runtime_error(ToMBString(oss.str()));
     }
     return labels;
   }
diff --git a/c_cxx/model-explorer/model-explorer.cpp b/c_cxx/model-explorer/model-explorer.cpp
@@ -39,9 +39,10 @@ std::string print_shape(const std::vector<std::int64_t>& v) {
   return ss.str();
 }
 
+// XXX: this function does not handle integer overflow
 int calculate_product(const std::vector<std::int64_t>& v) {
   int total = 1;
-  for (auto& i : v) total *= i;
+  for (auto& i : v) total *= static_cast<int>(i);
   return total;
 }
 
@@ -105,7 +106,7 @@ int main(int argc, ORTCHAR_T* argv[]) {
 
   // generate random numbers in the range [0, 255]
   std::vector<float> input_tensor_values(total_number_elements);
-  std::generate(input_tensor_values.begin(), input_tensor_values.end(), [&] { return rand() % 255; });
+  std::generate(input_tensor_values.begin(), input_tensor_values.end(), [&] { return static_cast<float>(rand() % 255); });
   std::vector<Ort::Value> input_tensors;
   input_tensors.emplace_back(vec_to_tensor<float>(input_tensor_values, input_shape));
 
diff --git a/c_cxx/squeezenet/CMakeLists.txt b/c_cxx/squeezenet/CMakeLists.txt
@@ -10,7 +10,7 @@ option(ONNXRUNTIME_ROOTDIR "onnxruntime root dir")
 include(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(tensorrt_provider_factory.h HAVE_TENSORRT_PROVIDER_FACTORY_H)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include_directories( 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`
`6`	`6`	`Controller::Controller() : cleanup_group_(CreateThreadpoolCleanupGroup()), event_(CreateOnnxRuntimeEvent()) {`
`7`	`7`	`InitializeThreadpoolEnvironment(&env_);`
	`8`	`+ #pragma warning(disable : 6387) // The doc didn't say if the default pool could be used as callback pool or not`
`8`	`9`	`SetThreadpoolCallbackPool(&env_, nullptr);`
	`10`	`+ #pragma warning(default : 6387)`
`9`	`11`	`SetThreadpoolCallbackCleanupGroup(&env_, cleanup_group_, nullptr);`
`10`	`12`	`}`
`11`	`13`
`@@ -37,7 +39,7 @@ void Controller::SetFailBit(_Inout_opt_ ONNXRUNTIME_CALLBACK_INSTANCE pci, _In_`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`
`40`		`-bool Controller::SetEof(ONNXRUNTIME_CALLBACK_INSTANCE pci) {`
	`42`	`+bool Controller::SetEof(_Inout_opt_ ONNXRUNTIME_CALLBACK_INSTANCE pci) {`
`41`	`43`	`std::lock_guard<std::mutex> g(m_);`
`42`	`44`	`if (state_ == State::RUNNING) {`
`43`	`45`	`state_ = State::SHUTDOWN;`