From ebde1c5f0b6cb3794df25bc3bc90be264734368b Mon Sep 17 00:00:00 2001 From: Jens Elofsson Date: Tue, 1 Apr 2025 10:06:45 +0200 Subject: [PATCH] Remove designated initializers for matmul_clamp_f32_qai8dxp_qsi4cxp_test - Remove designated initializers for matmul_clamp_f32_qai8dxp_qsi4cxp_test to comply with C++17 standard. Signed-off-by: Jens Elofsson --- CMakeLists.txt | 1 + .../matmul_clamp_f32_qai8dxp_qsi4cxp_test.cpp | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d57926a2..53ce829f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,6 +342,7 @@ if(KLEIDIAI_BUILD_TESTS) set_source_files_properties( test/tests/matmul_clamp_f32_bf16p_bf16p_test.cpp test/tests/matmul_clamp_f16_bf16p_bf16p_test.cpp + test/tests/matmul_clamp_f32_qai8dxp_qsi4cxp_test.cpp test/tests/matmul_test.cpp PROPERTIES COMPILE_FLAGS "-Wpedantic") endif() diff --git a/test/tests/matmul_clamp_f32_qai8dxp_qsi4cxp_test.cpp b/test/tests/matmul_clamp_f32_qai8dxp_qsi4cxp_test.cpp index eaaa6b06..9b02d50b 100644 --- a/test/tests/matmul_clamp_f32_qai8dxp_qsi4cxp_test.cpp +++ b/test/tests/matmul_clamp_f32_qai8dxp_qsi4cxp_test.cpp @@ -355,7 +355,10 @@ TEST_P(MatMulTest_f32_qai8dxp_qsi4cxp, EndToEnd_RHS_nxk_qsi4cx) { size_t scale_offset = rhs_start_row * sizeof(float); std::vector imp_packed_rhs(imp_packed_rhs_size); - const kai_rhs_pack_nxk_qsi4cxp_qs4cxs1s0_params params{.lhs_zero_point = 1, .rhs_zero_point = 0}; + kai_rhs_pack_nxk_qsi4cxp_qs4cxs1s0_params params{}; + params.lhs_zero_point = 1; + params.rhs_zero_point = 0; + ukernel_variant.run_rhs_pack( 1, rect.width() /* n */, K, nr, kr, sr, ref_rhs_qsi4_padded.data() + rhs_offset, reinterpret_cast(ref_biases.data() + bias_offset), @@ -480,7 +483,9 @@ TEST_P(MatMulTest_f32_qai8dxp_qsi4cxp, EndToEnd_RHS_nxk_qsu4cx) { size_t scale_offset = rhs_start_row * sizeof(float); std::vector imp_packed_rhs(imp_packed_rhs_size); - const kai_rhs_pack_nxk_qsi4cxp_qs4cxs1s0_params params{.lhs_zero_point = 1, .rhs_zero_point = 8}; + kai_rhs_pack_nxk_qsi4cxp_qs4cxs1s0_params params{}; + params.lhs_zero_point = 1; + params.rhs_zero_point = 8; ukernel_variant.run_rhs_pack( 1, rect.width() /* n */, K, nr, kr, sr, ref_rhs_qsu4_padded.data() + rhs_offset, reinterpret_cast(ref_biases.data() + bias_offset), @@ -612,7 +617,9 @@ TEST_P(MatMulTest_f32_qai8dxp_qsi4cxp, EndToEnd_RHS_kxn_qsi4cx) { ASSERT_EQ(rhs_packed_offset, rhs_matmul_offset); std::vector imp_packed_rhs(imp_packed_rhs_size); - const kai_rhs_pack_kxn_qsi4cxp_qs4cxs1s0_params params{.lhs_zero_point = 1, .rhs_zero_point = 0}; + kai_rhs_pack_kxn_qsi4cxp_qs4cxs1s0_params params{}; + params.lhs_zero_point = 1; + params.rhs_zero_point = 0; ukernel_variant.run_rhs_pack( 1, N, K, nr, kr, sr, ref_rhs_qsi4_padded.data(), reinterpret_cast(ref_biases.data()), reinterpret_cast(ref_rhs_scales.data()), imp_packed_rhs.data(), 0, ¶ms); @@ -743,7 +750,9 @@ TEST_P(MatMulTest_f32_qai8dxp_qsi4cxp, EndToEnd_RHS_kxn_qsu4cx) { ASSERT_EQ(rhs_packed_offset, rhs_matmul_offset); std::vector imp_packed_rhs(imp_packed_rhs_size); - const kai_rhs_pack_kxn_qsi4cxp_qs4cxs1s0_params params{.lhs_zero_point = 1, .rhs_zero_point = 8}; + kai_rhs_pack_kxn_qsi4cxp_qs4cxs1s0_params params{}; + params.lhs_zero_point = 1; + params.rhs_zero_point = 8; ukernel_variant.run_rhs_pack( 1, N, K, nr, kr, sr, ref_rhs_qsu4_padded.data(), reinterpret_cast(ref_biases.data()), reinterpret_cast(ref_rhs_scales.data()), imp_packed_rhs.data(), 0, ¶ms); -- GitLab