update

Author: snnn

include/onnxruntime/core/common/eigen_common_wrapper.h

@@ -14,7 +14,7 @@
 #pragma GCC diagnostic ignored "-Wignored-attributes"
 #endif
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wno-unused-result"
+#pragma GCC diagnostic ignored "-Wunused-result"
 #ifdef HAS_DEPRECATED_COPY
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif

onnxruntime/test/util/compare_ortvalue.cc

@@ -9,6 +9,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-result"
 #endif
 #include <google/protobuf/message_lite.h>
 #include <Eigen/Core>

tools/ci_build/build.py

@@ -4,7 +4,6 @@
 
 import argparse
 import contextlib
-import glob
 import os
 import re
 import shlex
@@ -279,15 +278,15 @@ def parse_arguments():
         "CMake setup. Delete CMakeCache.txt if needed")
     parser.add_argument(
         "--arm", action='store_true',
-        help="[cross-compiling] Create ARM makefiles. Requires --update and no existing cache "
+        help="[cross-compiling] Create Windows ARM makefiles. Requires --update and no existing cache "
         "CMake setup. Delete CMakeCache.txt if needed")
     parser.add_argument(
         "--arm64", action='store_true',
-        help="[cross-compiling] Create ARM64 makefiles. Requires --update and no existing cache "
+        help="[cross-compiling] Create Windows ARM64 makefiles. Requires --update and no existing cache "
         "CMake setup. Delete CMakeCache.txt if needed")
     parser.add_argument(
         "--arm64ec", action='store_true',
-        help="[cross-compiling] Create ARM64EC makefiles. Requires --update and no existing cache "
+        help="[cross-compiling] Create Windows ARM64EC makefiles. Requires --update and no existing cache "
         "CMake setup. Delete CMakeCache.txt if needed")
     parser.add_argument(
         "--msvc_toolset", help="MSVC toolset to use. e.g. 14.11")
@@ -311,7 +310,7 @@ def parse_arguments():
     parser.add_argument("--ios", action='store_true', help="build for ios")
     parser.add_argument(
         "--ios_sysroot", default="",
-        help="Specify the location name of the macOS platform SDK to be used")    
+        help="Specify the location name of the macOS platform SDK to be used")
     parser.add_argument(
         "--xcode_code_signing_team_id", default="",
         help="The development team ID used for code signing in Xcode")
@@ -321,11 +320,6 @@ def parse_arguments():
     parser.add_argument(
         "--use_xcode", action='store_true',
         help="Use Xcode as cmake generator, this is only supported on MacOS.")
-    parser.add_argument(
-        "--osx_arch",
-        default="arm64" if platform.machine() == "arm64" else "x86_64",
-        choices=["arm64", "arm64e", "x86_64"],
-        help="Specify the Target specific architectures for macOS and iOS, This is only supported on MacOS")
 
     # WebAssembly build
     parser.add_argument("--build_wasm", action='store_true', help="Build for WebAssembly")
@@ -775,8 +769,34 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
     # It should be default ON in CI build pipelines, and OFF in packaging pipelines.
     # And OFF for the people who are not actively developing onnx runtime.
     add_cmake_define_without_override(cmake_extra_defines, "onnxruntime_DEV_MODE", use_dev_mode(args))
-    
-    if args.arm64 or args.arm64ec or args.arm:
+    if is_macOS:
+        ARCHFLAGS = os.environ.get('ARCHFLAGS', None)
+        OSX_ARCHS = []
+        if ARCHFLAGS:
+            ARCHFLAGS = shlex.split(ARCHFLAGS)
+            for i in range(0, len(ARCHFLAGS)-1):
+                if ARCHFLAGS[i] == '-arch':
+                    OSX_ARCHS.append(ARCHFLAGS[i+1])
+
+        if len(OSX_ARCHS) == 1 and OSX_ARCHS[0] == platform.machine():
+            # We have use the default value
+            OSX_ARCHS = None
+
+        is_cmake_osx_architectures_set = False
+        if OSX_ARCHS:
+            is_cmake_osx_architectures_set = True
+            add_cmake_define_without_override(cmake_extra_defines, "CMAKE_OSX_ARCHITECTURES", ";".join(OSX_ARCHS))
+        else:
+            for x in cmake_extra_defines:
+                if x.startswith("CMAKE_OSX_ARCHITECTURES="):
+                    is_cmake_osx_architectures_set = True
+                    break
+
+        if is_cmake_osx_architectures_set:
+            print("CMAKE_OSX_ARCHITECTURES is set")
+        else:
+            print("CMAKE_OSX_ARCHITECTURES is not set")
+    elif args.arm64 or args.arm64ec or args.arm:
         # In most cases, we don't need to manually set this variable.
         # Please refer https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html
         add_cmake_define_without_override(cmake_extra_defines, "CMAKE_CROSSCOMPILING", "ON")
@@ -900,30 +920,30 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
         cmake_args += ["-Donnxruntime_USE_COREML=ON"]
 
     if args.ios:
-            needed_args = [
-                args.use_xcode,
-                args.ios_sysroot,
-            ]
-            arg_names = [
-                "--use_xcode            " +
-                "<need use xcode to cross build iOS on MacOS>",
-                "--ios_sysroot          " +
-                "<the location or name of the macOS platform SDK>",
-            ]
-            if not all(needed_args):
-                raise BuildError(
-                    "iOS build on MacOS canceled due to missing arguments: " +
-                    ', '.join(
-                        val for val, cond in zip(arg_names, needed_args)
-                        if not cond))
-            cmake_args += [
-                "-DCMAKE_SYSTEM_NAME=iOS",
-                "-Donnxruntime_BUILD_SHARED_LIB=ON",
-                "-DCMAKE_OSX_SYSROOT=" + args.ios_sysroot,
-                # we do not need protoc binary for ios cross build
-                "-Dprotobuf_BUILD_PROTOC_BINARIES=OFF",
-                "-DCMAKE_TOOLCHAIN_FILE=../cmake/onnxruntime_ios.toolchain.cmake"
-            ]
+        needed_args = [
+            args.use_xcode,
+            args.ios_sysroot,
+        ]
+        arg_names = [
+            "--use_xcode            " +
+            "<need use xcode to cross build iOS on MacOS>",
+            "--ios_sysroot          " +
+            "<the location or name of the macOS platform SDK>",
+        ]
+        if not all(needed_args):
+            raise BuildError(
+                "iOS build on MacOS canceled due to missing arguments: " +
+                ', '.join(
+                    val for val, cond in zip(arg_names, needed_args)
+                    if not cond))
+        cmake_args += [
+            "-DCMAKE_SYSTEM_NAME=iOS",
+            "-Donnxruntime_BUILD_SHARED_LIB=ON",
+            "-DCMAKE_OSX_SYSROOT=" + args.ios_sysroot,
+            # we do not need protoc binary for ios cross build
+            "-Dprotobuf_BUILD_PROTOC_BINARIES=OFF",
+            "-DCMAKE_TOOLCHAIN_FILE=../cmake/onnxruntime_ios.toolchain.cmake"
+        ]
 
     if args.build_wasm:
         emsdk_dir = os.path.join(cmake_dir, "external", "emsdk")
@@ -1725,7 +1745,6 @@ def run_csharp_tests(source_dir, build_dir, use_cuda, use_openvino, use_tensorrt
     run_subprocess(cmd_args, cwd=csharp_source_dir)
 
 
-
 def build_protoc_for_host(cmake_path, source_dir, build_dir, args):
     if (args.arm or args.arm64 or args.arm64ec or args.enable_windows_store) and \
             not (is_windows()):
@@ -2004,12 +2023,6 @@ def main():
         elif is_macOS():
             if args.use_xcode:
                 cmake_extra_args += ['-G', 'Xcode']
-            if not args.ios and not args.android and \
-                    args.osx_arch == 'arm64' and platform.machine() == 'x86_64':
-                if args.test:
-                    log.warning(
-                        "Cannot test ARM64 build on X86_64. Will skip test running after build.")
-                    args.test = False
 
         if args.build_wasm:
             emsdk_version = args.emsdk_version
@@ -2043,19 +2056,12 @@ def main():
                 os.path.join(SCRIPT_DIR, "wasm", "file_packager.py.patch"),
                 os.path.join(emsdk_dir, "upstream", "emscripten", "tools", "file_packager.py"))
 
-        if (args.android or args.ios or args.enable_windows_store or args.build_wasm) and args.path_to_protoc_exe is None:
+        path_to_protoc_exe = args.path_to_protoc_exe
+        if (args.android or args.ios or args.enable_windows_store or args.build_wasm) and path_to_protoc_exe is None:
             # Cross-compiling for Android, iOS, and WebAssembly
             path_to_protoc_exe = build_protoc_for_host(
                 cmake_path, source_dir, build_dir, args)
 
-        if is_ubuntu_1604():
-            if (args.arm or args.arm64):
-                raise BuildError(
-                    "Only Windows ARM(64) cross-compiled builds supported "
-                    "currently through this script")
-            if not is_docker() and not args.use_acl and not args.use_armnn:
-                install_python_deps()
-
         if args.enable_pybind and is_windows():
             install_python_deps(args.numpy_version)
 

tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml

@@ -917,10 +917,10 @@ stages:
       pool:
         vmImage: 'macOS-10.15'
       variables:
-        CIBW_ARCHS_MACOS: universal2
+        CIBW_ARCHS_MACOS: x86_64 universal2
         MACOSX_DEPLOYMENT_TARGET: '10.14'
         CIBW_PROJECT_REQUIRES_PYTHON: ">=3.6, <3.10"
-        CIBW_ENVIRONMENT: NIGHTLY_BUILD='$(NIGHTLY_BUILD)' BUILD_BUILDNUMBER='$(Build.BuildId)' ONNXRUNTIME_BUILD_CMD='--enable_pybind --cmake_extra_defines CMAKE_OSX_ARCHITECTURES="arm64;x86_64"'
+        CIBW_ENVIRONMENT: NIGHTLY_BUILD='$(NIGHTLY_BUILD)' BUILD_BUILDNUMBER='$(Build.BuildId)' ONNXRUNTIME_BUILD_CMD='--enable_pybind'
         CIBW_BEFORE_BUILD: python3 -m pip install numpy==1.16.6
       steps:
       - checkout: self