Use new onnxruntime-web npm package for JS build

Author: EmergentOrder

backends/.js/src/main/scala/Main.scala

@@ -7,7 +7,7 @@ object Main {
 
       val t = new ONNXJSOperatorBackend {}
 
-      t.test
+      t.test()
       println(s"Using Scala.js version ${System.getProperty("java.vm.version")}")
    }
 }

backends/.js/src/main/scala/ONNXJSOperatorBackend.scala

@@ -1,12 +1,15 @@
 package org.emergentorder.onnx.backends
 
 import scala.concurrent.duration._
-import typings.onnxjs.onnxImplMod.Tensor.{^ => Tensor}
+import typings.onnxruntimeWeb.tensorMod.Tensor
+import typings.onnxruntimeWeb.tensorMod.Tensor.FloatType
+import typings.onnxruntimeWeb.tensorMod.Tensor.DataType
 //import typings.onnxjs.libTensorMod.Tensor.DataTypeMap.DataTypeMapOps
-import typings.onnxjs.onnxImplMod.InferenceSession.{^ => InferenceSession}
+import typings.onnxruntimeWeb.mod.InferenceSession
+//import typings.onnxruntimeWeb.ort.InferenceSession.{^ => InferenceSession}
 //import typings.onnxjs.onnxMod.Onnx
 
-import typings.onnxjs.onnxImplMod._
+//import typings.onnxruntimeWeb.onnxImplMod._
 
 import scala.scalajs.js.|
 
@@ -16,34 +19,23 @@ trait ONNXJSOperatorBackend {
    implicit val ec: scala.concurrent.ExecutionContext = scala.concurrent.ExecutionContext.global
    def test() = {
 
-      val session     = new InferenceSession()
-      val url         = "relu.onnx"
-      val modelFuture = session.loadModel(url).toFuture
+      val session     = InferenceSession.create("relu.onnx")
+      val dataTypes = new FloatType {}
 
-      val dataTypes = new typings.onnxjs.libTensorMod.Tensor.FloatType {}
-
-      val outputFuture = modelFuture.map { x =>
-         val inputs = Array(
+/*  
+      val inputs = Array(
            new Tensor(
-             scala.scalajs.js.Array[Boolean | Double](
-               (1 until 61).map(_.toDouble: Boolean | Double).toArray: _*
+             "float32",
+             scala.scalajs.js.Array[Double](
+               (1 until 61).map(_.toDouble: Double).toArray: _*
              ),
-             typings.onnxjs.onnxjsStrings.float32,
              scala.scalajs.js.Array(3.0, 4.0, 5.0)
-           ): typings.onnxjs.tensorMod.Tensor
-         );
-         println("before run")
-         val res = session.run(scala.scalajs.js.Array(inputs: _*)).toFuture
-         println("after run")
-         res
-      }.flatten
-
-      import scala.util.{Success, Failure}
-
-      outputFuture onComplete {
-         case Success(t)    => println(t.get("y").get.dims)
-         case Failure(fail) => println(fail)
-      }
-
+           )
+         )
+*/
+         //println("before run")
+         //val res = session.run(scala.scalajs.js.Array(inputs: _*))
+         //println("after run")
+         //res
    }
 }

build.sbt

@@ -52,14 +52,14 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
    .crossType(CrossType.Pure) in file("backends"))
    .dependsOn(core)
 //conditionally enabling/disable based on version, still not working
-//  .enablePlugins(ScalaJSBundlerPlugin)//, ScalablyTypedConverterPlugin)
+//  .enablePlugins(ScalablyTypedConverterPlugin)
    .settings(
      commonSettings,
      name := "onnx-scala-backends",
-     excludeFilter in unmanagedSources := (CrossVersion
-        .partialVersion(scalaVersion.value) match {
-          case _ => "Main.scala" | "ONNXJSOperatorBackend.scala"
-     }),
+//     excludeFilter in unmanagedSources := (CrossVersion
+//        .partialVersion(scalaVersion.value) match {
+//          case _ => "Main.scala" | "ONNXJSOperatorBackend.scala"
+//     }),
 //    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
      libraryDependencies ++= Seq(
        "com.microsoft.onnxruntime" % "onnxruntime" % "1.9.0"
@@ -70,12 +70,12 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
 //TODO: move to utest
      libraryDependencies += ("org.scalatest" %% "scalatest" % scalaTestVersion) % Test
    )
-   .jsSettings(scalaJSUseMainModuleInitializer := true) //, //Testing
-//npmDependencies in Compile += "onnxjs" -> "0.1.8")
+   .jsSettings(scalaJSUseMainModuleInitializer := true, //, //Testing
+npmDependencies in Compile += "onnxruntime-web" -> "1.9.0")
 //Seems to be a bundling issue, copying things manually seems to work
 //TODO NEW: try JS, bundler and converter beta/RC are out
 //     npmDependencies in Compile += "onnxjs" -> "0.1.8")
-//.jsConfigure { project => project.enablePlugins(ScalaJSBundlerPlugin)} //ScalablyTypedConverterPlugin)}
+.jsConfigure { project => project.enablePlugins(ScalablyTypedConverterPlugin)}
 //ScalaJSBundlerPlugin)} //,ScalablyTypedConverterPlugin) }
 
 lazy val core = (crossProject(JSPlatform, JVMPlatform)