diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index 044588c080072..f77099741a59b 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -136,7 +136,7 @@ "component": { "type": "git", "git": { - "commitHash": "fe98e0b93565382648129271381c14d6205255e3", + "commitHash": "74c0fd13f749844ef997c3d2043c1be6e534e6b1", "repositoryUrl": "https://github.com/google/XNNPACK.git" }, "comments": "googlexnnpack" diff --git a/cmake/adjust_global_compile_flags.cmake b/cmake/adjust_global_compile_flags.cmake index 8b5a744e497a6..1dbf7e8f8d55f 100644 --- a/cmake/adjust_global_compile_flags.cmake +++ b/cmake/adjust_global_compile_flags.cmake @@ -329,10 +329,6 @@ else() # suppress warnings from flatbuffers string(APPEND CMAKE_CXX_FLAGS " -Wno-restrict ") string(APPEND CMAKE_C_FLAGS " -Wno-restrict ") - if(onnxruntime_USE_XNNPACK) - # https://github.com/google/XNNPACK/issues/7650 - string(APPEND CMAKE_C_FLAGS " -Wno-incompatible-pointer-types ") - endif() endif() # Check support for AVX and f16c. include(CheckCXXCompilerFlag) diff --git a/cmake/deps.txt b/cmake/deps.txt index d1a528bd6b4be..aa930759f2056 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -29,7 +29,7 @@ fxdiv;https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34 google_benchmark;https://github.com/google/benchmark/archive/refs/tags/v1.8.5.zip;cd47d3d272faf353600c8cc2fdec2b52d6f69177 googletest;https://github.com/google/googletest/archive/refs/tags/v1.15.0.zip;9d2d0af8d77ac726ea55d44a8fa727ec98311349 #xnnpack 2024.09.04 -googlexnnpack;https://github.com/google/XNNPACK/archive/fe98e0b93565382648129271381c14d6205255e3.zip;14f61dcf17cec2cde34ba2dcf61d6f24bf6059f3 +googlexnnpack;https://github.com/google/XNNPACK/archive/74c0fd13f749844ef997c3d2043c1be6e534e6b1.zip;a2011d8734ffa41afa875ba3a20dc189ea4fb810 json;https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.zip;f257f8dc27c5b8c085dc887b40cddd18ae1f725c microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf368104cd22a87b4dd0c80228919bb2df3e2a14 microsoft_wil;https://github.com/microsoft/wil/archive/refs/tags/v1.0.230629.1.zip;e4a542a323c070376f7c2d1973d0f7ddbc1d2fa5 diff --git a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml index 1a53ce6a423b6..48cd987e16d04 100644 --- a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml @@ -11,7 +11,7 @@ steps: packageType: upack feed: '/7424c8e4-5c62-490e-95c4-79446f31017c' definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0' - version: 1.0.208 + version: 1.0.209 downloadPath: $(Build.BinariesDirectory)/deps # The private ADO project @@ -22,7 +22,7 @@ steps: packageType: upack feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325' definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a' - version: 1.0.208 + version: 1.0.209 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here.