Merge pull request #1583 from IntelPython/cleanup_logic_func

Clean up old implementation of logic functions

Author: npolina4

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,12 +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_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_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
@@ -214,15 +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_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
-                               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  */
@@ -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 */

dpnp/backend/kernels/dpnp_krnl_logic.cpp

@@ -667,47 +667,6 @@ DPCTLSyclEventRef (*dpnp_any_ext_c)(DPCTLSyclQueueRef,
         const DPCTLEventVectorRef) =                                           \
         __name__<_DataType_input1, _DataType_input2>;
 
-#include <dpnp_gen_2arg_2type_tbl.hpp>
-
-template <DPNPFuncType FT1, DPNPFuncType... FTs>
-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<FT1>,
-                                             func_type_map_t::find_type<FTs>>}),
-     ...);
-    ((fmap[DPNPFuncName::DPNP_FN_GREATER_EXT][FT1][FTs] =
-          {eft_BLN,
-           (void *)dpnp_greater_c_ext<func_type_map_t::find_type<FT1>,
-                                      func_type_map_t::find_type<FTs>>}),
-     ...);
-    ((fmap[DPNPFuncName::DPNP_FN_GREATER_EQUAL_EXT][FT1][FTs] =
-          {eft_BLN,
-           (void *)dpnp_greater_equal_c_ext<func_type_map_t::find_type<FT1>,
-                                            func_type_map_t::find_type<FTs>>}),
-     ...);
-    ((fmap[DPNPFuncName::DPNP_FN_LESS_EXT][FT1][FTs] =
-          {eft_BLN, (void *)dpnp_less_c_ext<func_type_map_t::find_type<FT1>,
-                                            func_type_map_t::find_type<FTs>>}),
-     ...);
-    ((fmap[DPNPFuncName::DPNP_FN_LESS_EQUAL_EXT][FT1][FTs] =
-          {eft_BLN,
-           (void *)dpnp_less_equal_c_ext<func_type_map_t::find_type<FT1>,
-                                         func_type_map_t::find_type<FTs>>}),
-     ...);
-    ((fmap[DPNPFuncName::DPNP_FN_NOT_EQUAL_EXT][FT1][FTs] =
-          {eft_BLN,
-           (void *)dpnp_not_equal_c_ext<func_type_map_t::find_type<FT1>,
-                                        func_type_map_t::find_type<FTs>>}),
-     ...);
-}
-
-template <DPNPFuncType... FTs>
-static void func_map_logic_2arg_2type_helper(func_map_t &fmap)
-{
-    ((func_map_logic_2arg_2type_core<FTs, FTs...>(fmap)), ...);
-}
-
 void func_map_init_logic(func_map_t &fmap)
 {
     fmap[DPNPFuncName::DPNP_FN_ALL][eft_BLN][eft_BLN] = {
@@ -798,8 +757,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<double, bool>};
 
-    func_map_logic_2arg_2type_helper<eft_BLN, eft_INT, eft_LNG, eft_FLT,
-                                     eft_DBL>(fmap);
-
     return;
 }