Handle tensor data types correctly on both JVM and JS backends

Author: EmergentOrder

backends/.js/src/main/scala/ORTOperatorBackend.scala

@@ -120,7 +120,19 @@ trait ORTOperatorBackend extends OpToONNXBytesConverter {
          t    <- tens
       } yield opToModelProto(
           opName,
-          (t.map(_.asInstanceOf[tensorMod.Tensor].`type`.valueOf.asInstanceOf[Float].round)  
+          (t.map(x => x.asInstanceOf[tensorMod.Tensor].`type`.valueOf.toString match {
+            //Can't access the enum int values here
+            //But it's fine, doesn't match the ONNX spec anyway
+            case "int8"  => 3
+            case "int16" => 5
+            case "float64" => 11
+            case "float32" => 1
+            case "int32" => 6
+            case "int64" => 7
+            case "bool" => 9
+            case y => y.toInt
+          }
+            )  
             zip t.map(_.dims.map(_.toInt).toArray)),
           attrs
         ).toByteArray

backends/.jvm/src/main/scala/ORTOperatorBackend.scala

@@ -155,7 +155,20 @@ trait ORTOperatorBackend extends OpToONNXBytesConverter with AutoCloseable {
       } yield res(
         opToModelProto(
           opName,
-          (t.map(_.getInfo.onnxType.value) zip { t.map(_.getInfo.getShape.map(_.toInt) match {
+          (t.map(_.getInfo.onnxType.value match {
+            //ORT has two different enums for this for the Java and C APIs 
+            //Neither matches the ONNX spec
+            case 2 => 3
+            case 4 => 5
+            case 10 => 1
+            case 8 => 7
+            case 13 => 9
+            case n => n
+          }
+            ) 
+
+            zip 
+            { t.map(_.getInfo.getShape.map(_.toInt) match {
               //ORT shape inference diverges from the ONNX spec in requiring a scalar here instead of a tensor with shape,
               //causing a crash without this fix
               case Array(1) => if(opName.equals("Dropout")) Array[Int]() else Array(1)

core/src/main/scala/OpToONNXBytesConverter.scala

@@ -181,13 +181,13 @@ trait OpToONNXBytesConverter {
       {
 
          val elemType = elemTypeIn match {
-            case 2  => INT8.index
-            case 4  => INT16.index
+            case 3  => INT8.index
+            case 5  => INT16.index
             case 11 => DOUBLE.index
-            case 10 => FLOAT.index
+            case 1 => FLOAT.index
             case 6  => INT32.index
-            case 8  => INT64.index
-            case 13 => BOOL.index
+            case 7  => INT64.index
+            case 9 => BOOL.index
             case _  => INT64.index // In case of Scala.js BigInt
          }
 //         tens.shape.map { y =>