Skip to content

Commit 276fafb

Browse files
shssfshssf
authored
logic mod moved to desc partially. Also calls to fallback fixed (#761)
1 parent 7cb50f5 commit 276fafb

File tree

3 files changed

+131
-187
lines changed

3 files changed

+131
-187
lines changed

‎dpnp/dpnp_algo/dpnp_algo.pxd

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,17 @@ cpdef dparray dpnp_right_shift(object x1_obj, object x2_obj, object dtype=*, dpa
255255
"""
256256
Logic functions
257257
"""
258-
cpdef dparray dpnp_equal(dparray array1, input2)
259-
cpdef dparray dpnp_greater(dparray input1, input2)
260-
cpdef dparray dpnp_greater_equal(dparray input1, input2)
261-
cpdef dparray dpnp_isclose(dparray input1, input2, double rtol=*, double atol=*, cpp_bool equal_nan=*)
262-
cpdef dparray dpnp_less(dparray input1, input2)
263-
cpdef dparray dpnp_less_equal(dparray input1, input2)
264-
cpdef dparray dpnp_logical_and(dparray input1, dparray input2)
265-
cpdef dparray dpnp_logical_not(dparray input1)
266-
cpdef dparray dpnp_logical_or(dparray input1, dparray input2)
267-
cpdef dparray dpnp_logical_xor(dparray input1, dparray input2)
268-
cpdef dparray dpnp_not_equal(dparray input1, input2)
258+
cpdef dparray dpnp_equal(object array1, object input2)
259+
cpdef dparray dpnp_greater(object input1, object input2)
260+
cpdef dparray dpnp_greater_equal(object input1, object input2)
261+
cpdef dparray dpnp_isclose(object input1, object input2, double rtol=*, double atol=*, cpp_bool equal_nan=*)
262+
cpdef dparray dpnp_less(object input1, object input2)
263+
cpdef dparray dpnp_less_equal(object input1, object input2)
264+
cpdef dparray dpnp_logical_and(object input1, object input2)
265+
cpdef dparray dpnp_logical_not(object input1)
266+
cpdef dparray dpnp_logical_or(object input1, object input2)
267+
cpdef dparray dpnp_logical_xor(object input1, object input2)
268+
cpdef dparray dpnp_not_equal(object input1, object input2)
269269

270270

271271
"""

‎dpnp/dpnp_algo/dpnp_algo_logic.pyx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ __all__ += [
5757
ctypedef void(*custom_logic_1in_1out_func_ptr_t)(void * , void * , const size_t)
5858

5959

60-
cpdef dparray dpnp_all(dparray array1):
60+
cpdef dparray dpnp_all(dpnp_descriptor array1):
6161
cdef dparray result = dparray((1,), dtype=numpy.bool)
6262

6363
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(array1.dtype)
@@ -71,7 +71,7 @@ cpdef dparray dpnp_all(dparray array1):
7171
return result
7272

7373

74-
cpdef dparray dpnp_any(dparray array1):
74+
cpdef dparray dpnp_any(dpnp_descriptor array1):
7575
cdef dparray result = dparray((1,), dtype=numpy.bool)
7676

7777
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(array1.dtype)
@@ -85,7 +85,7 @@ cpdef dparray dpnp_any(dparray array1):
8585
return result
8686

8787

88-
cpdef dparray dpnp_equal(dparray array1, input2):
88+
cpdef dparray dpnp_equal(object array1, object input2):
8989
cdef dparray result = dparray(array1.shape, dtype=numpy.bool)
9090

9191
if isinstance(input2, int):
@@ -98,7 +98,7 @@ cpdef dparray dpnp_equal(dparray array1, input2):
9898
return result
9999

100100

101-
cpdef dparray dpnp_greater(dparray input1, input2):
101+
cpdef dparray dpnp_greater(object input1, object input2):
102102
input2_is_scalar = dpnp.isscalar(input2)
103103

104104
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
@@ -113,7 +113,7 @@ cpdef dparray dpnp_greater(dparray input1, input2):
113113
return result
114114

115115

116-
cpdef dparray dpnp_greater_equal(dparray input1, input2):
116+
cpdef dparray dpnp_greater_equal(object input1, object input2):
117117
input2_is_scalar = dpnp.isscalar(input2)
118118

119119
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
@@ -128,7 +128,7 @@ cpdef dparray dpnp_greater_equal(dparray input1, input2):
128128
return result
129129

130130

131-
cpdef dparray dpnp_isclose(dparray input1, input2, double rtol=1e-05, double atol=1e-08, cpp_bool equal_nan=False):
131+
cpdef dparray dpnp_isclose(object input1, object input2, double rtol=1e-05, double atol=1e-08, cpp_bool equal_nan=False):
132132
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
133133

134134
if isinstance(input2, int):
@@ -141,7 +141,7 @@ cpdef dparray dpnp_isclose(dparray input1, input2, double rtol=1e-05, double ato
141141
return result
142142

143143

144-
cpdef dparray dpnp_isfinite(dparray input1):
144+
cpdef dparray dpnp_isfinite(object input1):
145145
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
146146

147147
for i in range(result.size):
@@ -150,7 +150,7 @@ cpdef dparray dpnp_isfinite(dparray input1):
150150
return result
151151

152152

153-
cpdef dparray dpnp_isinf(dparray input1):
153+
cpdef dparray dpnp_isinf(object input1):
154154
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
155155

156156
for i in range(result.size):
@@ -159,7 +159,7 @@ cpdef dparray dpnp_isinf(dparray input1):
159159
return result
160160

161161

162-
cpdef dparray dpnp_isnan(dparray input1):
162+
cpdef dparray dpnp_isnan(object input1):
163163
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
164164

165165
for i in range(result.size):
@@ -168,7 +168,7 @@ cpdef dparray dpnp_isnan(dparray input1):
168168
return result
169169

170170

171-
cpdef dparray dpnp_less(dparray input1, input2):
171+
cpdef dparray dpnp_less(object input1, object input2):
172172
input2_is_scalar = dpnp.isscalar(input2)
173173

174174
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
@@ -183,7 +183,7 @@ cpdef dparray dpnp_less(dparray input1, input2):
183183
return result
184184

185185

186-
cpdef dparray dpnp_less_equal(dparray input1, input2):
186+
cpdef dparray dpnp_less_equal(object input1, object input2):
187187
input2_is_scalar = dpnp.isscalar(input2)
188188

189189
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
@@ -198,7 +198,7 @@ cpdef dparray dpnp_less_equal(dparray input1, input2):
198198
return result
199199

200200

201-
cpdef dparray dpnp_logical_and(dparray input1, dparray input2):
201+
cpdef dparray dpnp_logical_and(object input1, object input2):
202202
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
203203

204204
for i in range(result.size):
@@ -207,7 +207,7 @@ cpdef dparray dpnp_logical_and(dparray input1, dparray input2):
207207
return result
208208

209209

210-
cpdef dparray dpnp_logical_not(dparray input1):
210+
cpdef dparray dpnp_logical_not(object input1):
211211
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
212212

213213
for i in range(result.size):
@@ -216,7 +216,7 @@ cpdef dparray dpnp_logical_not(dparray input1):
216216
return result
217217

218218

219-
cpdef dparray dpnp_logical_or(dparray input1, dparray input2):
219+
cpdef dparray dpnp_logical_or(object input1, object input2):
220220
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
221221

222222
for i in range(result.size):
@@ -225,7 +225,7 @@ cpdef dparray dpnp_logical_or(dparray input1, dparray input2):
225225
return result
226226

227227

228-
cpdef dparray dpnp_logical_xor(dparray input1, dparray input2):
228+
cpdef dparray dpnp_logical_xor(object input1, object input2):
229229
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)
230230

231231
for i in range(result.size):
@@ -234,7 +234,7 @@ cpdef dparray dpnp_logical_xor(dparray input1, dparray input2):
234234
return result
235235

236236

237-
cpdef dparray dpnp_not_equal(dparray input1, input2):
237+
cpdef dparray dpnp_not_equal(object input1, object input2):
238238
input2_is_scalar = dpnp.isscalar(input2)
239239

240240
cdef dparray result = dparray(input1.shape, dtype=numpy.bool)

0 commit comments

Comments
 (0)