From 20a9cdbe2bfd0bce517cad48991cf5a70d56c679 Mon Sep 17 00:00:00 2001 From: nihuini Date: Wed, 5 Feb 2025 17:03:45 +0800 Subject: [PATCH] w --- src/layer/loongarch/quantize_loongarch.cpp | 2 +- src/layer/mips/quantize_mips.cpp | 2 +- tests/test_quantize_oom.cpp | 80 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 tests/test_quantize_oom.cpp diff --git a/src/layer/loongarch/quantize_loongarch.cpp b/src/layer/loongarch/quantize_loongarch.cpp index 24b92fe1e1d..b4d9d7a9050 100644 --- a/src/layer/loongarch/quantize_loongarch.cpp +++ b/src/layer/loongarch/quantize_loongarch.cpp @@ -131,7 +131,7 @@ static void quantize_pack4to1(const float* ptr, signed char* s8ptr0, signed char { __m128 _v = (__m128)__lsx_vld(ptr, 0); _v = __lsx_vfmul_s(_v, _scale); - v16i8 v = (v16i8)float2int8(_v, _v); + v16i8 v = (v16i8)float2int8(_v); s8ptr0[0] = v[0]; s8ptr1[0] = v[1]; s8ptr2[0] = v[2]; diff --git a/src/layer/mips/quantize_mips.cpp b/src/layer/mips/quantize_mips.cpp index de1308870b0..0b9ec9db62c 100644 --- a/src/layer/mips/quantize_mips.cpp +++ b/src/layer/mips/quantize_mips.cpp @@ -131,7 +131,7 @@ static void quantize_pack4to1(const float* ptr, signed char* s8ptr0, signed char { v4f32 _v = (v4f32)__msa_ld_w(ptr, 0); _v = __msa_fmul_w(_v, _scale); - v16i8 v = float2int8(_v, _v); + v16i8 v = float2int8(_v); s8ptr0[0] = v[0]; s8ptr1[0] = v[1]; s8ptr2[0] = v[2]; diff --git a/tests/test_quantize_oom.cpp b/tests/test_quantize_oom.cpp new file mode 100644 index 00000000000..ca78535ed97 --- /dev/null +++ b/tests/test_quantize_oom.cpp @@ -0,0 +1,80 @@ +// Tencent is pleased to support the open source community by making ncnn available. +// +// Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. +// +// Licensed under the BSD 3-Clause License (the "License"); you may not use this file except +// in compliance with the License. You may obtain a copy of the License at +// +// https://opensource.org/licenses/BSD-3-Clause +// +// Unless required by applicable law or agreed to in writing, software distributed +// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +// CONDITIONS OF ANY KIND, either express or implied. See the License for the +// specific language governing permissions and limitations under the License. + +#include "testutil.h" + +static int test_quantize_oom(const ncnn::Mat& a, float scale_low, float scale_high) +{ + ncnn::Mat scale_data; + if (scale_low == scale_high) + { + scale_data.create(1); + scale_data[0] = scale_low; + } + else + { + if (a.dims == 1) scale_data.create(a.w); + if (a.dims == 2) scale_data.create(a.h); + if (a.dims == 3) scale_data.create(a.c); + Randomize(scale_data, scale_low, scale_high); + } + + ncnn::ParamDict pd; + pd.set(0, scale_data.w); + + std::vector weights(1); + weights[0] = scale_data; + + int ret = test_layer_oom("Quantize", pd, weights, a); + if (ret != 0) + { + fprintf(stderr, "test_quantize_oom failed a.dims=%d a=(%d %d %d) scale_low=%f scale_high=%f\n", a.dims, a.w, a.h, a.c, scale_low, scale_high); + } + + return ret; +} + +static int test_quantize_0() +{ + return 0 + || test_quantize_oom(RandomMat(5, 7, 24), 100.f, 100.f) + || test_quantize_oom(RandomMat(7, 9, 12), 100.f, 100.f) + || test_quantize_oom(RandomMat(3, 5, 13), 100.f, 100.f); +} + +static int test_quantize_1() +{ + return 0 + || test_quantize_oom(RandomMat(15, 24), 100.f, 100.f) + || test_quantize_oom(RandomMat(17, 12), 100.f, 100.f) + || test_quantize_oom(RandomMat(19, 15), 100.f, 100.f); +} + +static int test_quantize_2() +{ + return 0 + || test_quantize_oom(RandomMat(128), 120.f, 140.f) + || test_quantize_oom(RandomMat(124), 120.f, 140.f) + || test_quantize_oom(RandomMat(127), 120.f, 140.f); +} + +int main() +{ + SRAND(7767517); + + return 0 + || test_quantize_0() + || test_quantize_1() + || test_quantize_2(); +}