Skip to content

Commit ceecc9e

Browse files
ssjiaSS-JIA
authored andcommitted
[ET-VK][ez] Fix conv2d_gemm_dynamic_test build against updated XNNPACK API
XNNPACK updated two f32 conv2d entry points and `conv2d_gemm_dynamic_test.cpp` still called the old signatures, breaking the build (and thus the `etvk-eureka-tests` CI workflow). `xnn_create_convolution2d_nhwc_f32` gained an `xnn_code_cache_t code_cache` parameter before `weights_cache` (22 -> 23 args), and `xnn_reshape_convolution2d_nhwc_f32` gained a `size_t* workspace_alignment` out-param after `workspace_size` (8 -> 9 args). Updated both call sites: pass `nullptr` for `code_cache`, and pass `&workspace_alignment` (now written back by XNNPACK). Differential Revision: [D111934764](https://our.internmc.facebook.com/intern/diff/D111934764/) ghstack-source-id: 402834443 Pull-Request: #20910
1 parent 0b51017 commit ceecc9e

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

backends/vulkan/test/op_tests/conv2d_gemm_dynamic_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ std::vector<float> conv2d_ref_xnnpack(
247247
out_min,
248248
out_max,
249249
/*flags=*/0,
250+
/*code_cache=*/nullptr,
250251
/*weights_cache=*/nullptr,
251252
&op);
252253
if (create_status != xnn_status_success || op == nullptr) {
@@ -257,7 +258,7 @@ std::vector<float> conv2d_ref_xnnpack(
257258
}
258259

259260
size_t workspace_size = 0;
260-
const size_t workspace_alignment = 128;
261+
size_t workspace_alignment = 128;
261262
size_t out_h = 0;
262263
size_t out_w = 0;
263264
const xnn_status reshape_status = xnn_reshape_convolution2d_nhwc_f32(
@@ -266,6 +267,7 @@ std::vector<float> conv2d_ref_xnnpack(
266267
static_cast<size_t>(H_in),
267268
static_cast<size_t>(W_in),
268269
&workspace_size,
270+
&workspace_alignment,
269271
&out_h,
270272
&out_w,
271273
/*threadpool=*/nullptr);

0 commit comments

Comments
 (0)