Bump Mojmelo for Mojo 0.26.2 (#226)

Author: yetalit

recipes/mojmelo/recipe.yaml

@@ -1,13 +1,13 @@
 context:
-  version: "0.1.1"
+  version: "0.1.2"
 
 package:
   name: "mojmelo"
   version: ${{ version }}
 
 source:
   - git: https://github.com/yetalit/mojmelo.git
-    rev: 3b6fecdde0a22212a03b86c34c54b57d44e529b8
+    rev: 0975d37f89084c831f63d98af1591cb4cc067cff
 
 build:
   number: 0
@@ -16,7 +16,7 @@ build:
     - mojo package pixi/mojmelo -o ${{ PREFIX }}/lib/mojo/mojmelo.mojopkg
 requirements:
   host:
-    - mojo-compiler =0.26.1
+    - mojo-compiler =0.26.2
   run:
     - ${{ pin_compatible('mojo-compiler') }}
 
@@ -27,7 +27,7 @@ tests:
           - mojo tests/setup.mojo
     requirements:
       run:
-        - mojo-compiler =0.26.1
+        - mojo-compiler =0.26.2
     files:
       recipe:
         - tests/setup.mojo

recipes/mojmelo/tests/mojmelo/utils/Matrix.mojo

@@ -1,6 +1,6 @@
 from .mojmelo_matmul import matmul
-from memory import memcpy, memset_zero
-import random
+from std.memory import memcpy, memset_zero
+import std.random as random
 
 struct Matrix(Copyable, ImplicitlyCopyable, Sized):
     var height: Int
@@ -11,7 +11,7 @@ struct Matrix(Copyable, ImplicitlyCopyable, Sized):
 
     # initialize from UnsafePointer
     @always_inline
-    fn __init__[src: DType = DType.float32](out self, data: UnsafePointer[Scalar[src], MutAnyOrigin], height: Int, width: Int, order: String = 'c'):
+    def __init__[src: DType = DType.float32](out self, data: UnsafePointer[Scalar[src], MutAnyOrigin], height: Int, width: Int, order: String = 'c'):
         self.height = height
         self.width = width
         self.size = height * width
@@ -24,7 +24,7 @@ struct Matrix(Copyable, ImplicitlyCopyable, Sized):
 
     # initialize by copying from UnsafePointer
     @always_inline
-    fn __init__(out self, height: Int, width: Int, data: UnsafePointer[Float32, MutAnyOrigin] = UnsafePointer[Float32, MutAnyOrigin](), order: String = 'c'):
+    def __init__(out self, height: Int, width: Int, data: UnsafePointer[Float32, MutAnyOrigin] = UnsafePointer[Float32, MutAnyOrigin](), order: String = 'c'):
         self.height = height
         self.width = width
         self.size = height * width
@@ -33,27 +33,27 @@ struct Matrix(Copyable, ImplicitlyCopyable, Sized):
         if data:
             memcpy(dest=self.data, src=data, count=self.size)
 
-    fn __copyinit__(out self, other: Self):
-        self.height = other.height
-        self.width = other.width
-        self.size = other.size
+    def __init__(out self, *, copy: Self):
+        self.height = copy.height
+        self.width = copy.width
+        self.size = copy.size
         self.data = alloc[Float32](self.size)
-        self.order = other.order
-        memcpy(dest=self.data, src=other.data, count=self.size)
+        self.order = copy.order
+        memcpy(dest=self.data, src=copy.data, count=self.size)
 
-    fn __moveinit__(out self, deinit existing: Self):
-        self.height = existing.height
-        self.width = existing.width
-        self.size = existing.size
-        self.data = existing.data
-        self.order = existing.order
-        #existing.height = existing.width = existing.size = 0
-        #existing.order = ''
-        #existing.data = UnsafePointer[Float32, MutAnyOrigin]()
+    def __init__(out self, *, deinit take: Self):
+        self.height = take.height
+        self.width = take.width
+        self.size = take.size
+        self.data = take.data
+        self.order = take.order
+        #take.height = take.width = take.size = 0
+        #take.order = ''
+        #take.data = UnsafePointer[Float32, MutAnyOrigin]()
 
     # access an element
     @always_inline
-    fn __getitem__(self, row: Int, column: Int) raises -> Float32:
+    def __getitem__(self, row: Int, column: Int) raises -> Float32:
         var loc: Int
         if self.order == 'c':
             loc = (row * self.width) + column
@@ -64,16 +64,16 @@ struct Matrix(Copyable, ImplicitlyCopyable, Sized):
         return self.data[loc]
 
     @always_inline
-    fn __del__(deinit self):
+    def __del__(deinit self):
         if self.data:
             self.data.free()
 
     @always_inline
-    fn __len__(self) -> Int:
+    def __len__(self) -> Int:
         return self.size
 
     @always_inline
-    fn __mul__(self, rhs: Self) raises -> Self:
+    def __mul__(self, rhs: Self) raises -> Self:
         if self.width != rhs.height:
             raise Error('Error: Cannot multiply matrices with shapes (' + String(self.height) + ', ' + String(self.width) + ') and (' + String(rhs.height) + ', ' + String(rhs.width) + ')')
 
@@ -102,18 +102,18 @@ struct Matrix(Copyable, ImplicitlyCopyable, Sized):
         return Matrix(C.data, self.height, rhs.width)
 
     @always_inline
-    fn __imul__(mut self, rhs: Self) raises:
+    def __imul__(mut self, rhs: Self) raises:
         self = self * rhs
 
     @staticmethod
     @always_inline
-    fn zeros(height: Int, width: Int, order: String = 'c') -> Matrix:
+    def zeros(height: Int, width: Int, order: String = 'c') -> Matrix:
         var mat = Matrix(height, width, order= order)
         memset_zero(mat.data, mat.size)
         return mat^
 
     @staticmethod
-    fn random(height: Int, width: Int, order: String = 'c') -> Matrix:
+    def random(height: Int, width: Int, order: String = 'c') -> Matrix:
         random.seed()
         var mat = Matrix(height, width, order= order)
         random.rand(mat.data, mat.size, min=0.0, max=1.0)