intersting

Author: Quafadas

build.mill

@@ -60,8 +60,7 @@ trait Common extends ScalaModule  with PublishModule with ScalafixModule {
 }
 
 val vecIncubatorFlag = Seq(
-  """--add-modules=jdk.incubator.vector""",
-  "-Ddev.ludovic.netlib.blas.nativeLibPath=/opt/homebrew/Cellar/openblas/0.3.30/lib/libopenblas.dylib"
+  """--add-modules=jdk.incubator.vector"""
 )
 
 trait CommonJS extends ScalaJSModule {

experiments/package.mill

@@ -11,15 +11,25 @@ object `package` extends RootModule with ScalaModule {
         super.compileResources() ++ resources()
     }
     def scalacOptions: T[Seq[String]] = Seq("-Xmax-inlines:10000")
-    override def forkArgs: T[Seq[String]] = super.forkArgs() ++ build.vecIncubatorFlag
+    override def forkArgs: T[Seq[String]] = super.forkArgs() ++ build.vecIncubatorFlag ++ Seq(
+        "-Djava.library.path=/opt/homebrew/Cellar/blis/1.1/lib"
+    )
     override def moduleDeps: Seq[JavaModule] = Seq(build.vecxt.jvm, build.generated)
 
-    override def mainClass = Some("testBlis")
+    override def mainClass = Some("testBlisNative")
     override def ivyDeps = super.ivyDeps() ++ Seq(
         ivy"com.lihaoyi::os-lib::0.10.4",
         ivy"io.github.quafadas::scautable::0.0.24",
         ivy"io.github.quafadas::dedav4s::0.10.0-RC2"
 
     )
 
+    object test extends ScalaTests with TestModule.Munit {
+        def scalaVersion = build.vecxt.jvm.scalaVersion
+        override def ivyDeps= super.ivyDeps() ++ Agg(
+            ivy"org.scalameta::munit::${build.V.munitVersion}"
+        )
+        def forkArgs = super.forkArgs() ++ build.vecIncubatorFlag
+    }
+
 }

experiments/src/Vector.scala

@@ -0,0 +1,35 @@
+package vecxt.experiments
+
+import java.lang.foreign.MemorySegment
+import java.lang.foreign.Arena
+import java.lang.foreign.ValueLayout
+
+opaque type DoubleVector = MemorySegment
+
+export DoubleVector.*
+
+object DoubleVector {
+
+  extension (v: DoubleVector) {
+
+    inline def apply(index: Long): Double =
+      v.getAtIndex(ValueLayout.JAVA_DOUBLE, index)
+
+    inline def update(index: Long, value: Double): Unit =
+      v.setAtIndex(ValueLayout.JAVA_DOUBLE, index, value)
+
+    inline def length: Long =
+      v.byteSize() / ValueLayout.JAVA_DOUBLE.byteSize()
+  }
+
+}
+
+extension (dv: DoubleVector.type)
+  inline def apply(size: Long)(using arena: Arena): DoubleVector =
+    arena.allocate(ValueLayout.JAVA_DOUBLE, size)
+
+  inline def apply(data: Seq[Double])(using arena: Arena): DoubleVector =
+    arena.allocateFrom(
+      ValueLayout.JAVA_DOUBLE,
+      data*
+    )

experiments/src/blis.scala

@@ -27,7 +27,6 @@ import vecxt.BoundsCheck.DoBoundsCheck.yes
   val vec1 = NArray[Double](1.0, 2.0, 1.0, 1.0)
   val vec2 = NArray[Double](0.0, 0.0, 0.0, 0.0)
 
-
   val arena = Arena.ofConfined()
   try {
     val a = arena.allocateFrom(

experiments/src/blis2.scala

@@ -0,0 +1,27 @@
+import java.lang.foreign.{Arena, MemorySegment, ValueLayout}
+import blis.*
+import vecxt.all.*
+import narr.*
+import vecxt.BoundsCheck.DoBoundsCheck.yes
+
+@main def testBlisNative =
+
+  println("Panama native memory test")
+
+
+  val arena = Arena.ofAuto()
+    // Allocate native memory for 4 doubles
+  val nativeArr = arena.allocate(ValueLayout.JAVA_DOUBLE.byteSize() * 4)
+  // Write values to native memory
+  var i = 0
+  while (i < 4) {
+    nativeArr.setAtIndex(ValueLayout.JAVA_DOUBLE, i, (i + 1).toDouble)
+    i += 1
+  }
+  // Read back and print
+  i = 0
+  while (i < 4) {
+    val v = nativeArr.getAtIndex(ValueLayout.JAVA_DOUBLE, i)
+    println(s"nativeArr($i) = $v")
+    i += 1
+  }

experiments/test/src/syntax.test.scala

@@ -0,0 +1,44 @@
+package vecxt.experiments
+
+
+import narr.*
+import java.lang.foreign.Arena
+
+import vecxt.experiments.*
+import vecxt.experiments.DoubleVector.*
+
+class SyntaxSuite extends munit.FunSuite:
+
+  given arena: Arena = Arena.global()
+
+  test("DoubleVector apply and update"):
+
+    val vec = DoubleVector(5)(using arena)
+    vec(0) = 1.0
+    vec(1) = 2.0
+    vec(2) = 3.0
+    vec(3) = 4.0
+    vec(4) = 5.0
+
+    assertEquals(vec(0), 1.0)
+    assertEquals(vec(1), 2.0)
+    assertEquals(vec(2), 3.0)
+    assertEquals(vec(3), 4.0)
+    assertEquals(vec(4), 5.0)
+
+    println(vec)
+
+
+  test("DoubleVector length"):
+
+    val vec = DoubleVector(10)(using arena)
+    assertEquals(vec.length, 10L)
+
+  test("DoubleVector from Array"):
+    val arr = Vector(1.0, 2.0, 3.0)
+    val vec = DoubleVector(arr)(using arena)
+    assertEquals(vec(0), 1.0)
+    assertEquals(vec(1), 2.0)
+    assertEquals(vec(2), 3.0)
+
+end SyntaxSuite

generated/src/blis/cblas_h.java

@@ -20,8 +20,12 @@ public class cblas_h extends cblas_h$shared {
 
     static final Arena LIBRARY_ARENA = Arena.ofAuto();
 
-    static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.libraryLookup("/opt/homebrew/opt/blis/lib/libblis.dylib", LIBRARY_ARENA)
-            .or(SymbolLookup.loaderLookup())
+
+    static {
+        System.loadLibrary("blis");
+    }
+
+        static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.loaderLookup()
             .or(Linker.nativeLinker().defaultLookup());
 
     private static final int CblasRowMajor = (int)101L;

justfile

@@ -1,5 +1,6 @@
+set shell := ["zsh", "-cu"]
 
-MILL := "JAVA_OPTS=\"-Ddev.ludovic.netlib.blas.nativeLibPath=/opt/homebrew/Cellar/openblas/0.3.30/lib/libopenblas.dylib\" ./millw"
+MILL := "./millw"
 
 format:
   {{MILL}} mill.scalalib.scalafmt.ScalafmtModule/reformatAll __.sources
@@ -61,7 +62,8 @@ jextractBlis:
     --output generated/src \
     --include-function dgemv \
     -D FORCE_OPENBLAS_COMPLEX_STRUCT \
-    -l :/opt/homebrew/opt/blis/lib/libblis.dylib \
+    -l blis \
     -t blis \
+    --use-system-load-library \
     @myInclude.txt \
     /opt/homebrew/opt/blis/include/blis/cblas.h