Skip to content

Commit 95a9e2d

Browse files
vtavanavtavana
authored
identity and tri with device keywords (#1577)
* identity and tri with device keywords * address comments
1 parent d76d44e commit 95a9e2d

File tree

9 files changed

+142
-149
lines changed

9 files changed

+142
-149
lines changed

‎dpnp/backend/include/dpnp_iface_fptr.hpp

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,6 @@ enum class DPNPFuncName : size_t
204204
extra parameters */
205205
DPNP_FN_HYPOT, /**< Used in numpy.hypot() impl */
206206
DPNP_FN_IDENTITY, /**< Used in numpy.identity() impl */
207-
DPNP_FN_IDENTITY_EXT, /**< Used in numpy.identity() impl, requires extra
208-
parameters */
209207
DPNP_FN_INITVAL, /**< Used in numpy ones, ones_like, zeros, zeros_like impls
210208
*/
211209
DPNP_FN_INITVAL_EXT, /**< Used in numpy ones, ones_like, zeros, zeros_like
@@ -438,19 +436,18 @@ enum class DPNPFuncName : size_t
438436
DPNP_FN_TAKE, /**< Used in numpy.take() impl */
439437
DPNP_FN_TAN, /**< Used in numpy.tan() impl */
440438
DPNP_FN_TANH, /**< Used in numpy.tanh() impl */
441-
DPNP_FN_TRANSPOSE, /**< Used in numpy.transpose() impl */
442-
DPNP_FN_TRACE, /**< Used in numpy.trace() impl */
443-
DPNP_FN_TRACE_EXT, /**< Used in numpy.trace() impl, requires extra
444-
parameters */
445-
DPNP_FN_TRAPZ, /**< Used in numpy.trapz() impl */
446-
DPNP_FN_TRAPZ_EXT, /**< Used in numpy.trapz() impl, requires extra
447-
parameters */
448-
DPNP_FN_TRI, /**< Used in numpy.tri() impl */
449-
DPNP_FN_TRI_EXT, /**< Used in numpy.tri() impl, requires extra parameters */
450-
DPNP_FN_TRIL, /**< Used in numpy.tril() impl */
451-
DPNP_FN_TRIU, /**< Used in numpy.triu() impl */
452-
DPNP_FN_TRUNC, /**< Used in numpy.trunc() impl */
453-
DPNP_FN_VANDER, /**< Used in numpy.vander() impl */
439+
DPNP_FN_TRANSPOSE, /**< Used in numpy.transpose() impl */
440+
DPNP_FN_TRACE, /**< Used in numpy.trace() impl */
441+
DPNP_FN_TRACE_EXT, /**< Used in numpy.trace() impl, requires extra
442+
parameters */
443+
DPNP_FN_TRAPZ, /**< Used in numpy.trapz() impl */
444+
DPNP_FN_TRAPZ_EXT, /**< Used in numpy.trapz() impl, requires extra
445+
parameters */
446+
DPNP_FN_TRI, /**< Used in numpy.tri() impl */
447+
DPNP_FN_TRIL, /**< Used in numpy.tril() impl */
448+
DPNP_FN_TRIU, /**< Used in numpy.triu() impl */
449+
DPNP_FN_TRUNC, /**< Used in numpy.trunc() impl */
450+
DPNP_FN_VANDER, /**< Used in numpy.vander() impl */
454451
DPNP_FN_VANDER_EXT, /**< Used in numpy.vander() impl, requires extra
455452
parameters */
456453
DPNP_FN_VAR, /**< Used in numpy.var() impl */

‎dpnp/backend/kernels/dpnp_krnl_arraycreation.cpp

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,6 @@ template <typename _DataType>
392392
void (*dpnp_identity_default_c)(void *,
393393
const size_t) = dpnp_identity_c<_DataType>;
394394

395-
template <typename _DataType>
396-
DPCTLSyclEventRef (*dpnp_identity_ext_c)(DPCTLSyclQueueRef,
397-
void *,
398-
const size_t,
399-
const DPCTLEventVectorRef) =
400-
dpnp_identity_c<_DataType>;
401-
402395
template <typename _DataType>
403396
class dpnp_ones_c_kernel;
404397

@@ -851,15 +844,6 @@ template <typename _DataType>
851844
void (*dpnp_tri_default_c)(void *, const size_t, const size_t, const int) =
852845
dpnp_tri_c<_DataType>;
853846

854-
template <typename _DataType>
855-
DPCTLSyclEventRef (*dpnp_tri_ext_c)(DPCTLSyclQueueRef,
856-
void *,
857-
const size_t,
858-
const size_t,
859-
const int,
860-
const DPCTLEventVectorRef) =
861-
dpnp_tri_c<_DataType>;
862-
863847
template <typename _DataType>
864848
DPCTLSyclEventRef dpnp_tril_c(DPCTLSyclQueueRef q_ref,
865849
void *array_in,
@@ -1265,21 +1249,6 @@ void func_map_init_arraycreation(func_map_t &fmap)
12651249
fmap[DPNPFuncName::DPNP_FN_IDENTITY][eft_C128][eft_C128] = {
12661250
eft_C128, (void *)dpnp_identity_default_c<std::complex<double>>};
12671251

1268-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_INT][eft_INT] = {
1269-
eft_INT, (void *)dpnp_identity_ext_c<int32_t>};
1270-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_LNG][eft_LNG] = {
1271-
eft_LNG, (void *)dpnp_identity_ext_c<int64_t>};
1272-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_FLT][eft_FLT] = {
1273-
eft_FLT, (void *)dpnp_identity_ext_c<float>};
1274-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_DBL][eft_DBL] = {
1275-
eft_DBL, (void *)dpnp_identity_ext_c<double>};
1276-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_BLN][eft_BLN] = {
1277-
eft_BLN, (void *)dpnp_identity_ext_c<bool>};
1278-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_C64][eft_C64] = {
1279-
eft_C64, (void *)dpnp_identity_ext_c<std::complex<float>>};
1280-
fmap[DPNPFuncName::DPNP_FN_IDENTITY_EXT][eft_C128][eft_C128] = {
1281-
eft_C128, (void *)dpnp_identity_ext_c<std::complex<double>>};
1282-
12831252
fmap[DPNPFuncName::DPNP_FN_ONES][eft_INT][eft_INT] = {
12841253
eft_INT, (void *)dpnp_ones_default_c<int32_t>};
12851254
fmap[DPNPFuncName::DPNP_FN_ONES][eft_LNG][eft_LNG] = {
@@ -1431,15 +1400,6 @@ void func_map_init_arraycreation(func_map_t &fmap)
14311400
fmap[DPNPFuncName::DPNP_FN_TRI][eft_DBL][eft_DBL] = {
14321401
eft_DBL, (void *)dpnp_tri_default_c<double>};
14331402

1434-
fmap[DPNPFuncName::DPNP_FN_TRI_EXT][eft_INT][eft_INT] = {
1435-
eft_INT, (void *)dpnp_tri_ext_c<int32_t>};
1436-
fmap[DPNPFuncName::DPNP_FN_TRI_EXT][eft_LNG][eft_LNG] = {
1437-
eft_LNG, (void *)dpnp_tri_ext_c<int64_t>};
1438-
fmap[DPNPFuncName::DPNP_FN_TRI_EXT][eft_FLT][eft_FLT] = {
1439-
eft_FLT, (void *)dpnp_tri_ext_c<float>};
1440-
fmap[DPNPFuncName::DPNP_FN_TRI_EXT][eft_DBL][eft_DBL] = {
1441-
eft_DBL, (void *)dpnp_tri_ext_c<double>};
1442-
14431403
fmap[DPNPFuncName::DPNP_FN_TRIL][eft_INT][eft_INT] = {
14441404
eft_INT, (void *)dpnp_tril_default_c<int32_t>};
14451405
fmap[DPNPFuncName::DPNP_FN_TRIL][eft_LNG][eft_LNG] = {

‎dpnp/dpnp_algo/dpnp_algo.pxd

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
108108
DPNP_FN_FMOD_EXT
109109
DPNP_FN_FULL
110110
DPNP_FN_FULL_LIKE
111-
DPNP_FN_IDENTITY
112-
DPNP_FN_IDENTITY_EXT
113111
DPNP_FN_INV
114112
DPNP_FN_INV_EXT
115113
DPNP_FN_KRON
@@ -242,8 +240,6 @@ cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName": # need this na
242240
DPNP_FN_TRANSPOSE
243241
DPNP_FN_TRAPZ
244242
DPNP_FN_TRAPZ_EXT
245-
DPNP_FN_TRI
246-
DPNP_FN_TRI_EXT
247243
DPNP_FN_TRIL
248244
DPNP_FN_TRIL_EXT
249245
DPNP_FN_TRIU

‎dpnp/dpnp_algo/dpnp_algo_arraycreation.pxi

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@ __all__ += [
3939
"dpnp_copy",
4040
"dpnp_diag",
4141
"dpnp_geomspace",
42-
"dpnp_identity",
4342
"dpnp_linspace",
4443
"dpnp_logspace",
4544
"dpnp_ptp",
4645
"dpnp_trace",
47-
"dpnp_tri",
4846
"dpnp_vander",
4947
]
5048

@@ -168,28 +166,6 @@ cpdef utils.dpnp_descriptor dpnp_geomspace(start, stop, num, endpoint, dtype, ax
168166
return result
169167

170168

171-
cpdef utils.dpnp_descriptor dpnp_identity(n, result_dtype):
172-
cdef DPNPFuncType dtype_in = dpnp_dtype_to_DPNPFuncType(result_dtype)
173-
174-
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_IDENTITY_EXT, dtype_in, DPNP_FT_NONE)
175-
176-
cdef shape_type_c shape_in = (n, n)
177-
cdef utils.dpnp_descriptor result = utils.create_output_descriptor(shape_in, kernel_data.return_type, None)
178-
179-
result_sycl_queue = result.get_array().sycl_queue
180-
181-
cdef c_dpctl.SyclQueue q = <c_dpctl.SyclQueue> result_sycl_queue
182-
cdef c_dpctl.DPCTLSyclQueueRef q_ref = q.get_queue_ref()
183-
184-
cdef fptr_1out_t func = <fptr_1out_t > kernel_data.ptr
185-
cdef c_dpctl.DPCTLSyclEventRef event_ref = func(q_ref, result.get_data(), n, NULL)
186-
187-
with nogil: c_dpctl.DPCTLEvent_WaitAndThrow(event_ref)
188-
c_dpctl.DPCTLEvent_Delete(event_ref)
189-
190-
return result
191-
192-
193169
def dpnp_linspace(start, stop, num, dtype=None, device=None, usm_type=None, sycl_queue=None, endpoint=True, retstep=False, axis=0):
194170
usm_type_alloc, sycl_queue_alloc = utils_py.get_usm_allocations([start, stop])
195171

@@ -401,32 +377,6 @@ cpdef utils.dpnp_descriptor dpnp_trace(utils.dpnp_descriptor arr, offset=0, axis
401377
return result
402378

403379

404-
cpdef utils.dpnp_descriptor dpnp_tri(N, M=None, k=0, dtype=dpnp.float):
405-
if M is None:
406-
M = N
407-
408-
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(dtype)
409-
410-
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_TRI_EXT, param1_type, param1_type)
411-
412-
cdef shape_type_c shape_in = (N, M)
413-
cdef utils.dpnp_descriptor result = utils.create_output_descriptor(shape_in, kernel_data.return_type, None)
414-
415-
result_sycl_queue = result.get_array().sycl_queue
416-
417-
cdef c_dpctl.SyclQueue q = <c_dpctl.SyclQueue> result_sycl_queue
418-
cdef c_dpctl.DPCTLSyclQueueRef q_ref = q.get_queue_ref()
419-
420-
cdef custom_indexing_1out_func_ptr_t func = <custom_indexing_1out_func_ptr_t > kernel_data.ptr
421-
422-
cdef c_dpctl.DPCTLSyclEventRef event_ref = func(q_ref, result.get_data(), N, M, k, NULL)
423-
424-
with nogil: c_dpctl.DPCTLEvent_WaitAndThrow(event_ref)
425-
c_dpctl.DPCTLEvent_Delete(event_ref)
426-
427-
return result
428-
429-
430380
cpdef utils.dpnp_descriptor dpnp_vander(utils.dpnp_descriptor x1, int N, int increasing):
431381
cdef DPNPFuncType param1_type = dpnp_dtype_to_DPNPFuncType(x1.dtype)
432382
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_VANDER_EXT, param1_type, DPNP_FT_NONE)

0 commit comments

Comments
 (0)