Merge branch '0.3.x' into split-type-annotation

Atry · web-flow · commit 25ad61a52678 · 2018-03-29T19:12:14.000+08:00
diff --git a/Tensors/src/main/scala/com/thoughtworks/compute/Tensors.scala b/Tensors/src/main/scala/com/thoughtworks/compute/Tensors.scala
@@ -940,7 +940,9 @@ trait Tensors extends OpenCL {
     def split(dimension: Int): IndexedSeq[TransformedTensor] = {
       // TODO: override map/reduce to produce less OpenCL C code
       val newShape = shape.patch(dimension, Nil, 1)
-      new IndexedSeq[TransformedTensor] {
+      final class TensorSeq extends IndexedSeq[TransformedTensor] {
+
+        override def stringPrefix = "TensorSeq"
 
         val length: Int = shape(dimension)
 
@@ -973,6 +975,7 @@ trait Tensors extends OpenCL {
         }
 
       }
+      new TensorSeq
     }
 
     /**
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.3.0-SNAPSHOT"
+version in ThisBuild := "0.3.1-SNAPSHOT"

Original file line number	Diff line number	Diff line change
`@@ -940,7 +940,9 @@ trait Tensors extends OpenCL {`
`940`	`940`	`def split(dimension: Int): IndexedSeq[TransformedTensor] = {`
`941`	`941`	`// TODO: override map/reduce to produce less OpenCL C code`
`942`	`942`	`val newShape = shape.patch(dimension, Nil, 1)`
`943`		`- new IndexedSeq[TransformedTensor] {`
	`943`	`+ final class TensorSeq extends IndexedSeq[TransformedTensor] {`
	`944`	`+`
	`945`	`+ override def stringPrefix = "TensorSeq"`
`944`	`946`
`945`	`947`	`val length: Int = shape(dimension)`
`946`	`948`
`@@ -973,6 +975,7 @@ trait Tensors extends OpenCL {`
`973`	`975`	`}`
`974`	`976`
`975`	`977`	`}`
	`978`	`+ new TensorSeq`
`976`	`979`	`}`
`977`	`980`
`978`	`981`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version in ThisBuild := "0.3.0-SNAPSHOT"`
	`1`	`+version in ThisBuild := "0.3.1-SNAPSHOT"`