Skip to content

Commit eb8fbef

Browse files
shivasankarkashivasankarka
committed
fixed tests
1 parent 5c4574b commit eb8fbef

File tree

2 files changed

+50
-136
lines changed

2 files changed

+50
-136
lines changed

‎test.mojo‎

Lines changed: 49 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,15 @@ fn test_bool_masks2() raises:
218218
print(temp3.ndshape, temp3.stride, temp3.ndshape.ndsize)
219219

220220

221-
fn test_creation_routines() raises:
222-
var x = linspace[numojo.f32](0.0, 60.0, 60)
223-
var y = ones[numojo.f32](3, 2)
224-
var z = logspace[numojo.f32](-3, 0, 60)
225-
var w = arange[f32](0.0, 24.0, step=1)
226-
print(x)
227-
print(y)
228-
print(z)
229-
print(w)
221+
# fn test_creation_routines() raises:
222+
# var x = linspace[numojo.f32](0.0, 60.0, 60)
223+
# var y = ones[numojo.f32](shape(3, 2))
224+
# var z = logspace[numojo.f32](-3, 0, 60)
225+
# var w = arange[f32](0.0, 24.0, step=1)
226+
# print(x)
227+
# print(y)
228+
# print(z)
229+
# print(w)
230230

231231

232232
fn test_slicing() raises:
@@ -267,6 +267,33 @@ fn test_slicing() raises:
267267
print(slicedy3)
268268
# print("Time taken: ", (time.now() - start)/1e9/10)
269269

270+
# var np = Python.import_module("numpy")
271+
# y = nm.arange[nm.f32](0.0, 24.0, step=1)
272+
# y.reshape(2, 3, 4, order="C")
273+
# np_y = np.arange(0, 24, dtype=np.float32).reshape(2, 3, 4, order="C")
274+
# print(y)
275+
# print(np_y)
276+
# print()
277+
# # Test slicing
278+
# slicedy = y[:, :, 1:2]
279+
# print("slicedy: ", slicedy)
280+
# np_slicedy = np.take(
281+
# np.take(
282+
# np.take(np_y, np.arange(0, 2), axis=0), np.arange(0, 3), axis=1
283+
# ),
284+
# np.arange(1, 2),
285+
# axis=2,
286+
# )
287+
# print("np_slicedy: ", np_slicedy)
288+
# np_slicedy = np.squeeze(
289+
# np_slicedy, axis=2
290+
# ) # Remove the dimension with size 1
291+
# var np_arr = slicedy.to_numpy()
292+
# print()
293+
# print(np_arr)
294+
# print(np_slicedy)
295+
# print(np.all(np.equal(np_arr, np_slicedy)))
296+
270297

271298
fn test_rand_funcs[
272299
dtype: DType = DType.float64
@@ -331,18 +358,19 @@ def test_solve():
331358

332359
fn test_setter() raises:
333360
print("Testing setter")
334-
# var A = NDArray[i16](2, 3, 2, fill=Scalar[i16](1))
335-
# var B = NDArray[i16](3, 2, fill=Scalar[i16](2))
336-
# A[0] = B
337-
# print(A)
361+
var A = nm.full[i16](3, 3, 3, fill_value=1)
362+
var B = nm.full[i16](3, 3, fill_value=2)
363+
A[0] = B
364+
print(A)
338365

339-
var A = ndarray[i16](3, 3, 3, fill=Scalar[i16](1))
340-
print("1: ", A)
341-
var D = nm.random.rand[i16](3, 3, min=0, max=100)
342-
A[1] = D # sets the elements of A[1:2, :, :] with the array `D`
343-
print("2: ", A)
344-
A[:, 0:1, :] = D # sets the elements of A[:, 0:1, :] with the array `D`
345-
print("3: ", A)
366+
var A1 = nm.full[i16](3, 4, 5, fill_value=1)
367+
print("A1: ", A1)
368+
var D1 = nm.random.rand[i16](3, 5, min=0, max=100)
369+
A1[:, 0:1, :] = D1 # sets the elements of A[:, 0:1, :] with the array `D`
370+
print("A3: ", A1)
371+
var D = nm.random.rand[i16](4, 5, min=0, max=100)
372+
A1[1] = D # sets the elements of A[1:2, :, :] with the array `D`
373+
print("A2: ", A1)
346374

347375

348376
fn main() raises:
@@ -358,119 +386,4 @@ fn main() raises:
358386
# test_inv()
359387
# test_solve()
360388
# test_linalg()
361-
test_setter()
362-
363-
364-
# var x = numojo.full[numojo.f32](3, 2, fill_value=16.0)
365-
# var x = numojo.NDArray[numojo.f32](data=List[SIMD[numojo.f32, 1]](1,2,3,4,5,6,7,8,9,10,11,12), shape=List[Int](2,3,2),
366-
# order="F")
367-
# print(x)
368-
# print(x.stride)
369-
# var y = numojo.NDArray[numojo.f32](data=List[SIMD[numojo.f32, 1]](1,2,3,4,5,6,7,8,9,10,11,12), shape=List[Int](2,3,2),
370-
# order="C")
371-
# print(y)
372-
# print(y.stride)
373-
# print()
374-
# var summed = numojo.stats.sum(x,0)
375-
# print(summed)
376-
# print(numojo.stats.mean(x,0))
377-
# print(numojo.stats.cumprod(x))
378-
379-
# var maxval = x.max(axis=0)
380-
# print(maxval)
381-
382-
383-
# var array = nj.NDArray[nj.f64](10,10)
384-
# for i in range(array.size()):
385-
# array[i] = i
386-
# # for i in range(10):
387-
# # for j in range(10):
388-
# # print(array[i, j])
389-
# var res = array.sum(axis=0)
390-
# print(res)
391-
392-
# var arr2 = numojo.NDArray[numojo.f32](data=List[SIMD[numojo.f32, 1]](1.0, 2.0, 4.0, 7.0, 11.0, 16.0),
393-
# shape=List[Int](6))
394-
# var np = Python.import_module("numpy")
395-
# var np_arr = numojo.to_numpy(arr2)
396-
# print(np_arr)
397-
# var result = numojo.math.calculus.differentiation.gradient[numojo.f32](arr2, spacing=1.0)
398-
# print(result)
399-
# print(arr1.any())
400-
# print(arr1.all())
401-
# print(arr1.argmax())
402-
# print(arr1.argmin())
403-
# print(arr1.astype[numojo.i16]())
404-
# print(arr1.flatten(inplace=True))
405-
# print(r.ndshape, r.stride, r.ndshape.ndsize)
406-
# var t0 = time.now()
407-
# var res = numojo.math.linalg.matmul_tiled_unrolled_parallelized[numojo.f32](arr, arr1)
408-
# print((time.now()-t0)/1e9)
409-
# var res = numojo.math.linalg.matmul_tiled_unrolled_parallelized[numojo.f32](arr, arr1)
410-
# print(res)
411-
# print(arr)
412-
# print("2x3x1")
413-
# var sliced = arr[:, :, 1:2]
414-
# print(sliced)
415-
416-
# print("1x3x4")
417-
# var sliced1 = arr[::2, :]
418-
# print(sliced1)
419-
420-
# print("1x3x1")
421-
# var sliced2 = arr[1:2, :, 2:3]
422-
# print(sliced2)
423-
424-
# var result = numojo.NDArray(3, 3)
425-
# numojo.math.linalg.dot[t10=3, t11=3, t21=3, dtype=numojo.f32](result, arr, arr1)
426-
# print(result)
427-
428-
429-
# fn main() raises:
430-
# var size:VariadicList[Int] = VariadicList[Int](16,128,256,512,1024)
431-
# alias size1: StaticIntTuple[5] = StaticIntTuple[5](16,128,256,512,1024)
432-
# var times:List[Float64] = List[Float64]()
433-
# alias type:DType = DType.float64
434-
# measure_time[type, size1](size, times)
435-
436-
# fn measure_time[dtype:DType, size1: StaticIntTuple[5]](size:VariadicList[Int], inout times:List[Float64]) raises:
437-
438-
# for i in range(size.__len__()):
439-
# var arr1 = numojo.NDArray[dtype](size[i], size[i])
440-
# var arr2 = numojo.NDArray[dtype](size[i], size[i])
441-
# var arr_mul = numojo.NDArray[dtype](size[i], size[i])
442-
443-
# var t0 = time.now()
444-
# @parameter
445-
# for i in range(50):
446-
# numojo.math.linalg.dot[t10=size1[i], t11=size1[i], t21=size1[i], dtype=dtype](arr_mul, arr1, arr2)
447-
# # var arr_mul = numojo.math.linalg.matmul_parallelized[dtype](arr1, arr2)
448-
# # var arr_mul = numojo.math.linalg.matmul_tiled_unrolled_parallelized[dtype](arr1, arr2)
449-
# keep(arr_mul.unsafe_ptr())
450-
# times.append(((time.now()-t0)/1e9)/50)
451-
452-
# for i in range(size.__len__()):
453-
# print(times[i])
454-
455-
# fn main() raises:
456-
# alias type:DType = DType.float16
457-
# measure_time[type]()
458-
459-
# fn measure_time[dtype:DType]() raises:
460-
# var size:VariadicList[Int] = VariadicList[Int](16,128,256,512,1024)
461-
# alias size1: StaticIntTuple[5] = StaticIntTuple[5](16,128,256,512,1024)
462-
463-
# var n = 4
464-
# alias m = 4
465-
# var arr1 = numojo.NDArray[dtype](size[n], size[n])
466-
# var arr2 = numojo.NDArray[dtype](size[n], size[n])
467-
# var arr_mul = numojo.NDArray[dtype](size[n], size[n])
468-
469-
# var t0 = time.now()
470-
471-
# for _ in range(50):
472-
# numojo.math.linalg.dot[t10=size1[m], t11=size1[m], t21=size1[m], dtype=dtype](arr_mul, arr1, arr2)
473-
# # var arr_mul = numojo.math.linalg.matmul_parallelized[dtype](arr1, arr2)
474-
# # var arr_mul = numojo.math.linalg.matmul_tiled_unrolled_parallelized[dtype](arr1, arr2)
475-
# keep(arr_mul.unsafe_ptr())
476-
# print(((time.now()-t0)/1e9)/50)
389+
test_setter()

‎tests/test_slicing.mojo‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def test_slicing_getter5():
106106
)
107107
check(nm_slice5, np_sliced5, "3D array slicing (C-order) [1, :, 1:3]")
108108

109+
109110
# def test_slicing_setter1():
110111
# var np = Python.import_module("numpy")
111112

0 commit comments

Comments
 (0)