@@ -275,8 +275,7 @@ def test_empty_slice():
275
275
276
276
def test_slice_constructor_1d ():
277
277
Xh = np .arange (37 , dtype = "i4" )
278
- default_device = dpctl .select_default_device ()
279
- Xusm = dpt .from_numpy (Xh , device = default_device , usm_type = "device" )
278
+ Xusm = dpt .arange (Xh .size , dtype = "i4" )
280
279
for ind in [
281
280
slice (1 , None , 2 ),
282
281
slice (0 , None , 3 ),
@@ -293,9 +292,8 @@ def test_slice_constructor_1d():
293
292
294
293
295
294
def test_slice_constructor_3d ():
296
- Xh = np .empty ((37 , 24 , 35 ), dtype = "i4" )
297
- default_device = dpctl .select_default_device ()
298
- Xusm = dpt .from_numpy (Xh , device = default_device , usm_type = "device" )
295
+ Xh = np .ones ((37 , 24 , 35 ), dtype = "i4" )
296
+ Xusm = dpt .ones (Xh .shape , dtype = Xh .dtype )
299
297
for ind in [
300
298
slice (1 , None , 2 ),
301
299
slice (0 , None , 3 ),
@@ -315,8 +313,7 @@ def test_slice_constructor_3d():
315
313
@pytest .mark .parametrize ("usm_type" , ["device" , "shared" , "host" ])
316
314
def test_slice_suai (usm_type ):
317
315
Xh = np .arange (0 , 10 , dtype = "u1" )
318
- default_device = dpctl .select_default_device ()
319
- Xusm = dpt .from_numpy (Xh , device = default_device , usm_type = usm_type )
316
+ Xusm = dpt .arange (0 , 10 , dtype = "u1" , usm_type = usm_type )
320
317
for ind in [slice (2 , 3 , None ), slice (5 , 7 , None ), slice (3 , 9 , None )]:
321
318
assert np .array_equal (
322
319
dpm .as_usm_memory (Xusm [ind ]).copy_to_host (), Xh [ind ]
@@ -866,8 +863,7 @@ def test_pyx_capi_check_constants():
866
863
def test_tofrom_numpy (shape , dtype , usm_type ):
867
864
q = get_queue_or_skip ()
868
865
skip_if_dtype_not_supported (dtype , q )
869
- Xnp = np .zeros (shape , dtype = dtype )
870
- Xusm = dpt .from_numpy (Xnp , usm_type = usm_type , sycl_queue = q )
866
+ Xusm = dpt .zeros (shape , dtype = dtype , usm_type = usm_type , sycl_queue = q )
871
867
Ynp = np .ones (shape , dtype = dtype )
872
868
ind = (slice (None , None , None ),) * Ynp .ndim
873
869
Xusm [ind ] = Ynp
@@ -883,35 +879,30 @@ def test_tofrom_numpy(shape, dtype, usm_type):
883
879
def test_setitem_same_dtype (dtype , src_usm_type , dst_usm_type ):
884
880
q = get_queue_or_skip ()
885
881
skip_if_dtype_not_supported (dtype , q )
882
+ shape = (2 , 4 , 3 )
886
883
Xnp = (
887
- np .random .randint (- 10 , 10 , size = 2 * 3 * 4 )
884
+ np .random .randint (- 10 , 10 , size = np . prod ( shape ) )
888
885
.astype (dtype )
889
- .reshape (( 2 , 4 , 3 ) )
886
+ .reshape (shape )
890
887
)
891
- Znp = np .zeros (
892
- (
893
- 2 ,
894
- 4 ,
895
- 3 ,
896
- ),
897
- dtype = dtype ,
898
- )
899
- Zusm_0d = dpt .from_numpy (Znp [0 , 0 , 0 ], usm_type = dst_usm_type )
888
+ X = dpt .from_numpy (Xnp , usm_type = src_usm_type )
889
+ Z = dpt .zeros (shape , dtype = dtype , usm_type = dst_usm_type )
890
+ Zusm_0d = dpt .copy (Z [0 , 0 , 0 ])
900
891
ind = (- 1 , - 1 , - 1 )
901
- Xusm_0d = dpt . from_numpy ( Xnp [ind ], usm_type = src_usm_type )
892
+ Xusm_0d = X [ind ]
902
893
Zusm_0d [Ellipsis ] = Xusm_0d
903
894
assert np .array_equal (dpt .to_numpy (Zusm_0d ), Xnp [ind ])
904
- Zusm_1d = dpt .from_numpy ( Znp [0 , 1 :3 , 0 ], usm_type = dst_usm_type )
895
+ Zusm_1d = dpt .copy ( Z [0 , 1 :3 , 0 ])
905
896
ind = (- 1 , slice (0 , 2 , None ), - 1 )
906
- Xusm_1d = dpt . from_numpy ( Xnp [ind ], usm_type = src_usm_type )
897
+ Xusm_1d = X [ind ]
907
898
Zusm_1d [Ellipsis ] = Xusm_1d
908
899
assert np .array_equal (dpt .to_numpy (Zusm_1d ), Xnp [ind ])
909
- Zusm_2d = dpt .from_numpy ( Znp [:, 1 :3 , 0 ], usm_type = dst_usm_type )[::- 1 ]
910
- Xusm_2d = dpt . from_numpy ( Xnp [:, 1 :4 , - 1 ], usm_type = src_usm_type )
900
+ Zusm_2d = dpt .copy ( Z [:, 1 :3 , 0 ])[::- 1 ]
901
+ Xusm_2d = X [:, 1 :4 , - 1 ]
911
902
Zusm_2d [:] = Xusm_2d [:, 0 :2 ]
912
903
assert np .array_equal (dpt .to_numpy (Zusm_2d ), Xnp [:, 1 :3 , - 1 ])
913
- Zusm_3d = dpt .from_numpy ( Znp , usm_type = dst_usm_type )
914
- Xusm_3d = dpt . from_numpy ( Xnp , usm_type = src_usm_type )
904
+ Zusm_3d = dpt .copy ( Z )
905
+ Xusm_3d = X
915
906
Zusm_3d [:] = Xusm_3d
916
907
assert np .array_equal (dpt .to_numpy (Zusm_3d ), Xnp )
917
908
Zusm_3d [::- 1 ] = Xusm_3d [::- 1 ]
@@ -962,8 +953,8 @@ def test_setitem_errors():
962
953
def test_setitem_different_dtypes (src_dt , dst_dt ):
963
954
q = get_queue_or_skip ()
964
955
skip_if_dtype_not_supported (dst_dt , q )
965
- X = dpt .from_numpy ( np . ones (10 , src_dt ) , sycl_queue = q )
966
- Y = dpt .from_numpy ( np . zeros (10 , src_dt ) , sycl_queue = q )
956
+ X = dpt .ones (10 , src_dt , sycl_queue = q )
957
+ Y = dpt .zeros (10 , src_dt , sycl_queue = q )
967
958
Z = dpt .empty ((20 ,), dtype = dst_dt , sycl_queue = q )
968
959
Z [::2 ] = X
969
960
Z [1 ::2 ] = Y
0 commit comments