update

microsoft · Dec 23, 2024 · 59e42c8 · 59e42c8
1 parent 371f71e
commit 59e42c8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
@@ -472,7 +472,7 @@ def convert_arg_line_to_args(self, arg_line):
     parser.add_argument(
         "--use_vcpkg",
         action="store_true",
-        default=is_windows() and ("VCPKG_INSTALLATION_ROOT" in os.environ),
+        default="VCPKG_INSTALLATION_ROOT" in os.environ,
         help="Use vcpkg to search dependencies. Requires CMAKE_TOOLCHAIN_FILE for vcpkg.cmake",
     )
 
@@ -1120,7 +1120,7 @@ def generate_build_tree(
                 run_subprocess(["git", "clone", "https://github.com/microsoft/vcpkg.git", "--recursive"], cwd=build_dir)
         vcpkg_toolchain_path = os.path.join(vcpkg_installation_root, "scripts", "buildsystems", "vcpkg.cmake")
         add_default_definition(cmake_extra_defines, "CMAKE_TOOLCHAIN_FILE", vcpkg_toolchain_path)
-        # The enable_address_sanitizer and use_binskim_compliant_compile_flags can be enabled independently. Then there would be 4 different combinations. Here we only accept 3.
+        # The enable_address_sanitizer and use_binskim_compliant_compile_flags flags cannot be both enabled
         if args.enable_address_sanitizer:
             overlay_triplets_dir = os.path.join(source_dir, "cmake", "vcpkg_triplets", "asan")
             vcpkg_install_options.append("--overlay-triplets=%s" % overlay_triplets_dir)
@@ -2598,11 +2598,11 @@ def main():
 
     print(args)
     if args.build_wasm:
-        # No triplet for wasm64 yet
-        # args.use_vcpkg = not args.enable_wasm_memory64
+        # No custom triplet for the wasm builds yet
         args.use_vcpkg = False
-    elif args.ios or args.android:
+    elif args.ios or args.android or args.use_xnnpack:
         # Not supported yet
+        # XNNPack needs a newer version of cpuinfo
         args.use_vcpkg = False
     if os.getenv("ORT_BUILD_WITH_CACHE") == "1":
         args.use_cache = True

diff --git a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml
@@ -87,16 +87,16 @@ stages:
                         --config Debug \
                         --skip_submodule_sync \
                         --build_shared_lib \
-                        --parallel --use_binskim_compliant_compile_flags \
-                        --enable_onnx_tests --enable_address_sanitizer \
+                        --parallel --use_binskim_compliant_compile_flags  --use_vcpkg \
+                        --enable_onnx_tests --enable_address_sanitizer --use_vcpkg \
                         --update --build;
                       python3.12 /onnxruntime_src/tools/ci_build/build.py \
                         --build_dir /build --cmake_generator 'Ninja' \
                         --config Debug \
                         --skip_submodule_sync \
                         --build_shared_lib \
-                        --parallel --use_binskim_compliant_compile_flags \
-                        --enable_onnx_tests --enable_address_sanitizer \
+                        --parallel --use_binskim_compliant_compile_flags  --use_vcpkg \
+                        --enable_onnx_tests --enable_address_sanitizer --use_vcpkg \
                         --test;
                       '
                 workingDirectory: $(Build.SourcesDirectory)
@@ -222,7 +222,7 @@ stages:
                         --config Release \
                         --skip_submodule_sync \
                         --build_shared_lib \
-                        --parallel --use_binskim_compliant_compile_flags \
+                        --parallel --use_binskim_compliant_compile_flags  --use_vcpkg \
                         --build_wheel \
                         --build_csharp \
                         --enable_onnx_tests \

diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-ci-pipeline.yml
@@ -212,7 +212,7 @@ stages:
               cd /onnxruntime_src/java && /onnxruntime_src/java/gradlew cmakeCheck -DcmakeBuildDir=/build/Release -DUSE_CUDA=1; \
               cd /tmp; \
               python3 /onnxruntime_src/tools/ci_build/build.py \
-                --build_dir /build --config Release --test --skip_submodule_sync --build_shared_lib --parallel --use_binskim_compliant_compile_flags --build_wheel --enable_onnx_tests \
+                --build_dir /build --config Release --test --skip_submodule_sync --build_shared_lib --parallel --use_binskim_compliant_compile_flags  --use_vcpkg  --build_wheel --enable_onnx_tests \
                 --enable_transformers_tool_test --use_cuda --cuda_version=${{parameters.CudaVersion}} --cuda_home=/usr/local/cuda --cudnn_home=/usr/local/cuda \
                 --enable_pybind --build_java --ctest_path "" ; \
               '

diff --git a/tools/ci_build/github/azure-pipelines/linux-qnn-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-qnn-ci-pipeline.yml
@@ -63,7 +63,7 @@ jobs:
           python3 tools/ci_build/build.py \
             --build_dir build \
             --config Release \
-            --use_binskim_compliant_compile_flags \
+            --use_binskim_compliant_compile_flags --use_vcpkg \
             --build_java \
             --use_qnn \
             --qnn_home $(QnnSDKRootDir) \
@@ -75,7 +75,7 @@ jobs:
           python3 tools/ci_build/build.py \
             --build_dir build \
             --config Release \
-            --use_binskim_compliant_compile_flags \
+            --use_binskim_compliant_compile_flags --use_vcpkg \
             --build_java \
             --use_qnn \
             --qnn_home $(QnnSDKRootDir) \