post merge fix

Author: marcin-zlakowski

cyfra-compiler/src/main/scala/io/computenode/cyfra/spirv/compilers/SpirvProgramCompiler.scala

@@ -32,7 +32,7 @@ class ArithmeticsE2eTest extends munit.FunSuite:
     val result = gmem.map(gf).asInstanceOf[IntMem].toArray
 
     // With negative values and mod, Scala and Vulkan behave differently
-    val expected = inArr.map: n => 
+    val expected = inArr.map: n =>
       val res = ((n + 2) * (n - 3) / 5) % 7
       res + (if res < 0 then 7 else 0)
 
@@ -51,8 +51,8 @@ class ArithmeticsE2eTest extends munit.FunSuite:
     val v2 = Algebra.vec4.tupled(f2)
     val v3 = Algebra.vec4.tupled(f3)
 
-    val gf: GFunction[GStruct.Empty, Vec4[Float32], Float32] = GFunction:
-      v4 => (-v4).*(sc).+(v1).-(v2).dot(v3)
+    val gf: GFunction[GStruct.Empty, Vec4[Float32], Float32] = GFunction: v4 =>
+      (-v4).*(sc).+(v1).-(v2).dot(v3)
 
     val inArr: Array[fRGBA] = (0 to 1023)
       .map(_.toFloat)

cyfra-e2e-test/src/test/scala/io/computenode/cyfra/ArithmeticTests.scala

@@ -58,10 +58,10 @@ class FunctionsE2eTest extends munit.FunSuite:
         val dotted = n.pro(f)
         val k = 1.0f - eta * eta * (1.0f - dotted * dotted)
         if k < 0.0 then (0f, 0f, 0f, 0f)
-        else f.scl(eta).sub(n.scl(eta * dotted + math.sqrt(k).toFloat)) 
+        else f.scl(eta).sub(n.scl(eta * dotted + math.sqrt(k).toFloat))
 
     def floatMix(a: Float, b: Float, t: Float): Float = a * (1 - t) + b * t
-    def vecMix(a: fRGBA, b: fRGBA, t: Float): fRGBA = (a.scl(1 - t)).add(b.scl(t))
+    def vecMix(a: fRGBA, b: fRGBA, t: Float): fRGBA = a.scl(1 - t).add(b.scl(t))
     def scalaClamp(f: Float, from: Float, to: Float) = math.min(math.max(f, from), to)
     def scalaSmooth(e0: Float, e1: Float, x: Float): Float =
       val t = scalaClamp((x - e0) / (e1 - e0), 0f, 1f)

cyfra-e2e-test/src/test/scala/io/computenode/cyfra/FunctionsTests.scala

@@ -24,7 +24,7 @@ class GseqE2eTest extends munit.FunSuite:
       .zip(expected)
       .foreach: (res, exp) =>
         assert(Math.abs(res - exp) < 0.001f, s"Expected $exp but got $res")
-  
+
   test("GSeq of takeWhile filter count"):
     val gf: GFunction[GStruct.Empty, Int32, Int32] = GFunction: n =>
       GSeq

cyfra-e2e-test/src/test/scala/io/computenode/cyfra/GSeqTests.scala

@@ -50,8 +50,7 @@ class GStructE2eTest extends munit.FunSuite:
       GSeq
         .gen(custom1, c => Custom(c.f * 2f, c.v.*(2f)))
         .limit(3)
-        .fold[Float32](0f, (f, c) => f + c.f * (c.v.w + c.v.x + c.v.y + c.v.z))
-      + fl
+        .fold[Float32](0f, (f, c) => f + c.f * (c.v.w + c.v.x + c.v.y + c.v.z)) + fl
 
     val inArr = (0 to 255).map(_.toFloat).toArray
     val gmem = FloatMem(inArr)

cyfra-e2e-test/src/test/scala/io/computenode/cyfra/GStructTests.scala

@@ -22,7 +22,6 @@ import java.nio.channels.FileChannel
 import java.util.concurrent.Executors
 import scala.concurrent.{ExecutionContext, ExecutionContextExecutor}
 
-
 class GContext:
 
   Configuration.STACK_SIZE.set(1024) // fix lwjgl stack size
@@ -31,20 +30,13 @@ class GContext:
 
   implicit val ec: ExecutionContextExecutor = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(16))
 
-  def compile[
-    G <: GStruct[G] : Tag : GStructSchema,
-    H <: Value : Tag : FromExpr,
-    R <: Value : Tag : FromExpr
-  ](function: GFunction[G, H, R]): ComputePipeline = {
+  def compile[G <: GStruct[G]: Tag: GStructSchema, H <: Value: Tag: FromExpr, R <: Value: Tag: FromExpr](
+    function: GFunction[G, H, R],
+  ): ComputePipeline = {
     val uniformStructSchema = summon[GStructSchema[G]]
     val uniformStruct = uniformStructSchema.fromTree(UniformStructRef)
-    val tree = function
-      .fn
-      .apply(
-        uniformStruct,
-        WorkerIndex,
-        GArray[H](0)
-      )
+    val tree = function.fn
+      .apply(uniformStruct, WorkerIndex, GArray[H](0))
     val shaderCode = DSLCompiler.compile(tree, function.arrayInputs, function.arrayOutputs, uniformStructSchema)
     dumpSpvToFile(shaderCode, "program.spv") // TODO remove before release
     val inOut = 0 to 1 map (Binding(_, InputBufferSize(typeStride(summon[Tag[H]]))))
@@ -60,22 +52,18 @@ class GContext:
     fc.close()
     code.rewind()
 
-  def execute[
-    G <: GStruct[G] : Tag : GStructSchema,
-    H <: Value,
-    R <: Value
-  ](mem: GMem[H], fn: GFunction[G, H, R])(using uniformContext: UniformContext[G]): GMem[R] =
+  def execute[G <: GStruct[G]: Tag: GStructSchema, H <: Value, R <: Value](mem: GMem[H], fn: GFunction[G, H, R])(using
+    uniformContext: UniformContext[G],
+  ): GMem[R] =
     val isUniformEmpty = uniformContext.uniform.schema.fields.isEmpty
-    val actions = Map(
-      LayoutLocation(0, 0) -> BufferAction.LoadTo,
-      LayoutLocation(0, 1) -> BufferAction.LoadFrom
-    ) ++ (
-      if isUniformEmpty then Map.empty 
-      else Map(LayoutLocation(0, 2) -> BufferAction.LoadTo)
-    )
+    val actions = Map(LayoutLocation(0, 0) -> BufferAction.LoadTo, LayoutLocation(0, 1) -> BufferAction.LoadFrom) ++
+      (
+        if isUniformEmpty then Map.empty
+        else Map(LayoutLocation(0, 2) -> BufferAction.LoadTo)
+      )
     val sequence = ComputationSequence(Seq(Compute(fn.pipeline, actions)), Seq.empty)
     val executor = new SequenceExecutor(sequence, vkContext)
-    
+
     val data = mem.toReadOnlyBuffer
     val inData =
       if isUniformEmpty then Seq(data)
@@ -94,4 +82,3 @@ class GContext:
       case t if t == Tag[Vec4[Float32]] =>
         new Vec4FloatMem(mem.size, out.head).asInstanceOf[GMem[R]]
       case _ => assert(false, "Supported output types are Float32 and Vec4[Float32]")
-

cyfra-runtime/src/main/scala/io/computenode/cyfra/runtime/GContext.scala

@@ -16,10 +16,9 @@ import java.nio.ByteBuffer
 trait GMem[H <: Value]:
   def size: Int
   def toReadOnlyBuffer: ByteBuffer
-  def map[
-    G <: GStruct[G] : Tag : GStructSchema,
-    R <: Value : FromExpr : Tag
-  ](fn: GFunction[G, H, R])(using context: GContext, uc: UniformContext[G]): GMem[R] =
+  def map[G <: GStruct[G]: Tag: GStructSchema, R <: Value: FromExpr: Tag](
+    fn: GFunction[G, H, R],
+  )(using context: GContext, uc: UniformContext[G]): GMem[R] =
     context.execute(this, fn)
 
 object GMem:
@@ -36,7 +35,7 @@ object GMem:
   def serializeUniform(g: GStruct[?]): ByteBuffer = {
     val data = BufferUtils.createByteBuffer(totalStride(g.schema))
     g.productIterator.foreach {
-      case Int32(ConstInt32(i)) => data.putInt(i)
+      case Int32(ConstInt32(i))     => data.putInt(i)
       case Float32(ConstFloat32(f)) => data.putFloat(f)
       case Vec4(ComposeVec4(Float32(ConstFloat32(x)), Float32(ConstFloat32(y)), Float32(ConstFloat32(z)), Float32(ConstFloat32(a)))) =>
         data.putFloat(x)

cyfra-runtime/src/main/scala/io/computenode/cyfra/runtime/mem/GMem.scala

@@ -13,7 +13,6 @@ class IntMem(val size: Int, protected val data: ByteBuffer) extends RamGMem[Int3
     res.get(result)
     result
 
-
 object IntMem:
   val IntSize = 4
 
@@ -24,6 +23,6 @@ object IntMem:
     data.rewind()
     new IntMem(size, data)
 
-  def apply(size: Int): IntMem = 
+  def apply(size: Int): IntMem =
     val data = BufferUtils.createByteBuffer(size * IntSize)
     new IntMem(size, data)