update

Author: snnn

Release/README.md

@@ -0,0 +1 @@
+If you wonder why this folder exists, please see the discussions in https://github.com/pypa/cibuildwheel/issues/794

Release/pyproject.toml

@@ -194,7 +194,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "1f4c0311cda3403999b702c996898af5707973a9",
+          "commitHash": "d10b27fe37736d2944630ecd7557cefa95cf87c9",
           "repositoryUrl": "https://gitlab.com/libeigen/eigen.git"
         },
         "comments": "git submodule at cmake/external/eigen"
@@ -454,7 +454,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "eab844a87298d500f1924f8a7cadb4cbee426093",
+          "commitHash": "a1241a967ec7920310a696a6c22ae2426752e135",
           "repositoryUrl": "https://github.com/microsoft/onnxruntime-tvm.git"
         },
         "comments": "git submodule at cmake/external/tvm"

cgmanifests/submodules/cgmanifest.json

@@ -75,7 +75,6 @@ option(onnxruntime_USE_NUPHAR "Build with Nuphar" OFF)
 option(onnxruntime_USE_VITISAI "Build with Vitis-AI" OFF)
 option(onnxruntime_USE_TENSORRT "Build with TensorRT support" OFF)
 option(onnxruntime_ENABLE_LTO "Enable link time optimization" OFF)
-option(onnxruntime_CROSS_COMPILING "Cross compiling onnx runtime" OFF)
 option(onnxruntime_GCOV_COVERAGE "Compile with options necessary to run code coverage" OFF)
 
 #It's preferred to turn it OFF when onnxruntime is dynamically linked to PROTOBUF. But Tensort always required the full version of protobuf.
@@ -466,15 +465,6 @@ if(MSVC)
           -DEIGEN_STRONG_INLINE=inline)
 endif()
 
-if(onnxruntime_CROSS_COMPILING)
-  set(CMAKE_CROSSCOMPILING ON)
-  check_cxx_compiler_flag(-Wno-error HAS_NOERROR)
-  if(HAS_NOERROR)
-    string(APPEND CMAKE_CXX_FLAGS " -Wno-error=attributes")
-    string(APPEND CMAKE_C_FLAGS " -Wno-error=attributes")
-  endif()
-endif()
-
 # Mark symbols to be invisible, for macOS/iOS target only
 # Due to many dependencies have different symbol visibility settings, set global compile flags here.
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin|iOS")
@@ -600,16 +590,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
 endif()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "iOSCross")
-    #For ios compliance
-    message("Adding flags for ios builds")
-    if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -target arm64-apple-darwin-macho")
-    elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "arm")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -target armv7a-apple-darwin-macho")
-    endif()
-endif()
-
 #Dependencies begin
 if (onnxruntime_BUILD_UNIT_TESTS)
   if(onnxruntime_PREFER_SYSTEM_LIB)
@@ -644,10 +624,6 @@ set(ENABLE_DATE_TESTING  OFF CACHE BOOL "" FORCE)
 set(USE_SYSTEM_TZ_DB  ON CACHE BOOL "" FORCE)
 set(RE2_BUILD_TESTING OFF CACHE BOOL "" FORCE)
 
-if(CMAKE_CROSSCOMPILING)
-  message("Doing crosscompiling")
-endif()
-
 #Need python to generate def file
 if(onnxruntime_BUILD_SHARED_LIB OR onnxruntime_ENABLE_PYTHON)
   if(onnxruntime_ENABLE_PYTHON)
@@ -729,6 +705,17 @@ else()
   endif()
   if(TARGET protoc)
     set_target_properties(protoc PROPERTIES FOLDER "External/Protobuf")
+    get_target_property(PROTOC_OSX_ARCH protoc OSX_ARCHITECTURES)
+    if(PROTOC_OSX_ARCH)
+	if (${CMAKE_HOST_SYSTEM_PROCESSOR} IN_LIST PROTOC_OSX_ARCH)
+	   message("protoc can run")
+	else()
+           list(APPEND PROTOC_OSX_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR})
+           set_target_properties(protoc PROPERTIES OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
+           set_target_properties(libprotoc PROPERTIES OSX_ARCHITECTURES "${PROTOC_OSX_ARCH}")
+           set_target_properties(libprotobuf PROPERTIES OSX_ARCHITECTURES "${PROTOC_OSX_ARCH}")
+	endif()
+    endif()
   endif()
   if (onnxruntime_USE_FULL_PROTOBUF)
     set(PROTOBUF_LIB libprotobuf)
@@ -801,9 +788,8 @@ endif()
 
 # Adding pytorch CPU info library
 # TODO!! need a better way to find out the supported architectures
-set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
-if (NOT DEFINED TARGET_ARCH OR  "${TARGET_ARCH}" STREQUAL "")
-    set(TARGET_ARCH "${CMAKE_OSX_ARCHITECTURES}")
+if(NOT APPLE)
+  set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
 set(CPUINFO_SUPPORTED TRUE)
@@ -829,12 +815,7 @@ if(CPUINFO_SUPPORTED)
   set(CPUINFO_BUILD_TOOLS OFF CACHE INTERNAL "")
   set(CPUINFO_BUILD_UNIT_TESTS OFF CACHE INTERNAL "")
   set(CPUINFO_BUILD_MOCK_TESTS OFF CACHE INTERNAL "")
-  set(CPUINFO_BUILD_BENCHMARKS OFF CACHE INTERNAL "")
-
-  if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-      set(IOS ON CACHE INTERNAL "")
-      set(IOS_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE INTERNAL "")
-  endif()
+  set(CPUINFO_BUILD_BENCHMARKS OFF CACHE INTERNAL "") 
 
   string(APPEND CMAKE_CXX_FLAGS " -DCPUINFO_SUPPORTED")
   add_subdirectory(external/pytorch_cpuinfo EXCLUDE_FROM_ALL)
@@ -1085,10 +1066,7 @@ function(onnxruntime_set_compile_flags target_name)
           target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:--compiler-options -Werror>" "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:-Werror>")
       endif()
 
-      target_compile_definitions(${target_name} PUBLIC -DNSYNC_ATOMIC_CPP11)
-      if(APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOSCross" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS")
-        target_compile_definitions(${target_name} PUBLIC -Doptional_CONFIG_SELECT_OPTIONAL=optional_OPTIONAL_NONSTD)
-      endif()
+      target_compile_definitions(${target_name} PUBLIC -DNSYNC_ATOMIC_CPP11)      
       target_include_directories(${target_name} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/nsync/public")
     endif()
     foreach(ORT_FLAG ${ORT_PROVIDER_FLAGS})
@@ -1141,7 +1119,7 @@ endfunction()
 
 #For plugins that are not linked into other targets but may be loaded dynamically at runtime using dlopen-like functionality.
 function(onnxruntime_add_shared_library_module target_name)
-  if ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR (${CMAKE_SYSTEM_NAME} MATCHES "iOSCross") OR (${CMAKE_SYSTEM_NAME} MATCHES "iOS"))
+  if ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR (${CMAKE_SYSTEM_NAME} MATCHES "iOS"))
     add_library(${target_name} SHARED ${ARGN})
   else()
     #On Windows, this target shouldn't generate an import lib, but I don't know how to disable it.
@@ -1152,9 +1130,6 @@ function(onnxruntime_add_shared_library_module target_name)
 endfunction()
 
 function(onnxruntime_add_executable target_name)
-  if(${CMAKE_SYSTEM_NAME} MATCHES "iOSCross")
-    message(FATAL_ERROR "iOS doesn't support commmand line tool")
-  endif()
   add_executable(${target_name} ${ARGN})
   onnxruntime_configure_target(${target_name})
 endfunction()

cmake/CMakeLists.txt

@@ -174,8 +174,8 @@ set(onnxruntime_INTERNAL_LIBRARIES
   ${onnxruntime_tvm_libs}
   onnxruntime_framework
   onnxruntime_graph
+  ${ONNXRUNTIME_MLAS_LIBS}
   onnxruntime_common
-  onnxruntime_mlas
   onnxruntime_flatbuffers
 )
 

cmake/external/eigen

@@ -185,18 +185,7 @@ if(MSVC)
   elseif(onnxruntime_target_platform STREQUAL "x86")
     set(X86 TRUE)
   endif()
-elseif(NOT onnxruntime_BUILD_WEBASSEMBLY)
-  if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-    set(ARM64 TRUE)
-  elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64e")
-    set(ARM64 TRUE)
-  elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "arm")
-    set(ARM TRUE)
-  elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64")
-    set(X86_64 TRUE)
-  elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "i386")
-    set(X86 TRUE)
-  endif()
+elseif(NOT onnxruntime_BUILD_WEBASSEMBLY AND NOT APPLE)
   if (CMAKE_SYSTEM_NAME STREQUAL "Android")
     if (CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a")
       set(ARM TRUE)