From eed02a3f782407e569c29a8a86c58a4d398d0b0e Mon Sep 17 00:00:00 2001
From: JiCheng <wejoncy@163.com>
Date: Mon, 12 Jun 2023 14:00:42 +0800
Subject: [PATCH] Xnnpack QDQ test (#16281)

### Description
A few QDQ tests failed on XNNPACK EP.

The reason should be the range of input_data doesn't fit for scale and
zero_point.


### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
---
 onnxruntime/test/providers/xnnpack/xnnpack_basic_test.cc | 2 +-
 .../ci_build/github/azure-pipelines/mac-ci-pipeline.yml  | 2 +-
 .../github/azure-pipelines/mac-ios-ci-pipeline.yml       | 9 +--------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/onnxruntime/test/providers/xnnpack/xnnpack_basic_test.cc b/onnxruntime/test/providers/xnnpack/xnnpack_basic_test.cc
index 7046e36006..50bfb33582 100644
--- a/onnxruntime/test/providers/xnnpack/xnnpack_basic_test.cc
+++ b/onnxruntime/test/providers/xnnpack/xnnpack_basic_test.cc
@@ -211,7 +211,7 @@ static void RunModelTestWithPath(const ORTCHAR_T* ort_model_path, const char* gr
   RandomValueGenerator generator;
   TensorShape input_shape_x{input_shape};
   std::vector<float> input_x = generator.Uniform<float>(input_shape_x.GetDims(),
-                                                        -64, 64);
+                                                        -10, 24);
   OrtValue ml_value_x;
   CreateMLValue<float>(input_shape_x.GetDims(), input_x.data(), OrtMemoryInfo(), &ml_value_x);
   NameMLValMap feeds;
diff --git a/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
index f573ddf938..9c47befd21 100644
--- a/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
@@ -3,5 +3,5 @@ stages:
   parameters:
     AllowReleasedOpsetOnly: 0
     BuildForAllArchs: false
-    AdditionalBuildFlags: --build_objc --enable_language_interop_ops --build_wheel
+    AdditionalBuildFlags: --build_objc --enable_language_interop_ops --build_wheel --use_xnnpack
     WithCache: true
diff --git a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml
index f228dab1eb..44805436c6 100644
--- a/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/mac-ios-ci-pipeline.yml
@@ -1,7 +1,7 @@
 jobs:
 - job: iOS_CI_on_Mac
   pool:
-    vmImage: 'macOS-12'
+    vmImage: 'macOS-13'
   variables:
     PROTO_CACHE_DIR: $(Pipeline.Workspace)/proto_ccache
     ORT_CACHE_DIR: $(Pipeline.Workspace)/ort_ccache
@@ -24,13 +24,6 @@ jobs:
               CCACHE_DIR: $(PROTO_CACHE_DIR)
 
     - template: templates/use-xcode-version.yml
-      # TODO figure out XNNPACK EP test failures
-      # Failing tests:
-      #   -[XnnpackEP TestConvTranspose_qdq]
-      #   -[XnnpackEP TestQDQConvS8S8_per_channel]
-      parameters:
-        xcodeVersion: "13.1"
-
     - template: templates/mac-build-step-with-cache.yml
       parameters:
         WithCache: true