Use ORT node for JS

EmergentOrder · Dec 6, 2023 · 4bf775a · 4bf775a
1 parent 84b1a59
commit 4bf775a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 131 deletions.
diff --git a/backends/.js/package-lock.json b/backends/.js/package-lock.json
diff --git a/backends/.js/src/main/scala/ORTOperatorBackend.scala b/backends/.js/src/main/scala/ORTOperatorBackend.scala
@@ -5,8 +5,8 @@ import scala.concurrent.duration._
 import org.emergentorder.onnx.onnxruntimeCommon.tensorMod
 //import typings.onnxruntimeWeb.tensorMod.Tensor.DataType
 //import typings.onnxjs.libTensorMod.Tensor.DataTypeMap.DataTypeMapOps
-import org.emergentorder.onnx.onnxruntimeWeb.mod.{InferenceSession => OrtSession}
-import org.emergentorder.onnx.onnxruntimeWeb.mod.Tensor.{^ => OnnxTensor}
+import org.emergentorder.onnx.onnxruntimeNode.mod.{InferenceSession => OrtSession}
+import org.emergentorder.onnx.onnxruntimeNode.mod.Tensor.{^ => OnnxTensor}
 //import typings.onnxruntimeWeb.ort.InferenceSession.{^ => InferenceSess}
 //import typings.onnxjs.onnxMod.Onnx
 import scala.scalajs.js.typedarray

diff --git a/backends/.js/src/main/scala/ORTTensorUtils.scala b/backends/.js/src/main/scala/ORTTensorUtils.scala
@@ -2,7 +2,7 @@ package org.emergentorder.onnx.backends
 
 //import scala.scalajs.js.Array
 import org.emergentorder.onnx.Tensors._
-import org.emergentorder.onnx.onnxruntimeWeb.mod.Tensor.{^ => OnnxTensor}
+import org.emergentorder.onnx.onnxruntimeNode.mod.Tensor.{^ => OnnxTensor}
 import scalajs.js.JSConverters._
 import scala.scalajs.js.typedarray
 

diff --git a/backends/.js/src/main/scala/ORTWebModelBackend.scala b/backends/.js/src/main/scala/ORTWebModelBackend.scala
@@ -10,7 +10,7 @@ import cats.effect.IO
 import cats.implicits._
 //import typings.onnxruntimeNode.mod.{InferenceSession => OrtSession}
 import org.emergentorder.onnx.onnxruntimeCommon.inferenceSessionMod.InferenceSession
-import org.emergentorder.onnx.onnxruntimeWeb.mod.Tensor.{^ => OnnxTensor}
+import org.emergentorder.onnx.onnxruntimeNode.mod.Tensor.{^ => OnnxTensor}
 import org.emergentorder.onnx._
 import org.emergentorder.onnx.Tensors._
 import org.emergentorder.onnx.Tensors.Tensor._

diff --git a/backends/.js/src/test/scala/SqueezeNetTest.scala b/backends/.js/src/test/scala/SqueezeNetTest.scala
@@ -7,7 +7,7 @@ import org.emergentorder.onnx.Tensors.Tensor._
 import org.emergentorder.onnx.backends._
 import org.emergentorder.compiletime._
 import org.emergentorder.io.kjaer.compiletime._
-import org.emergentorder.onnx.onnxruntimeWeb.mod.{InferenceSession => OrtSession}
+import org.emergentorder.onnx.onnxruntimeNode.mod.{InferenceSession => OrtSession}
 import cats.effect.IO
 
 import org.scalatest._
@@ -28,7 +28,7 @@ class ONNXScalaSpec extends AsyncFreeSpec with AsyncIOSpec with Matchers {
    ] = IO.fromFuture(IO {
       OrtSession
          .create(
-           "https://media.githubusercontent.com/media/onnx/models/main/vision/classification/squeezenet/model/squeezenet1.0-12.onnx", {
+           "./squeezenet1.0-12.onnx", {
               val opts = InferenceSession.SessionOptions()
               opts.executionProviders = scala.scalajs.js.Array("cpu")
               opts

diff --git a/build.sbt b/build.sbt
@@ -89,9 +89,9 @@ lazy val backends = (crossProject(JSPlatform, JVMPlatform, NativePlatform)
      webpackCliVersion                              := "5.1.4",
      startWebpackDevServer / version                := "4.15.1",
      scalaJSUseMainModuleInitializer                := true, // , //Testing
-     Compile / npmDependencies += "onnxruntime-web" -> "1.15.1",
+//     Compile / npmDependencies += "onnxruntime-web" -> "1.15.1",
      // ORT web and node are interchangeable, given minor package name changes, and node offers a significant speed-up (at the cost of working on the web)
-//     Compile / npmDependencies += "onnxruntime-node"    -> "1.16.3",
+     Compile / npmDependencies += "onnxruntime-node"    -> "1.15.1",
      Compile / npmDependencies += "onnxruntime-common" -> "1.15.1",
      Compile / npmDependencies += "typescript"         -> "5.0.4",
      libraryDependencies += "org.typelevel" %%% "cats-effect-testing-scalatest" % "1.5.0" % Test,