Skip to content

Allow casting a tensor of size 1 to scalar #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2023
Merged

Allow casting a tensor of size 1 to scalar #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3adee2
Allow casting a tensor of size 1 to scalar
praj-0 Mar 30, 2023
6153b74
Merge branch 'master' into u/praj/cast_tensor1_to_scalar
jsleight Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mleap-core/src/main/scala/ml/combust/mleap/core/types/Casting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ object Casting {
}
}
}
case (tt: TensorType, _: ScalarType) if tt.dimensions.exists(_.isEmpty) =>
case (tt: TensorType, _: ScalarType) if tt.dimensions.exists(dimensions => dimensions.isEmpty || dimensions.product == 1) =>
baseCast(from.base, to.base).map {
_.map {
c => (v: Any) => c(v.asInstanceOf[Tensor[_]](0))
Expand Down
2 changes: 2 additions & 0 deletions mleap-core/src/test/scala/ml/combust/mleap/core/types/CastingSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ class CastingSpec extends FunSpec {
val tc = Casting.cast(ScalarType(from), TensorType(to, Some(Seq()))).getOrElse(Success((v: Any) => v)).get
val ct = Casting.cast(TensorType(from, Some(Seq())), ScalarType(to)).getOrElse(Success((v: Any) => v)).get
val lct = Casting.cast(TensorType(from, Some(Seq(expectedList.length))), ListType(to)).getOrElse(Success((v: Any) => v)).get
val ct1 = Casting.cast(TensorType(from, Some(Seq(1))), ScalarType(to)).getOrElse(Success((v: Any) => v)).get

assert(c(fromTensor) == expectedTensor)
assertThrows[NullPointerException](oc(null))
Expand All @@ -205,6 +206,7 @@ class CastingSpec extends FunSpec {
assert(tc(fromValue) == expectedScalarTensor)
assert(ct(fromScalarTensor) == expectedValue)
assert(lct(fromListTensor) == expectedList)
assert(ct1(fromTensor) == expectedValue)
}

}
Expand Down