New codegen, support for Java 11 builds

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

Author: rnett

tensorflow-core-kotlin/pom.xml

@@ -47,5 +47,14 @@
     <kotlin.version>1.4.21</kotlin.version>
     <kotlin.jvmTarget>1.8</kotlin.jvmTarget>
   </properties>
+
+  <profiles>
+    <profile>
+      <id>jdk11</id>
+      <properties>
+        <kotlin.jvmTarget>11</kotlin.jvmTarget>
+      </properties>
+    </profile>
+  </profiles>
 </project>
 

tensorflow-core-kotlin/tensorflow-core-kotlin-api/src/gen/annotations/org/tensorflow/op/kotlin/DtypesOps.kt

@@ -76,14 +76,14 @@ public class DtypesOps(
      * @param fill The value to pad if width > -1.  If empty, pads with spaces.
      *  Another typical value is '0'.  String cannot be longer than 1 character.
      */
-    public fun <T : TType> asString(
-        input: Operand<T>,
+    public fun asString(
+        input: Operand<out TType>,
         precision: Long? = null,
         scientific: Boolean? = null,
         shortest: Boolean? = null,
         width: Long? = null,
         fill: String? = null
-    ): AsString = java.asString<T>(    
+    ): AsString = java.asString(    
         input,
         *listOfNotNull(
             precision?.let{ org.tensorflow.op.dtypes.AsString.precision(it) },
@@ -105,11 +105,11 @@ public class DtypesOps(
      * @see org.tensorflow.op.DtypesOps.cast
      * @param Truncate @param Truncate
      */
-    public fun <U : TType, T : TType> cast(
-        x: Operand<T>,
+    public fun <U : TType> cast(
+        x: Operand<out TType>,
         DstT: Class<U>,
         Truncate: Boolean? = null
-    ): Cast<U> = java.cast<U, T>(    
+    ): Cast<U> = java.cast<U>(    
         x,
         DstT,
         *listOfNotNull(
@@ -164,8 +164,8 @@ public class DtypesOps(
      * @param Truncate @param Truncate
      */
     @JvmName("castReified")
-    public inline fun <reified U : TType, T : TType> cast(x: Operand<T>, Truncate: Boolean? = null):
-            Cast<U> = cast<U, T>(x, U::class.java, Truncate)
+    public inline fun <reified U : TType> cast(x: Operand<out TType>, Truncate: Boolean? = null):
+            Cast<U> = cast<U>(x, U::class.java, Truncate)
 
     /**
      * Converts two real numbers to a complex number.

tensorflow-core-kotlin/tensorflow-core-kotlin-api/src/gen/annotations/org/tensorflow/op/kotlin/ImageOps.kt

@@ -256,14 +256,14 @@ public class ImageOps(
      *  methods are supported: Bilinear and Nearest Neighbor.
      * @param extrapolationValue Value used for extrapolation, when applicable.
      */
-    public fun <T : TNumber> cropAndResize(
-        image: Operand<T>,
+    public fun cropAndResize(
+        image: Operand<out TNumber>,
         boxes: Operand<TFloat32>,
         boxInd: Operand<TInt32>,
         cropSize: Operand<TInt32>,
         method: String? = null,
         extrapolationValue: Float? = null
-    ): CropAndResize = java.cropAndResize<T>(    
+    ): CropAndResize = java.cropAndResize(    
         image,
         boxes,
         boxInd,
@@ -298,13 +298,13 @@ public class ImageOps(
      * @param method A string specifying the interpolation method. Only 'bilinear' is
      *  supported for now.
      */
-    public fun <T : TNumber> cropAndResizeGradBoxes(
+    public fun cropAndResizeGradBoxes(
         grads: Operand<TFloat32>,
-        image: Operand<T>,
+        image: Operand<out TNumber>,
         boxes: Operand<TFloat32>,
         boxInd: Operand<TInt32>,
         method: String? = null
-    ): CropAndResizeGradBoxes = java.cropAndResizeGradBoxes<T>(    
+    ): CropAndResizeGradBoxes = java.cropAndResizeGradBoxes(    
         grads,
         image,
         boxes,
@@ -783,8 +783,8 @@ public class ImageOps(
      * @see org.tensorflow.op.ImageOps.encodePng
      * @param compression Compression level.
      */
-    public fun <T : TNumber> encodePng(image: Operand<T>, compression: Long? = null): EncodePng =
-            java.encodePng<T>(    
+    public fun encodePng(image: Operand<out TNumber>, compression: Long? = null): EncodePng =
+            java.encodePng(    
         image,
         *listOfNotNull(
             compression?.let{ org.tensorflow.op.image.EncodePng.compression(it) }
@@ -1084,11 +1084,11 @@ public class ImageOps(
      * tensors are
      *  aligned, preserving the values at the corner pixels. Defaults to false.
      */
-    public fun <T : TNumber> resizeArea(
-        images: Operand<T>,
+    public fun resizeArea(
+        images: Operand<out TNumber>,
         size: Operand<TInt32>,
         alignCorners: Boolean? = null
-    ): ResizeArea = java.resizeArea<T>(    
+    ): ResizeArea = java.resizeArea(    
         images,
         size,
         *listOfNotNull(
@@ -1112,12 +1112,12 @@ public class ImageOps(
      *  aligned, preserving the values at the corner pixels. Defaults to false.
      * @param halfPixelCenters @param halfPixelCenters
      */
-    public fun <T : TNumber> resizeBicubic(
-        images: Operand<T>,
+    public fun resizeBicubic(
+        images: Operand<out TNumber>,
         size: Operand<TInt32>,
         alignCorners: Boolean? = null,
         halfPixelCenters: Boolean? = null
-    ): ResizeBicubic = java.resizeBicubic<T>(    
+    ): ResizeBicubic = java.resizeBicubic(    
         images,
         size,
         *listOfNotNull(
@@ -1142,12 +1142,12 @@ public class ImageOps(
      *  aligned, preserving the values at the corner pixels. Defaults to false.
      * @param halfPixelCenters @param halfPixelCenters
      */
-    public fun <T : TNumber> resizeBilinear(
-        images: Operand<T>,
+    public fun resizeBilinear(
+        images: Operand<out TNumber>,
         size: Operand<TInt32>,
         alignCorners: Boolean? = null,
         halfPixelCenters: Boolean? = null
-    ): ResizeBilinear = java.resizeBilinear<T>(    
+    ): ResizeBilinear = java.resizeBilinear(    
         images,
         size,
         *listOfNotNull(
@@ -1321,14 +1321,14 @@ public class ImageOps(
      * @param kernelType @param kernelType
      * @param antialias @param antialias
      */
-    public fun <T : TNumber> scaleAndTranslate(
-        images: Operand<T>,
+    public fun scaleAndTranslate(
+        images: Operand<out TNumber>,
         size: Operand<TInt32>,
         scale: Operand<TFloat32>,
         translation: Operand<TFloat32>,
         kernelType: String? = null,
         antialias: Boolean? = null
-    ): ScaleAndTranslate = java.scaleAndTranslate<T>(    
+    ): ScaleAndTranslate = java.scaleAndTranslate(    
         images,
         size,
         scale,

tensorflow-core-kotlin/tensorflow-core-kotlin-api/src/gen/annotations/org/tensorflow/op/kotlin/IoOps.kt

@@ -1324,11 +1324,11 @@ public class IoOps(
      * @return a new instance of SerializeManySparse
      * @see org.tensorflow.op.IoOps.serializeManySparse
      */
-    public fun <T : TType> serializeManySparse(
+    public fun serializeManySparse(
         sparseIndices: Operand<TInt64>,
-        sparseValues: Operand<T>,
+        sparseValues: Operand<out TType>,
         sparseShape: Operand<TInt64>
-    ): SerializeManySparse<TString> = java.serializeManySparse<T>(    
+    ): SerializeManySparse<TString> = java.serializeManySparse(    
         sparseIndices,
         sparseValues,
         sparseShape
@@ -1354,12 +1354,12 @@ public class IoOps(
      * @return a new instance of SerializeManySparse
      * @see org.tensorflow.op.IoOps.serializeManySparse
      */
-    public fun <U : TType, T : TType> serializeManySparse(
+    public fun <U : TType> serializeManySparse(
         sparseIndices: Operand<TInt64>,
-        sparseValues: Operand<T>,
+        sparseValues: Operand<out TType>,
         sparseShape: Operand<TInt64>,
         outType: Class<U>
-    ): SerializeManySparse<U> = java.serializeManySparse<U, T>(    
+    ): SerializeManySparse<U> = java.serializeManySparse<U>(    
         sparseIndices,
         sparseValues,
         sparseShape,
@@ -1376,11 +1376,11 @@ public class IoOps(
      * @return a new instance of SerializeSparse
      * @see org.tensorflow.op.IoOps.serializeSparse
      */
-    public fun <T : TType> serializeSparse(
+    public fun serializeSparse(
         sparseIndices: Operand<TInt64>,
-        sparseValues: Operand<T>,
+        sparseValues: Operand<out TType>,
         sparseShape: Operand<TInt64>
-    ): SerializeSparse<TString> = java.serializeSparse<T>(    
+    ): SerializeSparse<TString> = java.serializeSparse(    
         sparseIndices,
         sparseValues,
         sparseShape
@@ -1398,12 +1398,12 @@ public class IoOps(
      * @return a new instance of SerializeSparse
      * @see org.tensorflow.op.IoOps.serializeSparse
      */
-    public fun <U : TType, T : TType> serializeSparse(
+    public fun <U : TType> serializeSparse(
         sparseIndices: Operand<TInt64>,
-        sparseValues: Operand<T>,
+        sparseValues: Operand<out TType>,
         sparseShape: Operand<TInt64>,
         outType: Class<U>
-    ): SerializeSparse<U> = java.serializeSparse<U, T>(    
+    ): SerializeSparse<U> = java.serializeSparse<U>(    
         sparseIndices,
         sparseValues,
         sparseShape,
@@ -1417,8 +1417,7 @@ public class IoOps(
      * @return a new instance of SerializeTensor
      * @see org.tensorflow.op.IoOps.serializeTensor
      */
-    public fun <T : TType> serializeTensor(tensor: Operand<T>): SerializeTensor =
-            java.serializeTensor<T>(    
+    public fun serializeTensor(tensor: Operand<out TType>): SerializeTensor = java.serializeTensor(    
         tensor
         )
 
@@ -1676,11 +1675,11 @@ public class IoOps(
      * @see org.tensorflow.op.IoOps.serializeManySparse
      */
     @JvmName("serializeManySparseReified")
-    public inline fun <reified U : TType, T : TType> serializeManySparseTyped(
+    public inline fun <reified U : TType> serializeManySparseTyped(
         sparseIndices: Operand<TInt64>,
-        sparseValues: Operand<T>,
+        sparseValues: Operand<out TType>,
         sparseShape: Operand<TInt64>
-    ): SerializeManySparse<U> = serializeManySparse<U, T>(sparseIndices, sparseValues, sparseShape,
+    ): SerializeManySparse<U> = serializeManySparse<U>(sparseIndices, sparseValues, sparseShape,
             U::class.java)
 
     /**
@@ -1696,10 +1695,10 @@ public class IoOps(
      * @see org.tensorflow.op.IoOps.serializeSparse
      */
     @JvmName("serializeSparseReified")
-    public inline fun <reified U : TType, T : TType> serializeSparseTyped(
+    public inline fun <reified U : TType> serializeSparseTyped(
         sparseIndices: Operand<TInt64>,
-        sparseValues: Operand<T>,
+        sparseValues: Operand<out TType>,
         sparseShape: Operand<TInt64>
-    ): SerializeSparse<U> = serializeSparse<U, T>(sparseIndices, sparseValues, sparseShape,
+    ): SerializeSparse<U> = serializeSparse<U>(sparseIndices, sparseValues, sparseShape,
             U::class.java)
 }