Skip to content

Commit bec4ba2

Browse files
EmergentOrderEmergentOrder
committed
Updating syntax such that it compiles under -source:future-migration option
1 parent 9326dd9 commit bec4ba2

17 files changed

+93
-90
lines changed

‎backends/.jvm/src/main/scala/NCF.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package org.emergentorder.onnx
22

3-
import org.emergentorder.onnx._
4-
import org.emergentorder.onnx.Tensors._
5-
import org.emergentorder.onnx.Tensors.Tensor._
6-
import org.emergentorder.onnx.backends._
7-
import spire.implicits._
3+
import org.emergentorder.onnx.*
4+
import org.emergentorder.onnx.Tensors.*
5+
import org.emergentorder.onnx.Tensors.Tensor.*
6+
import org.emergentorder.onnx.backends.*
7+
import spire.implicits.*
88
import spire.math.UByte
99
import spire.math.UShort
1010
import spire.math.Complex
1111
import spire.algebra.Field
1212
import spire.math.Numeric
1313
import scala.language.higherKinds
1414
import scala.io.Source
15-
import org.emergentorder.compiletime._
16-
import io.kjaer.compiletime._
15+
import org.emergentorder.compiletime.*
16+
import io.kjaer.compiletime.*
1717
import cats.effect.IO
1818

1919
//TODO: Add changes to generator; Generate both full model and layerwise programs each time
@@ -35,7 +35,7 @@ class NCF(byteArray: Array[Byte], userIdsMap: Map[Long, Long], itemIdsMap: Map[L
3535
IO(dataToUserIds(inputDataactual_input_1.data), inputDataactual_input_1.shape)
3636
)
3737

38-
val tensorType: String with Singleton = "TensorType"
38+
val tensorType: String & Singleton = "TensorType"
3939
val nodelearned_0 = Tuple1(
4040
IO(dataToItemIds(inputDatalearned_0.data), inputDatalearned_0.shape)
4141
)

‎backends/.jvm/src/main/scala/ORTModelBackend.scala‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
package org.emergentorder.onnx.backends
22

33
import scala.language.implicitConversions
4-
import scala.concurrent._
5-
import scala.concurrent.duration._
4+
import scala.concurrent.*
5+
import scala.concurrent.duration.*
66
import scala.concurrent.ExecutionContext.Implicits.global
7-
import scala.concurrent.duration._
8-
import ai.onnxruntime._
9-
import scala.jdk.CollectionConverters._
7+
import scala.concurrent.duration.*
8+
import compiletime.asMatchable
9+
import ai.onnxruntime.*
10+
import scala.jdk.CollectionConverters.*
1011

1112
import cats.effect.IO
12-
import cats.implicits._
13+
import cats.implicits.*
1314
import cats.effect.unsafe.implicits.global
14-
import org.emergentorder.onnx._
15-
import org.emergentorder.onnx.Tensors._
16-
import org.emergentorder.onnx.Tensors.Tensor._
17-
import org.emergentorder.compiletime._
18-
import io.kjaer.compiletime._
15+
import org.emergentorder.onnx.*
16+
import org.emergentorder.onnx.Tensors.*
17+
import org.emergentorder.onnx.Tensors.Tensor.*
18+
import org.emergentorder.compiletime.*
19+
import io.kjaer.compiletime.*
1920

20-
import ORTTensorUtils._
21+
import ORTTensorUtils.*
2122

2223
//TODO: Clean up, remove asInstaceOf, etc.
2324
class ORTModelBackend(onnxBytes: Array[Byte])
@@ -59,8 +60,8 @@ class ORTModelBackend(onnxBytes: Array[Byte])
5960
.map { i =>
6061
val tup = inputs.drop(i).take(1)
6162
tup match { // Spurious warning here, see: https://github.com/lampepfl/dotty/issues/10318
62-
case t: Tuple1[_] =>
63-
t(0) match {
63+
case t: Tuple1[?] =>
64+
t(0).asMatchable match {
6465
case tens: Tensor[T, Tuple3[Tt, Td, S]] =>
6566
tens.data.map(x => tens.shape.map(y => getOnnxTensor(x, y, env))).flatten
6667
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package org.emergentorder.onnx.backends
22

3-
import java.nio._
4-
import scala.jdk.CollectionConverters._
3+
import java.nio.*
4+
import scala.jdk.CollectionConverters.*
55
import scala.language.implicitConversions
66
import scala.util.Using
7-
import ai.onnxruntime._
7+
import ai.onnxruntime.*
88
import ai.onnxruntime.TensorInfo.OnnxTensorType
99
//import ai.onnxruntime.extensions.OrtxPackage
10-
import org.emergentorder.onnx._
11-
import org.emergentorder.onnx.Tensors._
12-
import org.emergentorder.onnx.Tensors.Tensor._
13-
import org.emergentorder.compiletime._
14-
import io.kjaer.compiletime._
15-
import onnx.onnx._
16-
17-
import cats.implicits._
10+
import org.emergentorder.onnx.*
11+
import org.emergentorder.onnx.Tensors.*
12+
import org.emergentorder.onnx.Tensors.Tensor.*
13+
import org.emergentorder.compiletime.*
14+
import io.kjaer.compiletime.*
15+
import onnx.onnx.*
16+
17+
import cats.implicits.*
1818
import cats.effect.IO
1919
import cats.effect.unsafe.implicits.global
20-
import ORTTensorUtils._
20+
import ORTTensorUtils.*
2121

2222
trait ORTOperatorBackend extends OpToONNXBytesConverter with AutoCloseable {
2323

‎backends/.jvm/src/main/scala/ORTOperatorBackendAll.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.emergentorder.onnx.backends
2-
import org.emergentorder.onnx._
3-
import org.emergentorder.onnxruntime._
4-
import org.emergentorder.onnxruntimecontrib._
2+
import org.emergentorder.onnx.*
3+
import org.emergentorder.onnxruntime.*
4+
import org.emergentorder.onnxruntimecontrib.*
55

66
//Going forward we only support ops (and their versions) which are supported in ONNX Runtime, opset 6+
77
//Current ONNX opset 16

‎backends/.jvm/src/main/scala/ORTTensorUtils.scala‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package org.emergentorder.onnx.backends
22

3-
import java.nio._
4-
import org.emergentorder.onnx.Tensors._
3+
import java.nio.*
4+
import compiletime.asMatchable
5+
import org.emergentorder.onnx.Tensors.*
56
import ai.onnxruntime.OnnxTensor
67
import ai.onnxruntime.OrtEnvironment
78
import ai.onnxruntime.OrtUtil
8-
import ai.onnxruntime.TensorInfo.OnnxTensorType._
9+
import ai.onnxruntime.TensorInfo.OnnxTensorType.*
910

1011
object ORTTensorUtils {
1112

1213
def getOnnxTensor[T](arr: Array[T], shape: Array[Int], env: OrtEnvironment): OnnxTensor = {
13-
arr(0) match {
14+
arr(0).asMatchable match {
1415
case b: Byte => getTensorByte(arr.asInstanceOf[Array[Byte]], shape, env)
1516
case s: Short => getTensorShort(arr.asInstanceOf[Array[Short]], shape, env)
1617
case d: Double => getTensorDouble(arr.asInstanceOf[Array[Double]], shape, env)

‎backends/.jvm/src/test/scala/BertTokenizerTest.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package org.emergentorder.onnx.backends
22

3-
import sys.process._
3+
import sys.process.*
44
import java.net.URL
55
import java.io.File
66
import java.nio.file.{Files, Paths}
77
import scala.language.postfixOps
8-
import org.emergentorder.onnx.Tensors._
9-
import org.emergentorder.onnx.Tensors.Tensor._
10-
import org.emergentorder.onnx.backends._
11-
import org.emergentorder.compiletime._
12-
import io.kjaer.compiletime._
8+
import org.emergentorder.onnx.Tensors.*
9+
import org.emergentorder.onnx.Tensors.Tensor.*
10+
import org.emergentorder.onnx.backends.*
11+
import org.emergentorder.compiletime.*
12+
import io.kjaer.compiletime.*
1313

1414
import org.scalatest.flatspec.AnyFlatSpec
1515
import org.scalatest.freespec.AsyncFreeSpec
16-
import org.scalatest.matchers.should._
16+
import org.scalatest.matchers.should.*
1717
import cats.effect.testing.scalatest.AsyncIOSpec
1818

1919

‎backends/.jvm/src/test/scala/SqueezeNetTest.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package org.emergentorder.onnx.backends
22

3-
import sys.process._
3+
import sys.process.*
44
import java.net.URL
55
import java.io.File
66
import java.nio.file.{Files, Paths}
77
import scala.language.postfixOps
8-
import org.emergentorder.onnx.Tensors._
9-
import org.emergentorder.onnx.Tensors.Tensor._
10-
import org.emergentorder.onnx.backends._
11-
import org.emergentorder.compiletime._
12-
import io.kjaer.compiletime._
8+
import org.emergentorder.onnx.Tensors.*
9+
import org.emergentorder.onnx.Tensors.Tensor.*
10+
import org.emergentorder.onnx.backends.*
11+
import org.emergentorder.compiletime.*
12+
import io.kjaer.compiletime.*
1313

1414
import org.scalatest.flatspec.AnyFlatSpec
1515
import org.scalatest.freespec.AsyncFreeSpec
16-
import org.scalatest.matchers.should._
16+
import org.scalatest.matchers.should.*
1717
import cats.effect.testing.scalatest.AsyncIOSpec
1818

1919
class ONNXScalaSpec extends AsyncFreeSpec with AsyncIOSpec with Matchers {

‎common/src/main/scala/BFloat16.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.emergentorder.onnx
1818

19-
import java.lang.{Float => JFloat}
19+
import java.lang.{Float as JFloat}
2020
import java.lang.Math.pow
2121
import scala.language.implicitConversions
2222

‎common/src/main/scala/Float16.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.emergentorder.onnx
1818

19-
import java.lang.{Float => JFloat}
19+
import java.lang.{Float as JFloat}
2020
import java.lang.Integer.numberOfLeadingZeros
2121
import java.lang.Math.pow
2222
import scala.language.implicitConversions

‎common/src/main/scala/TensorShapeDenotation.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import io.kjaer.compiletime.INil
1111
type DimensionDenotation = String & Singleton
1212

1313
sealed trait TensorShapeDenotation extends Product with Serializable {
14-
import TensorShapeDenotation._
14+
import TensorShapeDenotation.*
1515

1616
/** Prepend the head to this */
1717
def ##:[H <: DimensionDenotation, This >: this.type <: TensorShapeDenotation](
@@ -20,7 +20,7 @@ sealed trait TensorShapeDenotation extends Product with Serializable {
2020
org.emergentorder.compiletime.##:(head, this)
2121

2222
/** Concat with another shape * */
23-
def ++(that: TensorShapeDenotation): this.type Concat that.type =
23+
def ++(that: TensorShapeDenotation): this.type `Concat` that.type =
2424
TensorShapeDenotation.concat(this, that)
2525

2626
/** Reverse the dimension list */
@@ -79,15 +79,15 @@ object TensorShapeDenotation {
7979

8080
type IsEmpty[X <: TensorShapeDenotation] <: Boolean = X match {
8181
case TSNil => true
82-
case _ ##: _ => false
82+
case ? ##: ? => false
8383
}
8484

8585
type Head[X <: TensorShapeDenotation] <: DimensionDenotation = X match {
86-
case head ##: _ => head
86+
case head ##: ? => head
8787
}
8888

8989
type Tail[X <: TensorShapeDenotation] <: TensorShapeDenotation = X match {
90-
case _ ##: tail => tail
90+
case ? ##: tail => tail
9191
}
9292

9393
/** Represents reduction along axes, as defined in TensorFlow:

0 commit comments

Comments
 (0)