From cc1b45d62d03b34cfde261a2b29fe8769e67d8dd Mon Sep 17 00:00:00 2001 From: hejunchao Date: Thu, 10 Aug 2023 15:40:02 +0800 Subject: [PATCH 1/5] fix reduce_arg's test --- tests/kernels/test_reduce_arg_max.cpp | 7 ++++--- tests/kernels/test_reduce_arg_min.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/kernels/test_reduce_arg_max.cpp b/tests/kernels/test_reduce_arg_max.cpp index e60ba1667e..cddc796bca 100644 --- a/tests/kernels/test_reduce_arg_max.cpp +++ b/tests/kernels/test_reduce_arg_max.cpp @@ -78,7 +78,8 @@ class ReduceArgMaxTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMax, ReduceArgMaxTest, - testing::Combine(testing::Values(dt_float32), testing::Values(dt_int64), + testing::Combine(testing::Values(dt_float64 /*dt_float32, dt_float16*/), + testing::Values(dt_int64), testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, dims_t{1, 3, 16}, dims_t{3, 16}, dims_t{16}), @@ -95,7 +96,7 @@ TEST_P(ReduceArgMaxTest, ReduceArgMax) { void *ptr_ort = tensor_buffer(output_ort, &size); dims_t shape(tensor_rank(output_ort)); tensor_shape(output_ort, reinterpret_cast(shape.data())); - auto expected = hrt::create(dt_float64, shape, + auto expected = hrt::create(a.datatype(), shape, {reinterpret_cast(ptr_ort), size}, true, host_runtime_tensor::pool_cpu_only) .expect("create tensor failed"); @@ -103,7 +104,7 @@ TEST_P(ReduceArgMaxTest, ReduceArgMax) { // actual auto output = kernels::stackvm::reduce_arg(runtime::stackvm::reduce_arg_op_t::arg_max, - dt_int64, a.impl(), axis.impl(), + a.datatype(), a.impl(), axis.impl(), keepDims.impl(), select_last_idx.impl()) .expect("reduce_arg_max failed"); runtime_tensor actual(output.as().expect("as tensor failed")); diff --git a/tests/kernels/test_reduce_arg_min.cpp b/tests/kernels/test_reduce_arg_min.cpp index 1dc58d014d..d0473a097e 100644 --- a/tests/kernels/test_reduce_arg_min.cpp +++ b/tests/kernels/test_reduce_arg_min.cpp @@ -78,7 +78,8 @@ class ReduceArgMinTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMin, ReduceArgMinTest, - testing::Combine(testing::Values(dt_float32), testing::Values(dt_int64), + testing::Combine(testing::Values(dt_float64 /*dt_float32, dt_float16*/), + testing::Values(dt_int64), testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, dims_t{1, 3, 16}, dims_t{3, 16}, dims_t{16}), @@ -95,7 +96,7 @@ TEST_P(ReduceArgMinTest, ReduceArgMin) { void *ptr_ort = tensor_buffer(output_ort, &size); dims_t shape(tensor_rank(output_ort)); tensor_shape(output_ort, reinterpret_cast(shape.data())); - auto expected = hrt::create(dt_float64, shape, + auto expected = hrt::create(a.datatype(), shape, {reinterpret_cast(ptr_ort), size}, true, host_runtime_tensor::pool_cpu_only) .expect("create tensor failed"); @@ -103,7 +104,7 @@ TEST_P(ReduceArgMinTest, ReduceArgMin) { // actual auto output = kernels::stackvm::reduce_arg(runtime::stackvm::reduce_arg_op_t::arg_min, - dt_int64, a.impl(), axis.impl(), + a.datatype(), a.impl(), axis.impl(), keepDims.impl(), select_last_idx.impl()) .expect("reduce_arg_max failed"); runtime_tensor actual(output.as().expect("as tensor failed")); From 8b4f10262e5be29605895ca7e310fd55d54b48b1 Mon Sep 17 00:00:00 2001 From: hejunchao Date: Thu, 10 Aug 2023 16:30:07 +0800 Subject: [PATCH 2/5] fix reduce_arg's test --- tests/kernels/test_reduce_arg_max.cpp | 6 +++--- tests/kernels/test_reduce_arg_min.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/kernels/test_reduce_arg_max.cpp b/tests/kernels/test_reduce_arg_max.cpp index cddc796bca..a11534a103 100644 --- a/tests/kernels/test_reduce_arg_max.cpp +++ b/tests/kernels/test_reduce_arg_max.cpp @@ -78,7 +78,7 @@ class ReduceArgMaxTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMax, ReduceArgMaxTest, - testing::Combine(testing::Values(dt_float64 /*dt_float32, dt_float16*/), + testing::Combine(testing::Values(dt_float64, dt_float32/*, dt_int32, dt_int64*/), testing::Values(dt_int64), testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, dims_t{1, 3, 16}, dims_t{3, 16}, @@ -96,7 +96,7 @@ TEST_P(ReduceArgMaxTest, ReduceArgMax) { void *ptr_ort = tensor_buffer(output_ort, &size); dims_t shape(tensor_rank(output_ort)); tensor_shape(output_ort, reinterpret_cast(shape.data())); - auto expected = hrt::create(a.datatype(), shape, + auto expected = hrt::create(dt_int64, shape, {reinterpret_cast(ptr_ort), size}, true, host_runtime_tensor::pool_cpu_only) .expect("create tensor failed"); @@ -104,7 +104,7 @@ TEST_P(ReduceArgMaxTest, ReduceArgMax) { // actual auto output = kernels::stackvm::reduce_arg(runtime::stackvm::reduce_arg_op_t::arg_max, - a.datatype(), a.impl(), axis.impl(), + dt_int64, a.impl(), axis.impl(), keepDims.impl(), select_last_idx.impl()) .expect("reduce_arg_max failed"); runtime_tensor actual(output.as().expect("as tensor failed")); diff --git a/tests/kernels/test_reduce_arg_min.cpp b/tests/kernels/test_reduce_arg_min.cpp index d0473a097e..22dfdfe2ae 100644 --- a/tests/kernels/test_reduce_arg_min.cpp +++ b/tests/kernels/test_reduce_arg_min.cpp @@ -78,7 +78,7 @@ class ReduceArgMinTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMin, ReduceArgMinTest, - testing::Combine(testing::Values(dt_float64 /*dt_float32, dt_float16*/), + testing::Combine(testing::Values(dt_float64, dt_float32/*, dt_int32, dt_int64*/), testing::Values(dt_int64), testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, dims_t{1, 3, 16}, dims_t{3, 16}, @@ -96,7 +96,7 @@ TEST_P(ReduceArgMinTest, ReduceArgMin) { void *ptr_ort = tensor_buffer(output_ort, &size); dims_t shape(tensor_rank(output_ort)); tensor_shape(output_ort, reinterpret_cast(shape.data())); - auto expected = hrt::create(a.datatype(), shape, + auto expected = hrt::create(dt_int64, shape, {reinterpret_cast(ptr_ort), size}, true, host_runtime_tensor::pool_cpu_only) .expect("create tensor failed"); @@ -104,7 +104,7 @@ TEST_P(ReduceArgMinTest, ReduceArgMin) { // actual auto output = kernels::stackvm::reduce_arg(runtime::stackvm::reduce_arg_op_t::arg_min, - a.datatype(), a.impl(), axis.impl(), + dt_int64, a.impl(), axis.impl(), keepDims.impl(), select_last_idx.impl()) .expect("reduce_arg_max failed"); runtime_tensor actual(output.as().expect("as tensor failed")); From 85adb96aa41f6e3fe558750db1ead89c251cfa5c Mon Sep 17 00:00:00 2001 From: hejunchao Date: Thu, 10 Aug 2023 16:30:18 +0800 Subject: [PATCH 3/5] fix reduce_arg's test --- tests/kernels/test_reduce_arg_max.cpp | 15 +++++++-------- tests/kernels/test_reduce_arg_min.cpp | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/kernels/test_reduce_arg_max.cpp b/tests/kernels/test_reduce_arg_max.cpp index a11534a103..04469a7b1d 100644 --- a/tests/kernels/test_reduce_arg_max.cpp +++ b/tests/kernels/test_reduce_arg_max.cpp @@ -78,14 +78,13 @@ class ReduceArgMaxTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMax, ReduceArgMaxTest, - testing::Combine(testing::Values(dt_float64, dt_float32/*, dt_int32, dt_int64*/), - testing::Values(dt_int64), - testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, - dims_t{1, 3, 16}, dims_t{3, 16}, - dims_t{16}), - testing::Values(dims_t{1}), - testing::Values(-1, 0, 1, 2, 3, -2, -3, -4), - testing::Values(1, 0), testing::Values(1, 0))); + testing::Combine( + testing::Values(dt_float64, dt_float32 /*, dt_int32, dt_int64*/), + testing::Values(dt_int64), + testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, + dims_t{1, 3, 16}, dims_t{3, 16}, dims_t{16}), + testing::Values(dims_t{1}), testing::Values(-1, 0, 1, 2, 3, -2, -3, -4), + testing::Values(1, 0), testing::Values(1, 0))); TEST_P(ReduceArgMaxTest, ReduceArgMax) { diff --git a/tests/kernels/test_reduce_arg_min.cpp b/tests/kernels/test_reduce_arg_min.cpp index 22dfdfe2ae..d07a22ba0b 100644 --- a/tests/kernels/test_reduce_arg_min.cpp +++ b/tests/kernels/test_reduce_arg_min.cpp @@ -78,14 +78,13 @@ class ReduceArgMinTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMin, ReduceArgMinTest, - testing::Combine(testing::Values(dt_float64, dt_float32/*, dt_int32, dt_int64*/), - testing::Values(dt_int64), - testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, - dims_t{1, 3, 16}, dims_t{3, 16}, - dims_t{16}), - testing::Values(dims_t{1}), - testing::Values(-1, 0, 1, 2, 3, -2, -3, -4), - testing::Values(1, 0), testing::Values(1, 0))); + testing::Combine( + testing::Values(dt_float64, dt_float32 /*, dt_int32, dt_int64*/), + testing::Values(dt_int64), + testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, + dims_t{1, 3, 16}, dims_t{3, 16}, dims_t{16}), + testing::Values(dims_t{1}), testing::Values(-1, 0, 1, 2, 3, -2, -3, -4), + testing::Values(1, 0), testing::Values(1, 0))); TEST_P(ReduceArgMinTest, ReduceArgMin) { From cf47fe7c951135c1e3724dc2f1612c0a14d157c8 Mon Sep 17 00:00:00 2001 From: hejunchao Date: Thu, 10 Aug 2023 16:49:41 +0800 Subject: [PATCH 4/5] fix reduce_arg's test --- tests/kernels/test_reduce_arg_max.cpp | 4 +++- tests/kernels/test_reduce_arg_min.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/kernels/test_reduce_arg_max.cpp b/tests/kernels/test_reduce_arg_max.cpp index 04469a7b1d..ecea5094b3 100644 --- a/tests/kernels/test_reduce_arg_max.cpp +++ b/tests/kernels/test_reduce_arg_max.cpp @@ -79,7 +79,7 @@ class ReduceArgMaxTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMax, ReduceArgMaxTest, testing::Combine( - testing::Values(dt_float64, dt_float32 /*, dt_int32, dt_int64*/), + testing::Values(dt_float64, dt_float32, dt_int32 /*, dt_int64*/), testing::Values(dt_int64), testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, dims_t{1, 3, 16}, dims_t{3, 16}, dims_t{16}), @@ -112,6 +112,8 @@ TEST_P(ReduceArgMaxTest, ReduceArgMax) { cosine_similarity_tensor(expected, actual); if (!result) { + std::cout << "input "; + print_runtime_tensor(a); std::cout << "actual "; print_runtime_tensor(actual); std::cout << "expected "; diff --git a/tests/kernels/test_reduce_arg_min.cpp b/tests/kernels/test_reduce_arg_min.cpp index d07a22ba0b..bf745848a7 100644 --- a/tests/kernels/test_reduce_arg_min.cpp +++ b/tests/kernels/test_reduce_arg_min.cpp @@ -79,7 +79,7 @@ class ReduceArgMinTest : public KernelTest, INSTANTIATE_TEST_SUITE_P( ReduceArgMin, ReduceArgMinTest, testing::Combine( - testing::Values(dt_float64, dt_float32 /*, dt_int32, dt_int64*/), + testing::Values(dt_float64, dt_float32, dt_int32 /*, dt_int64*/), testing::Values(dt_int64), testing::Values(dims_t{1, 3, 16, 16}, dims_t{1, 2, 3, 4}, dims_t{1, 3, 16}, dims_t{3, 16}, dims_t{16}), @@ -112,6 +112,8 @@ TEST_P(ReduceArgMinTest, ReduceArgMin) { cosine_similarity_tensor(expected, actual); if (!result) { + std::cout << "input "; + print_runtime_tensor(a); std::cout << "actual "; print_runtime_tensor(actual); std::cout << "expected "; From 8c89725d538c0e404868caffb4c333fa7b8ad280 Mon Sep 17 00:00:00 2001 From: hejunchao Date: Thu, 10 Aug 2023 19:39:08 +0800 Subject: [PATCH 5/5] fix reduce_arg --- src/Native/src/kernels/stackvm/reference/reduce_arg.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Native/src/kernels/stackvm/reference/reduce_arg.cpp b/src/Native/src/kernels/stackvm/reference/reduce_arg.cpp index 6322017fe6..74cd0bd0de 100644 --- a/src/Native/src/kernels/stackvm/reference/reduce_arg.cpp +++ b/src/Native/src/kernels/stackvm/reference/reduce_arg.cpp @@ -60,10 +60,8 @@ result reduce_arg_impl(TReducer &&reducer, T init_value, const T *input, out_map[out_idx].clear(); out_map[out_idx].push_back(index[axes[0]]); dst = src; - } else if constexpr (std::is_same_v) { - if (fabs(src - dst) < epsilon) { - out_map[out_idx].push_back(index[axes[0]]); - } + } else if (std::fabs(src - dst) < epsilon) { + out_map[out_idx].push_back(index[axes[0]]); } return ok(); }));