Skip to content

Split should return TransformedTensors #133

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
Mar 29, 2018
Merged

Split should return TransformedTensors #133

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
2af1966
Split should return TransformedTensors
Atry Mar 29, 2018
25ad61a
Merge branch '0.3.x' into split-type-annotation
Atry Mar 29, 2018
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
4 changes: 2 additions & 2 deletions Tensors/src/main/scala/com/thoughtworks/compute/Tensors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,10 +937,10 @@ trait Tensors extends OpenCL {
/**
* @group delayed
*/
def split(dimension: Int): IndexedSeq[Tensor] = {
def split(dimension: Int): IndexedSeq[TransformedTensor] = {
// TODO: override map/reduce to produce less OpenCL C code
val newShape = shape.patch(dimension, Nil, 1)
final class TensorSeq extends IndexedSeq[Tensor] {
final class TensorSeq extends IndexedSeq[TransformedTensor] {

override def stringPrefix = "TensorSeq"

Expand Down
2 changes: 1 addition & 1 deletion Tensors/src/test/scala/com/thoughtworks/compute/TensorsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ class TensorsSpec extends AsyncFreeSpec with Matchers {
val Array(`j`, k) = matrix2.shape
val product = matrix1.broadcast(Array(i, j, k)) * matrix2.reshape(Array(1, j, k)).broadcast(Array(i, j, k))

product.split(1).reduce(_ + _)
product.split(1).reduce[Tensor](_ + _)

}

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/src/jmh/scala/com/thoughtworks/compute/benchmarks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ object benchmarks {
// unroll only j
val Array(`j`, k) = matrix2.shape
val product = matrix1.broadcast(Array(i, j, k)) * matrix2.reshape(Array(1, j, k)).broadcast(Array(i, j, k))
product.split(1).reduce(_ + _)
product.split(1).reduce[Tensor](_ + _)
}
}

Expand Down