From 678f336a716dc37d77b43c4bea9c30dbb2fcd6a1 Mon Sep 17 00:00:00 2001 From: Natalia Polina Date: Tue, 10 Oct 2023 11:42:34 -0500 Subject: [PATCH 1/2] Clean up old implementation of logic functions --- dpnp/backend/include/dpnp_iface_fptr.hpp | 12 ------- dpnp/backend/kernels/dpnp_krnl_logic.cpp | 43 ------------------------ 2 files changed, 55 deletions(-) diff --git a/dpnp/backend/include/dpnp_iface_fptr.hpp b/dpnp/backend/include/dpnp_iface_fptr.hpp index 51f803275959..a1be5887192a 100644 --- a/dpnp/backend/include/dpnp_iface_fptr.hpp +++ b/dpnp/backend/include/dpnp_iface_fptr.hpp @@ -158,8 +158,6 @@ enum class DPNPFuncName : size_t DPNP_FN_EIGVALS, /**< Used in numpy.linalg.eigvals() impl */ DPNP_FN_EIGVALS_EXT, /**< Used in numpy.linalg.eigvals() impl, requires extra parameters */ - DPNP_FN_EQUAL_EXT, /**< Used in numpy.equal() impl, requires extra - parameters */ DPNP_FN_ERF, /**< Used in scipy.special.erf impl */ DPNP_FN_ERF_EXT, /**< Used in scipy.special.erf impl, requires extra parameters */ @@ -196,10 +194,6 @@ enum class DPNPFuncName : size_t */ DPNP_FN_FULL, /**< Used in numpy.full() impl */ DPNP_FN_FULL_LIKE, /**< Used in numpy.full_like() impl */ - DPNP_FN_GREATER_EXT, /**< Used in numpy.greater() impl, requires extra - parameters */ - DPNP_FN_GREATER_EQUAL_EXT, /**< Used in numpy.greater_equal() impl, requires - extra parameters */ DPNP_FN_HYPOT, /**< Used in numpy.hypot() impl */ DPNP_FN_IDENTITY, /**< Used in numpy.identity() impl */ DPNP_FN_INITVAL, /**< Used in numpy ones, ones_like, zeros, zeros_like impls @@ -214,10 +208,6 @@ enum class DPNPFuncName : size_t DPNP_FN_KRON_EXT, /**< Used in numpy.kron() impl, requires extra parameters */ DPNP_FN_LEFT_SHIFT, /**< Used in numpy.left_shift() impl */ - DPNP_FN_LESS_EXT, /**< Used in numpy.less() impl, requires extra parameters - */ - DPNP_FN_LESS_EQUAL_EXT, /**< Used in numpy.less_equal() impl, requires extra - parameters */ DPNP_FN_LOG, /**< Used in numpy.log() impl */ DPNP_FN_LOG10, /**< Used in numpy.log10() impl */ DPNP_FN_LOG10_EXT, /**< Used in numpy.log10() impl, requires extra @@ -259,8 +249,6 @@ enum class DPNPFuncName : size_t parameters */ DPNP_FN_NEGATIVE, /**< Used in numpy.negative() impl */ DPNP_FN_NONZERO, /**< Used in numpy.nonzero() impl */ - DPNP_FN_NOT_EQUAL_EXT, /**< Used in numpy.not_equal() impl, requires extra - parameters */ DPNP_FN_ONES, /**< Used in numpy.ones() impl */ DPNP_FN_ONES_LIKE, /**< Used in numpy.ones_like() impl */ DPNP_FN_PARTITION, /**< Used in numpy.partition() impl */ diff --git a/dpnp/backend/kernels/dpnp_krnl_logic.cpp b/dpnp/backend/kernels/dpnp_krnl_logic.cpp index 429f9d96f1ea..f54b89cdce40 100644 --- a/dpnp/backend/kernels/dpnp_krnl_logic.cpp +++ b/dpnp/backend/kernels/dpnp_krnl_logic.cpp @@ -667,46 +667,6 @@ DPCTLSyclEventRef (*dpnp_any_ext_c)(DPCTLSyclQueueRef, const DPCTLEventVectorRef) = \ __name__<_DataType_input1, _DataType_input2>; -#include - -template -static void func_map_logic_2arg_2type_core(func_map_t &fmap) -{ - ((fmap[DPNPFuncName::DPNP_FN_EQUAL_EXT][FT1][FTs] = - {eft_BLN, (void *)dpnp_equal_c_ext, - func_type_map_t::find_type>}), - ...); - ((fmap[DPNPFuncName::DPNP_FN_GREATER_EXT][FT1][FTs] = - {eft_BLN, - (void *)dpnp_greater_c_ext, - func_type_map_t::find_type>}), - ...); - ((fmap[DPNPFuncName::DPNP_FN_GREATER_EQUAL_EXT][FT1][FTs] = - {eft_BLN, - (void *)dpnp_greater_equal_c_ext, - func_type_map_t::find_type>}), - ...); - ((fmap[DPNPFuncName::DPNP_FN_LESS_EXT][FT1][FTs] = - {eft_BLN, (void *)dpnp_less_c_ext, - func_type_map_t::find_type>}), - ...); - ((fmap[DPNPFuncName::DPNP_FN_LESS_EQUAL_EXT][FT1][FTs] = - {eft_BLN, - (void *)dpnp_less_equal_c_ext, - func_type_map_t::find_type>}), - ...); - ((fmap[DPNPFuncName::DPNP_FN_NOT_EQUAL_EXT][FT1][FTs] = - {eft_BLN, - (void *)dpnp_not_equal_c_ext, - func_type_map_t::find_type>}), - ...); -} - -template -static void func_map_logic_2arg_2type_helper(func_map_t &fmap) -{ - ((func_map_logic_2arg_2type_core(fmap)), ...); -} void func_map_init_logic(func_map_t &fmap) { @@ -798,8 +758,5 @@ void func_map_init_logic(func_map_t &fmap) fmap[DPNPFuncName::DPNP_FN_ANY][eft_DBL][eft_DBL] = { eft_DBL, (void *)dpnp_any_default_c}; - func_map_logic_2arg_2type_helper(fmap); - return; } From 5869e1fa5f156c203369d1da1167b83cca4fe0a9 Mon Sep 17 00:00:00 2001 From: Natalia Polina Date: Tue, 10 Oct 2023 11:48:30 -0500 Subject: [PATCH 2/2] Fix pre-commit --- dpnp/backend/include/dpnp_iface_fptr.hpp | 14 +++++++------- dpnp/backend/kernels/dpnp_krnl_logic.cpp | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dpnp/backend/include/dpnp_iface_fptr.hpp b/dpnp/backend/include/dpnp_iface_fptr.hpp index a1be5887192a..8a99ca4ec68e 100644 --- a/dpnp/backend/include/dpnp_iface_fptr.hpp +++ b/dpnp/backend/include/dpnp_iface_fptr.hpp @@ -194,8 +194,8 @@ enum class DPNPFuncName : size_t */ DPNP_FN_FULL, /**< Used in numpy.full() impl */ DPNP_FN_FULL_LIKE, /**< Used in numpy.full_like() impl */ - DPNP_FN_HYPOT, /**< Used in numpy.hypot() impl */ - DPNP_FN_IDENTITY, /**< Used in numpy.identity() impl */ + DPNP_FN_HYPOT, /**< Used in numpy.hypot() impl */ + DPNP_FN_IDENTITY, /**< Used in numpy.identity() impl */ DPNP_FN_INITVAL, /**< Used in numpy ones, ones_like, zeros, zeros_like impls */ DPNP_FN_INITVAL_EXT, /**< Used in numpy ones, ones_like, zeros, zeros_like @@ -208,11 +208,11 @@ enum class DPNPFuncName : size_t DPNP_FN_KRON_EXT, /**< Used in numpy.kron() impl, requires extra parameters */ DPNP_FN_LEFT_SHIFT, /**< Used in numpy.left_shift() impl */ - DPNP_FN_LOG, /**< Used in numpy.log() impl */ - DPNP_FN_LOG10, /**< Used in numpy.log10() impl */ - DPNP_FN_LOG10_EXT, /**< Used in numpy.log10() impl, requires extra - parameters */ - DPNP_FN_LOG2, /**< Used in numpy.log2() impl */ + DPNP_FN_LOG, /**< Used in numpy.log() impl */ + DPNP_FN_LOG10, /**< Used in numpy.log10() impl */ + DPNP_FN_LOG10_EXT, /**< Used in numpy.log10() impl, requires extra + parameters */ + DPNP_FN_LOG2, /**< Used in numpy.log2() impl */ DPNP_FN_LOG2_EXT, /**< Used in numpy.log2() impl, requires extra parameters */ DPNP_FN_LOG1P, /**< Used in numpy.log1p() impl */ diff --git a/dpnp/backend/kernels/dpnp_krnl_logic.cpp b/dpnp/backend/kernels/dpnp_krnl_logic.cpp index f54b89cdce40..fc28b5f05fb4 100644 --- a/dpnp/backend/kernels/dpnp_krnl_logic.cpp +++ b/dpnp/backend/kernels/dpnp_krnl_logic.cpp @@ -667,7 +667,6 @@ DPCTLSyclEventRef (*dpnp_any_ext_c)(DPCTLSyclQueueRef, const DPCTLEventVectorRef) = \ __name__<_DataType_input1, _DataType_input2>; - void func_map_init_logic(func_map_t &fmap) { fmap[DPNPFuncName::DPNP_FN_ALL][eft_BLN][eft_BLN] = {