Clean up / triage TODOs; Fix random seed

Author: EmergentOrder

backends/src/main/scala/NGraphBackend.scala

@@ -32,11 +32,12 @@ import org.bytedeco.ngraph.global.ngraph.i64
 import org.bytedeco.ngraph.global.ngraph.i32
 import org.bytedeco.onnx.global.onnx.check_model
 
-//TODO: Extract ModelProto modifications into generic layer, then do each layer-wise
+//TODEFER: Tracing Mode: Extract ModelProto modifications into generic layer, then do each layer-wise
 // op in a lazy fashion, while doing the same for generating a single overall ModelProto, via ModelProto.MergeFrom.
+// Between fine and full modes:
 // Use one path for speed and dynamic graph tracing at runtime (the default), the other for sanity/type/shape/AxisType/control flow checking at compile time
-//TODO: ONNX-JS backend for both JS and JVM
-//TODO: ONNX Runtime backend for JVM (and Native?)
+//TODEFER: ONNX-JS backend for both JS and JVM
+//TODEFER: ONNX Runtime backend for JVM (and Native?)
 class NGraphBackend(onnxBytes: Array[Byte])
     extends Add
     with DataSource
@@ -724,9 +725,7 @@ class NGraphBackend(onnxBytes: Array[Byte])
       outName: String,
       attrs: Map[String, Any]
   ): (ModelProto) = {
-//TODO: Refactor op method sigs to return this
 
-    //TODO: Fix ModelProto leaking memory here
     val model = (new ModelProto).New()
     val graph = new org.bytedeco.onnx.GraphProto
     model.set_producer_name("ONNX-Scala")
@@ -757,7 +756,7 @@ class NGraphBackend(onnxBytes: Array[Byte])
     addInputToGraph(B, bName, graph)
     addInputToGraph(C, cName, graph)
 
-    //TODO: ensure the outer model is the last merged
+    //TODEFER: Merge models, ensuring the outer model is the last merged
     (model)
   }
 
@@ -864,9 +863,6 @@ class NGraphBackend(onnxBytes: Array[Byte])
       C: Option[Tensor[T2]]
   ): (Tensor[T3]) = {
     val scope = new PointerScope()
-
-    //println(modelString.getString)
-    //TODO: Pull this as far forward as possible
     val modelString = new BytePointer(opModel: _*)
     val ngraphFunc  = import_onnx_model(modelString)
     modelString.close

programGenerator/src/main/scala/ONNXProgramGenerator.scala

@@ -25,11 +25,9 @@ import collection.JavaConverters._
 
 import scala.reflect.io.Streamable
 
-//TODO ASAP: Fix references to UnionTypes and  ONNXHelper init in generated programs
+//TODEFER: Use Squid to clean up / improve this
 
-//TODO: Use Squid to clean up / improve this
-
-//TODO: de-tuple on the left hand side when there are multiple outputs . should also solved the other output TODOs
+//TODEFER: de-tuple on the left hand side when there are multiple outputs . should also solve the other output TODOs
 object ONNXProgramGenerator {
   def main(args: Array[String]): Unit = {
 
@@ -65,8 +63,8 @@ object ONNXProgramGenerator {
     val useZIO   = false
     val useDotty = false
 
-    //TODO: Fix output for the benchmark models shown here: https://github.com/onnx/backend-scoreboard
-    //TODO: run time benchmarks on the same models
+    //TODO: Test outputs for the benchmark models shown here: https://github.com/onnx/backend-scoreboard
+    //TODEFER: run time benchmarks on the same models
 
     val programName = fileName.stripSuffix(".onnx").capitalize + (if (useZIO)
                                                                     "ZIO"
@@ -75,7 +73,7 @@ object ONNXProgramGenerator {
       "programGenerator/src/main/scala/gen/" + programName + ".scala"
     );
 
-    //TODO: Be explicit about model version, metadata
+    //TODEFER: Be explicit about model version, metadata
     //Notes, from the standard:
     //"Each model MUST explicitly name the operator sets that it relies on for its functionality."
     //"An implementation must support all operators in the set or reject the model" - This can happen at runtime via ZIOstyle implicits, possibly mixing backends
@@ -330,7 +328,7 @@ object ONNXProgramGenerator {
                                                                       else
                                                                         "List(") + opName + (if (useZIO)
                                                                                                "ZIO"
-                                                                                             else //TODO: Tell the compiler when one of the type params in an output type
+                                                                                             else //TODO: Tell the compiler when one of the type params is an output type
                                                                                                "") + "." + opName + sinceVersion + (if (useZIO)
                                                                                                                                       "ZIO"
                                                                                                                                     else

zio/src/main/scala/NCFZIO.scala

@@ -15,7 +15,7 @@ import scala.reflect.io.Streamable
 import org.bytedeco.javacpp.PointerScope
 import org.bytedeco.javacpp.Pointer
 
-//TODO: Add changes to generator; Generate both full model and layerwise programs each time
+//TODO: Generate full model as well as layerwise
 class NCFZIO(byteArray: Array[Byte], userIdsMap: Map[Long, Long], itemIdsMap: Map[Long, Long])
     extends AutoCloseable {
 

zio/src/main/scala/NCFZIOFine.scala

@@ -13,7 +13,6 @@ import scala.language.higherKinds
 import scala.io.Source
 import scala.reflect.io.Streamable
 
-//TODO: Add changes to generator; Generate both full model and layerwise programs each time
 class NCFZIOFineGrained(
     byteArray: Array[Byte],
     userIdsMap: Map[Long, Long],
@@ -26,7 +25,7 @@ class NCFZIOFineGrained(
   val GemmZIO: GemmZIO          = new ONNXNGraphHandlers(byteArray)
   val ReluZIO: ReluZIO          = new ONNXNGraphHandlers(byteArray)
   val SigmoidZIO: SigmoidZIO    = new ONNXNGraphHandlers(byteArray)
-  val dataSource: DataSourceZIO = ??? //TODO: Inject
+  val dataSource: DataSourceZIO = new ONNXNGraphHandlers(byteArray)   
 
   def fineNCF(
       inputDataactual_input_1: Task[Tensor[Long]],

zio/src/main/scala/ZIONGraphBackend.scala

@@ -33,7 +33,7 @@ class ONNXNGraphHandlers(onnxBytes: Array[Byte])
     with ReluZIO
     with ConcatZIO
     with DropoutZIO
-//    with DataSourceZIO
+    with DataSourceZIO
     with AutoCloseable {
   val scope         = new PointerScope()
   val ngraphBackend = new NGraphBackend(onnxBytes)
@@ -46,18 +46,14 @@ class ONNXNGraphHandlers(onnxBytes: Array[Byte])
     ngraphBackend.fullModel[T, T1, T2, T3](A, B, C)
   }
 
-  /*
-  def getParamsZIO[T: Numeric: ClassTag](name: String)(
-      implicit ev: (UNil TypeOr Float16 TypeOr Float TypeOr Double TypeOr Byte TypeOr Short TypeOr Int TypeOr Long TypeOr UByte TypeOr UShort TypeOr UInt TypeOr ULong TypeOr Complex[
-        Float
-      ] TypeOr Complex[Double])#check[T]
-  ): Task[Tensor[T]] = {
+  def getParamsZIO[T: Numeric: ClassTag](name: String): Task[Tensor[T]] = 
+      {
     Task {
       ngraphBackend.getParams(name)
     }
 
   }
-   */
+
   def getAttributesZIO[T: Numeric: ClassTag](name: String)(
       implicit evT: Contains[
         T,
@@ -340,7 +336,8 @@ object ZIONGraphMain extends App {
 
   val userIds                       = userIdsMap.keys.toArray
   val itemIds                       = itemIdsMap.keys.toArray
-  def getRandomId(arr: Array[Long]) = arr(Random.nextInt(arr.length))
+  val rand = new Random(42)
+  def getRandomId(arr: Array[Long]) = arr(rand.nextInt(arr.length))
 
   val input = Task {
     val tens = TensorFactory.getTensor(
@@ -388,7 +385,7 @@ object ZIONGraphMain extends App {
   println(Pointer.maxPhysicalBytes)
   println("Output size: " + output2._1.size)
   println("Output 0: " + output2._1(0))
-  println("Output 1: " + output2._1(7999)) //TODO: Investigate output flipping here, possibly due to race
+  println("Output 1: " + output2._1(7999))
 //   println("Output 2: " + output2._1(2))
 //   println("Output 3: " + output2._1(3))
 //   println("Output 4: " + output2._1(4))