Merge branch 'main' into main

Author: bgreni

recipes/ExtraMojo/recipe.yaml

@@ -1,14 +1,14 @@
 context:
-  version: "0.17.0"
-  mojo_version: "=25.5"
+  version: "0.19.0"
+  mojo_version: "=0.25.7"
 
 package:
   name: "extramojo"
   version: ${{ version }}
 
 source:
   - git: https://github.com/ExtraMojo/ExtraMojo.git
-    rev: 608ca09f3b2e201b8c163f466966af48fa99e1c2
+    rev: 6afbfc66b7d9840c82a20ea1090443934e31b673
   # path: .
   # use_gitignore: true
 
@@ -28,8 +28,7 @@ tests:
   - script:
       - if: unix
         then:
-          - mojo run -I . tests/test_file.mojo
-          - mojo test -I . tests
+          - sh -c 'find ./tests -name test_*.mojo | xargs -I % pixi run mojo run -I . -D ASSERT=all %'
     requirements:
       build:
         - mojo ${{ mojo_version }}

recipes/emberjson/recipe.yaml

@@ -1,14 +1,13 @@
 context:
-  version: 0.2.0
-  mojo_version: "=0.25.6"
+  version: 0.2.1
 
 package:
   name: "emberjson"
   version: ${{ version }}
 
 source:
  - git: https://github.com/bgreni/EmberJson.git
-   rev: 5a456cc8286753d3fcdc5686f0ec48fe2dcee316
+   rev: 6c6ed09fba6c426546e099af886deb53824bb4ba
 
 build:
   number: 0
@@ -17,22 +16,28 @@ build:
 
 requirements:
   host:
-    - mojo-compiler =0.25.6
+    - mojo-compiler =0.25.7
   build:
-    - mojo-compiler ${{ mojo_version }}
+    - mojo-compiler =0.25.7
   run:
     - ${{ pin_compatible('mojo-compiler') }}
 
 tests:
   - script:
     - if: unix
       then:
-        - mojo test
+        - python run_tests.py
+    files:
+      source:
+        - run_tests.py
+        - test/
+        - emberjson/
+        - bench_data/
     requirements:
       build:
-        - mojo ${{ mojo_version }}
+        - mojo =0.25.7
       run:
-        - mojo ${{ mojo_version }}
+        - mojo =0.25.7
 
 about:
   homepage: https://github.com/bgreni/EmberJson

recipes/ish/recipe.yaml

@@ -1,9 +1,9 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/prefix-dev/recipe-format/main/schema.json
 
 context:
-  version: "1.3.0"
-  modular_version: "=25.4"
-  extramojo_version: "=0.15"
+  version: "1.4.0"
+  mojo_version: "=0.25.6"
+  extramojo_version: "=0.18"
 
 
 package:
@@ -12,9 +12,7 @@ package:
 
 source:
   - git: https://github.com/BioRadOpenSource/ish.git
-    rev: 0c88df6fab279b69f02b002bca35c2e3eecdc90e
-  # path: .
-  # use_gitignore: true
+    rev: 304233bc80b14c18f6f1497d17116d2328d2474f
 
 build:
   number: 0
@@ -29,12 +27,12 @@ build:
 
 requirements:
   host:
-      - modular ${{ modular_version }}
+      - mojo-compiler ${{ mojo_version }}
       - extramojo ${{ extramojo_version }}
       - zlib >=1.3.1,<2
 
   run:
-    - modular ${{ modular_version }}
+    - mojo-compiler ${{ mojo_version }}
     - zlib >=1.3.1,<2
 
 tests:
@@ -44,7 +42,7 @@ tests:
           - mojo test -I ${{ PREFIX }}/share/mojo/ishlib.mojopkg tests
     requirements:
       run:
-        - modular ${{ modular_version }}
+        - mojo-compiler ${{ mojo_version }}
         - extramojo ${{ extramojo_version }}
         - zlib >=1.3.1,<2
 

recipes/kelvin/recipe.yaml

@@ -1,14 +1,13 @@
 context:
-  version: 0.1.3
-  mojo_version: "=0.25.6"
+  version: 0.1.4
 
 package:
   name: "kelvin"
   version: ${{ version }}
 
 source:
  - git: https://github.com/bgreni/Kelvin.git
-   rev: d10f89ac05c178e7537906fb5834e10764f3291f
+   rev: 3018ba56fa762a3090bbf4ca26438b6c506278ea
 
 build:
   number: 0
@@ -17,24 +16,31 @@ build:
 
 requirements:
   host:
-    - mojo-compiler ${{ mojo_version }}
+    - mojo-compiler =0.25.7
   build:
-    - mojo-compiler ${{ mojo_version }}
+    - mojo-compiler =0.25.7
   run:
     - ${{ pin_compatible('mojo-compiler') }}
 
 tests:
   - script:
     - if: unix
       then:
-        - mojo test
-        # Can't convince PR build to find this file
-        # - python3 scripts/run_reject_tests.py
+        - python run_test.py
+        - python scripts/generate_tests.py && python scripts/run_reject_tests.py
+
+    files:
+      source:
+        - kelvin/
+        - test/
+        - run_test.py
+        - scripts/run_reject_tests.py
+        - scripts/generate_tests.py
     requirements:
       build:
-        - mojo ${{ mojo_version }}
+        - mojo =0.25.7
       run:
-        - mojo ${{ mojo_version }}
+        - mojo =0.25.7
 
 about:
   homepage: https://github.com/bgreni/Kelvin

recipes/lightbug_http/recipe.yaml

@@ -1,36 +1,35 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/prefix-dev/recipe-format/main/schema.json
-
 context:
-  version: "25.4.0"
-
+  version: "0.25.6"
+  mojo_version: "=0.25.6"
 package:
   name: "lightbug_http"
   version: ${{ version }}
-
 source:
   - git: https://github.com/saviorand/lightbug_http.git
-    rev: 508f4210fd32af2010286625d8fbd69ef0534057
-
+    rev: b7b81a8332259fa14e1057dc86a8249c2e6df927
 build:
   number: 0
   script:
     - mkdir -p ${PREFIX}/lib/mojo
     - mojo package lightbug_http -o ${{ PREFIX }}/lib/mojo/lightbug_http.mojopkg
-
 requirements:
+  build:
+    - mojo-compiler ${{ mojo_version }}
   host:
-      - max =25.4
+    - mojo-compiler ${{ mojo_version }}
   run:
-    - ${{ pin_compatible('max') }}
-
+    - mojo-compiler ${{ mojo_version }}
 tests:
   - script:
       - if: unix
         then:
           - mojo test
     requirements:
+      build:
+        - mojo ${{ mojo_version }}
       run:
-        - max =25.4
+        - mojo ${{ mojo_version }}
     files:
       recipe:
         - tests/lightbug_http/io/test_bytes.mojo
@@ -40,14 +39,12 @@ tests:
         - tests/lightbug_http/test_http.mojo
         - tests/lightbug_http/test_net.mojo
         - tests/lightbug_http/test_uri.mojo
-
 about:
   homepage: https://lightbug.site
   license: MIT
   license_file: LICENSE
   summary: Lightbug is a simple and sweet HTTP framework for Mojo
   repository: https://github.com/saviorand/lightbug_http
-
 extra:
   maintainers:
     - saviorand

recipes/mojmelo/recipe.yaml

@@ -1,13 +1,13 @@
 context:
-  version: "0.0.9"
+  version: "0.1.0"
 
 package:
   name: "mojmelo"
   version: ${{ version }}
 
 source:
   - git: https://github.com/yetalit/mojmelo.git
-    rev: dd4c87ee4d28d242ce57006182b248c6f95ad37a
+    rev: 01692d2078e55f4dbeac981240edc620d0dc96af
 
 build:
   number: 0
@@ -16,7 +16,7 @@ build:
     - mojo package pixi/mojmelo -o ${{ PREFIX }}/lib/mojo/mojmelo.mojopkg
 requirements:
   host:
-    - mojo-compiler =0.25.6
+    - mojo-compiler =0.25.7
   run:
     - ${{ pin_compatible('mojo-compiler') }}
 
@@ -27,7 +27,7 @@ tests:
           - mojo tests/setup.mojo
     requirements:
       run:
-        - mojo-compiler =0.25.6
+        - mojo-compiler =0.25.7
     files:
       recipe:
         - tests/setup.mojo

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

@@ -6,36 +6,40 @@ struct Matrix(Copyable, Movable, ImplicitlyCopyable, Sized):
     var height: Int
     var width: Int
     var size: Int
-    var data: UnsafePointer[Float32]
+    var data: UnsafePointer[Float32, MutAnyOrigin]
     var order: String
 
     # initialize from UnsafePointer
     @always_inline
-    fn __init__(out self, data: UnsafePointer[Float32], height: Int, width: Int, order: String = 'c'):
+    fn __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
-        self.data = data
+        if src == DType.float32:
+            self.data = data.bitcast[Float32]()
+        else:
+            self.data = cast[src=src, des=DType.float32, width=self.simd_width](data, self.size)
+            data.free()
         self.order = order.lower()
 
     # initialize by copying from UnsafePointer
     @always_inline
-    fn __init__(out self, height: Int, width: Int, data: UnsafePointer[Float32] = UnsafePointer[Float32](), order: String = 'c'):
+    fn __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
-        self.data = UnsafePointer[Float32].alloc(self.size)
+        self.data = alloc[Float32](self.size)
         self.order = order.lower()
         if data:
-            memcpy(self.data, data, self.size)
+            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
-        self.data = UnsafePointer[Float32].alloc(self.size)
+        self.data = alloc[Float32](self.size)
         self.order = other.order
-        memcpy(self.data, other.data, self.size)
+        memcpy(dest=self.data, src=other.data, count=self.size)
 
     fn __moveinit__(out self, deinit existing: Self):
         self.height = existing.height
@@ -45,7 +49,7 @@ struct Matrix(Copyable, Movable, ImplicitlyCopyable, Sized):
         self.order = existing.order
         #existing.height = existing.width = existing.size = 0
         #existing.order = ''
-        #existing.data = UnsafePointer[Float32]()
+        #existing.data = UnsafePointer[Float32, MutAnyOrigin]()
 
     # access an element
     @always_inline
@@ -56,7 +60,7 @@ struct Matrix(Copyable, Movable, ImplicitlyCopyable, Sized):
         else:
             loc = (column * self.height) + row
         if loc > self.size - 1 or loc < 0:
-            raise Error("Error: Location is out of range!")
+            raise Error("Location is out of range!")
         return self.data[loc]
 
     @always_inline
@@ -72,6 +76,24 @@ struct Matrix(Copyable, Movable, ImplicitlyCopyable, Sized):
     fn __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) + ')')
+
+        if self.height == 1 and rhs.width == 1:
+            # Dot product
+            var mat = Self(1, 1)
+            mat.data[0] = self.ele_mul(rhs.T()).sum()
+            return mat^
+
+        if self.height * self.width * rhs.width <= 4096:
+            # matmul naive
+            var mat = Self(self.height, rhs.width)
+            for i in range(self.size):
+                var rhsr = i % self.width
+                for j in range(rhsr * rhs.width, rhsr * rhs.width + rhs.width):
+                    if rhsr != 0:
+                        mat.data[(Int(i / self.width) * mat.width) + (j % rhs.width)] += self.data[i] * rhs.data[j]
+                    else:
+                        mat.data[(Int(i / self.width) * mat.width) + (j % rhs.width)] = self.data[i] * rhs.data[j]
+            return mat^
         var A = matmul.Matrix[DType.float32](self.data, (self.height, self.width))
         var B = matmul.Matrix[DType.float32](rhs.data, (rhs.height, rhs.width))
         var C = matmul.Matrix[DType.float32]((self.height, rhs.width))
@@ -91,7 +113,6 @@ struct Matrix(Copyable, Movable, ImplicitlyCopyable, Sized):
         return mat^
 
     @staticmethod
-    @always_inline
     fn random(height: Int, width: Int, order: String = 'c') -> Matrix:
         random.seed()
         var mat = Matrix(height, width, order= order)