Skip to content

Commit 79b799d

Browse files
authored
Revert "Update XNNPACK dependency to 1adaa7c70 (#18131)" (#19168)
This reverts commit 4b674be. It breaks Windows jobs - they hang now. Revert while I debug. Possibly related to the pthreadpool change to google/pthreadpool as I saw something similar when I tested w/ PyTorch core CI (it's not landed there yet as a result).
1 parent f61350b commit 79b799d

6 files changed

Lines changed: 5 additions & 22 deletions

File tree

.ci/scripts/test_lora.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ Okay, so I need to calculate 15% of 80."
139139
EXPECTED_QUANT_LORA_PREFIX="
140140
<|im_start|>user Calculate 15% of 80?<|im_end|><|im_start|>assistant
141141
To calculate 15% of 80, we can multiply 80 by 15/100.
142-
80 * 15/100 = 12.
143-
So, 15% of 80 is 12.
142+
So, 15% of 80 is equal to (80 * 15) / 100 = 1200 / 100 = 12.
144143
#### 12
145144
The answer is: 12<|im_end|>"
146145

backends/xnnpack/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,12 @@ install(
154154
xnnpack-normalization
155155
xnnpack-operators
156156
xnnpack-operator-run
157-
xnnpack-operator-delete
158157
xnnpack-operator-utils
159158
xnnpack-pack-lh
160159
xnnpack-packing
161160
xnnpack-sanitizers
162161
xnnpack-subgraph
163162
xnnpack-datatype
164-
xnnpack-fingerprint-id
165-
xnnpack-fingerprint-cache
166-
xnnpack-fingerprint-check
167163
xnnpack-reference-ukernels
168164
xnnpack-logging
169165
EXPORT ExecuTorchTargets
Submodule XNNPACK updated 2893 files

backends/xnnpack/third-party/xnnpack.buck.bzl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ def define_xnnpack():
4141
"XNNPACK/src/memory.c",
4242
"XNNPACK/src/mutex.c",
4343
"XNNPACK/src/normalization.c",
44-
"XNNPACK/src/operator-delete.c",
4544
"XNNPACK/src/operator-utils.c",
46-
"XNNPACK/src/operators/fingerprint_cache.c",
47-
"XNNPACK/src/operators/fingerprint_id.c",
4845
"XNNPACK/src/reference/packing.cc",
4946
],
5047
headers = get_xnnpack_headers(),
@@ -1042,7 +1039,7 @@ def define_xnnpack():
10421039
native.cxx_library(
10431040
name = "ukernels_avx512vnnigfni",
10441041
srcs = select({
1045-
"DEFAULT": prod_srcs_for_arch_wrapper("avx512vnnigfni"),
1042+
"DEFAULT": prod_srcs_for_arch_wrapper("avx512vnnifgni"),
10461043
"ovr_config//cpu:arm32": DEFAULT_DUMMY_SRC,
10471044
"ovr_config//cpu:arm64": DEFAULT_DUMMY_SRC,
10481045
}),
@@ -1071,7 +1068,6 @@ def define_xnnpack():
10711068
"-mavxvnni",
10721069
"-mf16c",
10731070
"-mfma",
1074-
"-mgfni",
10751071
]
10761072

10771073
# @lint-ignore BUCKLINT: native and fb_native are explicitly forbidden in fbcode.
@@ -1176,14 +1172,6 @@ def define_xnnpack():
11761172
# "-DXNN_ENABLE_DWCONV_MULTIPLASS=0",
11771173
"-DXNN_ENABLE_ARM_I8MM=1",
11781174
"-DXNN_ENABLE_ARM_FP16_VECTOR=1",
1179-
"-DXNN_ENABLE_SSE=1",
1180-
"-DXNN_ENABLE_SSE2=1",
1181-
"-DXNN_ENABLE_SSSE3=1",
1182-
"-DXNN_ENABLE_SSE41=1",
1183-
"-DXNN_ENABLE_AVX=1",
1184-
"-DXNN_ENABLE_F16C=1",
1185-
"-DXNN_ENABLE_FMA3=1",
1186-
"-DXNN_ENABLE_AVX2=1",
11871175
"-DXNN_ENABLE_AVX512F=1",
11881176
"-DXNN_ENABLE_AVX512SKX=1",
11891177
"-DXNN_ENABLE_AVX512VNNI=1",

0 commit comments

Comments
 (0)