Add tests

Signed-off-by: Ryan Nett <[email protected]>

Author: rnett

tensorflow-core-kotlin/tensorflow-core-kotlin-api/pom.xml

@@ -60,6 +60,12 @@
       <artifactId>jmh-generator-annprocess</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test-junit5</artifactId>
+      <version>1.4.31</version>
+      <scope>test</scope>
+    </dependency>
     <!-- Include native binaries dependencies only for testing -->
     <dependency>
       <groupId>org.tensorflow</groupId>
@@ -221,6 +227,16 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.2</version>
+<!--        <configuration>-->
+<!--          <forkCount>1</forkCount>-->
+<!--          <reuseForks>false</reuseForks>-->
+<!--          <argLine>-Xmx2G -XX:MaxPermSize=256m</argLine>-->
+<!--        </configuration>-->
+      </plugin>
     </plugins>
   </build>
 </project>

tensorflow-core-kotlin/tensorflow-core-kotlin-api/src/main/kotlin/org/tensorflow/op/kotlin/OpsHelpers.kt

@@ -45,6 +45,7 @@ public fun KotlinOps.withSubScope(childScopeName: String): KotlinOps = KotlinOps
  *
  * @see org.tensorflow.op.Scope.withSubScope
  */
+// TODO should be a decorator too, when possible
 public inline fun <R> KotlinOps.withSubScope(childScopeName: String, block: KotlinOps.() -> R): R {
     contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
     return withSubScope(childScopeName).run(block)

tensorflow-core-kotlin/tensorflow-core-kotlin-api/src/test/kotlin/org/tensorflow/Example.kt renamed to tensorflow-core-kotlin/tensorflow-core-kotlin-api/src/test/kotlin/org/tensorflow/ExampleTest.kt

@@ -16,32 +16,32 @@
  */
 package org.tensorflow
 
-import org.junit.jupiter.api.Test
 import org.tensorflow.ndarray.Shape
 import org.tensorflow.ndarray.get
 import org.tensorflow.op.kotlin.KotlinOps
 import org.tensorflow.op.kotlin.tf
 import org.tensorflow.op.kotlin.withSubScope
 import org.tensorflow.types.TFloat32
+import kotlin.test.Test
 
-public fun KotlinOps.DenseLayer(
+private fun KotlinOps.DenseLayer(
     name: String,
     x: Operand<TFloat32>,
     n: Int,
     activation: KotlinOps.(Operand<TFloat32>) -> Operand<TFloat32> = { tf.nn.relu(it) }
 ): Operand<TFloat32> = tf.withSubScope(name) {
     val inputDims = x.shape()[1]
-    val W = tf.variable(tf.math.add(tf.zeros(tf.array(inputDims.toInt(), n), TFloat32::class.java), constant(1f)))
-    val b = tf.variable(tf.math.add(tf.zeros(tf.array(n), TFloat32::class.java), constant(1f)))
-    activation(tf.math.add(tf.linalg.matMul(x, W), b))
+    val W = tf.variable(tf.ones<TFloat32>(tf.array(inputDims.toInt(), n)))
+    val b = tf.variable(tf.ones<TFloat32>(tf.array(n)))
+    activation((x matMul W) + b)
 }
 
-public class Example {
+public class ExampleTest {
     @Test
     public fun mnistExample() {
         Graph {
             val input = tf.placeholderWithDefault(
-                tf.math.add(tf.zeros(tf.array(1, 28, 28, 3)), tf.constant(1f)),
+                tf.ones<TFloat32>(tf.array(1, 28, 28, 3)),
                 Shape.of(-1, 28, 28, 3)
             )
 
@@ -53,10 +53,11 @@ public class Example {
                 DenseLayer("OutputLayer", x, 10) { tf.math.sigmoid(x) }
             }
 
-//            useSession {
-//                val outputValue = it.run(fetches = listOf(output))[output]
-//                println(outputValue.data())
-//            }
+            useSession { session ->
+
+                val outputValue = session.runner().fetch(output).run()[0] as TFloat32
+                println(outputValue.getFloat(0))
+            }
         }
     }
 }