Bump Mojmelo for MAX 25.5 (#165)

Author: yetalit

recipes/mojmelo/recipe.yaml

@@ -1,13 +1,13 @@
 context:
-  version: "0.0.75"
+  version: "0.0.8"
 
 package:
   name: "mojmelo"
   version: ${{ version }}
 
 source:
   - git: https://github.com/yetalit/mojmelo.git
-    rev: db1118cbb1eb845de10012d72113080d15f0d9c6
+    rev: 04f2b8b4c2a8e495b8e05ad7d7554e1b644df66d
 
 build:
   number: 0
@@ -16,7 +16,7 @@ build:
     - mojo package pixi/mojmelo -o ${{ PREFIX }}/lib/mojo/mojmelo.mojopkg
 requirements:
   host:
-    - max =25.4
+    - max =25.5
   run:
     - ${{ pin_compatible('max') }}
 
@@ -27,7 +27,7 @@ tests:
           - mojo tests/setup.mojo
     requirements:
       run:
-        - max =25.4
+        - max =25.5
     files:
       recipe:
         - tests/setup.mojo

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

@@ -1,5 +1,5 @@
 from .mojmelo_matmul import matmul
-from memory import memcpy, memset_zero, UnsafePointer
+from memory import memcpy, memset_zero
 import random
 
 struct Matrix(Copyable, Movable, Sized):
@@ -37,15 +37,15 @@ struct Matrix(Copyable, Movable, Sized):
         self.order = other.order
         memcpy(self.data, other.data, self.size)
 
-    fn __moveinit__(out self, owned existing: Self):
+    fn __moveinit__(out self, var 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]()
+        #existing.height = existing.width = existing.size = 0
+        #existing.order = ''
+        #existing.data = UnsafePointer[Float32]()
 
     # access an element
     @always_inline
@@ -60,7 +60,7 @@ struct Matrix(Copyable, Movable, Sized):
         return self.data[loc]
 
     @always_inline
-    fn __del__(owned self):
+    fn __del__(var self):
         if self.data:
             self.data.free()
 

recipes/mojmelo/tests/mojmelo/utils/mojmelo_matmul/matmul.mojo

@@ -2,8 +2,7 @@
 
 from algorithm import vectorize, parallelize
 from memory.memory import _malloc, stack_allocation
-from memory import UnsafePointer
-from sys import has_avx512f, num_performance_cores, simdwidthof, sizeof
+from sys import CompilationTarget, num_performance_cores, simdwidthof, sizeof
 import benchmark
 from testing import assert_equal
 from utils import IndexList
@@ -33,9 +32,8 @@ fn intsqrt[n: Int]() -> Int:
     return x
 
 
-@value
 @register_passable("trivial")
-struct Layout(Writable):
+struct Layout(Copyable, Movable, Writable):
     var shape: IndexList[2]
     var strides: IndexList[2]
 
@@ -70,7 +68,7 @@ struct Matrix[Type: DType]:
 
     @always_inline("nodebug")
     fn __init__(
-        out self, data: UnsafePointer[Scalar[Type]], owned layout: Layout
+        out self, data: UnsafePointer[Scalar[Type]], var layout: Layout
     ):
         self.data = UnsafePointer[Scalar[Type]](data)
         self.layout = layout
@@ -445,7 +443,7 @@ fn matmul_params[Type: DType]() -> IndexList[5]:
     alias mc = 8192 // sizeof[Type]()  # fix this for simplicity
     alias N = simdwidthof[Type]()
 
-    alias Vectors = 32 if has_avx512f() else 16
+    alias Vectors = 32 if CompilationTarget.has_avx512f() else 16
 
     @parameter
     fn compute_kc[mr: Int, nr: Int]() -> Int:
@@ -474,7 +472,7 @@ fn matmul_params[Type: DType]() -> IndexList[5]:
         if Type is DType.int64:
 
             @parameter
-            if has_avx512f():
+            if CompilationTarget.has_avx512f():
                 alias TempVectors = 2
                 return compute_params[Vectors - TempVectors]()
             else:

recipes/mojmelo/tests/setup.mojo

@@ -1,6 +1,5 @@
-from sys import external_call, os_is_linux, os_is_macos, argv
+from sys import external_call, CompilationTarget, argv
 from sys.ffi import *
-from memory import UnsafePointer
 
 fn cachel1() -> Int32:
     var l1_cache_size: c_int = 0
@@ -93,7 +92,7 @@ fn main() raises:
         cache_l2_size = 0
         cache_l1_associativity = 0
         cache_l2_associativity = 0
-        if os_is_linux():
+        if CompilationTarget.is_linux():
             with open("/sys/devices/system/cpu/cpu0/cache/index0/size", "r") as f:
                 txt = f.read()
                 if txt.find('K') != -1:
@@ -116,7 +115,7 @@ fn main() raises:
                     cache_l2_associativity = atol(f.read())
             except:
                 cache_l2_associativity = 0
-        elif os_is_macos():
+        elif CompilationTarget.is_macos():
             cache_l1_size = Int(cachel1())
             cache_l2_size = Int(cachel2())
         initialize(cache_l1_size, cache_l1_associativity, cache_l2_size, cache_l2_associativity)