From 2a15d1c39e8db52a10330e98445b73e4468bc76e Mon Sep 17 00:00:00 2001 From: Jim Clarke Date: Mon, 14 Jun 2021 16:45:49 -0400 Subject: [PATCH 1/7] Modified Metrics to add init(Ops) method and to provide CTORS without an Ops parameter. This does not address adding an Ops parameter to any call methods. --- .../org/tensorflow/framework/metrics/AUC.java | 533 +++++++++++++++--- .../framework/metrics/Accuracy.java | 41 +- .../framework/metrics/BinaryAccuracy.java | 61 +- .../framework/metrics/BinaryCrossentropy.java | 33 +- .../metrics/CategoricalAccuracy.java | 39 +- .../metrics/CategoricalCrossentropy.java | 67 ++- .../framework/metrics/CategoricalHinge.java | 24 +- .../framework/metrics/CosineSimilarity.java | 55 +- .../framework/metrics/FalseNegatives.java | 89 ++- .../framework/metrics/FalsePositives.java | 89 ++- .../tensorflow/framework/metrics/Hinge.java | 24 +- .../framework/metrics/KLDivergence.java | 24 +- .../framework/metrics/LogCoshError.java | 24 +- .../tensorflow/framework/metrics/Mean.java | 12 + .../framework/metrics/MeanAbsoluteError.java | 24 +- .../metrics/MeanAbsolutePercentageError.java | 24 +- .../tensorflow/framework/metrics/MeanIoU.java | 52 +- .../framework/metrics/MeanRelativeError.java | 103 +++- .../framework/metrics/MeanSquaredError.java | 24 +- .../metrics/MeanSquaredLogarithmicError.java | 24 +- .../framework/metrics/MeanTensor.java | 40 +- .../tensorflow/framework/metrics/Metric.java | 104 +++- .../tensorflow/framework/metrics/Metrics.java | 20 +- .../tensorflow/framework/metrics/Poisson.java | 24 +- .../framework/metrics/Precision.java | 221 +++++++- .../framework/metrics/PrecisionAtRecall.java | 77 ++- .../tensorflow/framework/metrics/Recall.java | 241 +++++++- .../framework/metrics/RecallAtPrecision.java | 80 ++- .../metrics/RootMeanSquaredError.java | 34 +- .../metrics/SensitivityAtSpecificity.java | 78 ++- .../metrics/SparseCategoricalAccuracy.java | 52 +- .../SparseCategoricalCrossentropy.java | 30 +- .../SparseTopKCategoricalAccuracy.java | 40 +- .../metrics/SpecificityAtSensitivity.java | 82 ++- .../framework/metrics/SquaredHinge.java | 24 +- .../org/tensorflow/framework/metrics/Sum.java | 28 +- .../metrics/TopKCategoricalAccuracy.java | 44 +- .../framework/metrics/TrueNegatives.java | 88 ++- .../framework/metrics/TruePositives.java | 89 ++- .../impl/ConfusionMatrixConditionCount.java | 92 ++- .../framework/metrics/impl/Initializable.java | 37 ++ .../metrics/impl/MeanMetricWrapper.java | 26 +- .../framework/metrics/impl/MetricsHelper.java | 24 +- .../framework/metrics/impl/Reduce.java | 58 +- .../impl/SensitivitySpecificityBase.java | 67 ++- .../framework/metrics/impl/SetsOps.java | 4 +- .../framework/metrics/impl/SymbolicShape.java | 5 +- .../metrics/impl/WeightsBroadcastOps.java | 11 +- .../tensorflow/framework/metrics/AUCTest.java | 6 +- 49 files changed, 2688 insertions(+), 404 deletions(-) create mode 100644 tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java index 0ba94798c19..38830df246b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java @@ -14,15 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; @@ -36,6 +27,16 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Metric that computes the approximate AUC (Area under the curve) via a Riemann sum. * @@ -151,6 +152,441 @@ public class AUC extends Metric { private boolean initialized; + /** + * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, + * {@link #DEFAULT_NUM_THRESHOLDS} for the numThresholds, {@link AUCCurve#ROC} for the curve type, + * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, + * {@code false} for multiLabel, and {@code null} for labelWeights. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(long seed, Class type) { + this( + null, + DEFAULT_NUM_THRESHOLDS, + AUCCurve.ROC, + AUCSummationMethod.INTERPOLATION, + null, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NUM_THRESHOLDS} for the + * numThresholds, {@link AUCCurve#ROC} for the curve type, {@link + * AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, {@code + * false} for multiLabel, and {@code null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(String name, long seed, Class type) { + this( + name, + DEFAULT_NUM_THRESHOLDS, + AUCCurve.ROC, + AUCSummationMethod.INTERPOLATION, + null, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, + * {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the + * summation method, {@code null} for thresholds, {@code false} for multiLabel, and {@code null} + * for labelWeights. + * + * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values + * must be > 1. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(int numThresholds, long seed, Class type) { + this( + null, + numThresholds, + AUCCurve.ROC, + AUCSummationMethod.INTERPOLATION, + null, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, + * {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the + * summation method, {@code null} for numThresholds, {@code false} for multiLabel, and {@code + * null} for labelWeights. + * + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(float[] thresholds, long seed, Class type) { + this( + null, + DEFAULT_NUM_THRESHOLDS, + AUCCurve.ROC, + AUCSummationMethod.INTERPOLATION, + thresholds, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric. using {@link AUCCurve#ROC} for the curve type, + * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, + * {@code false} for multiLabel, and {@code null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values + * must be > 1. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(String name, int numThresholds, long seed, Class type) { + this( + name, + numThresholds, + AUCCurve.ROC, + AUCSummationMethod.INTERPOLATION, + null, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@code null} for numThresholds, {@link + * AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the summation + * method, {@link #DEFAULT_NUM_THRESHOLDS} num thresholds, {@code false} for multiLabel, and + * {@code null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(String name, float[] thresholds, long seed, Class type) { + this( + name, + DEFAULT_NUM_THRESHOLDS, + AUCCurve.ROC, + AUCSummationMethod.INTERPOLATION, + thresholds, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@link AUCSummationMethod#INTERPOLATION} for + * the summation method, {@code null} for thresholds, {@code false} for multiLabel, and {@code + * null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values + * must be > 1. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(String name, int numThresholds, AUCCurve curve, long seed, Class type) { + this( + name, + numThresholds, + curve, + AUCSummationMethod.INTERPOLATION, + null, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@code null} for numThresholds, {@link + * AUCSummationMethod#INTERPOLATION} for the summation method, {@link #DEFAULT_NUM_THRESHOLDS} num + * thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(String name, float[] thresholds, AUCCurve curve, long seed, Class type) { + this( + name, + DEFAULT_NUM_THRESHOLDS, + curve, + AUCSummationMethod.INTERPOLATION, + thresholds, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, + * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, + * {@code false} for multiLabel, and {@code null} for labelWeights. + * + * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values + * must be > 1. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(int numThresholds, AUCCurve curve, long seed, Class type) { + this( + null, + numThresholds, + curve, + AUCSummationMethod.INTERPOLATION, + null, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@code null} for numThresholds, {@link + * AUCSummationMethod#INTERPOLATION} for the summation method, {@code false} for multiLabel, and + * {@code null} for labelWeights. + * + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC(float[] thresholds, AUCCurve curve, long seed, Class type) { + this( + null, + DEFAULT_NUM_THRESHOLDS, + curve, + AUCSummationMethod.INTERPOLATION, + thresholds, + false, + null, + seed, + type); + } + + /** + * Creates an AUC (Area under the curve) metric. using {@link #DEFAULT_NAME} for the metric name,, + * {@code null} for thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. + * + * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values + * must be > 1. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param summationMethod Specifies the Riemann summation method used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC( + int numThresholds, + AUCCurve curve, + AUCSummationMethod summationMethod, + long seed, + Class type) { + this(null, numThresholds, curve, summationMethod, null, false, null, seed, type); + } + + /** + * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, + * {@code null} for numThresholds, {@code false} for multiLabel, and {@code null} for + * labelWeights. + * + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param summationMethod Specifies the Riemann summation method used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC( + float[] thresholds, + AUCCurve curve, + AUCSummationMethod summationMethod, + long seed, + Class type) { + this(null, DEFAULT_NUM_THRESHOLDS, curve, summationMethod, thresholds, false, null, seed, type); + } + + /** + * Creates an AUC (Area under the curve) metric. using {@code null} for thresholds, {@code false} + * for multiLabel, and {@code null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values + * must be > 1. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param summationMethod Specifies the Riemann summation method used, + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC( + String name, + int numThresholds, + AUCCurve curve, + AUCSummationMethod summationMethod, + long seed, + Class type) { + this(name, numThresholds, curve, summationMethod, null, false, null, seed, type); + } + + /** + * Creates an AUC (Area under the curve) metric. using {@code null} for the numThresholds, {@code + * false} for multiLabel, and {@code null} for labelWeights. + * + * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param summationMethod Specifies the Riemann summation method used. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + */ + public AUC( + String name, + float[] thresholds, + AUCCurve curve, + AUCSummationMethod summationMethod, + long seed, + Class type) { + this(name, DEFAULT_NUM_THRESHOLDS, curve, summationMethod, thresholds, false, null, seed, type); + } + + /** + * Creates an AUC (Area under the curve) metric. + * + * @param name the name of the metric, if name is null then use {@link #DEFAULT_NAME}. + * @param numThresholds the number of thresholds to use when discretizing the roc curve. This + * includes the bracketing 0 and 1 thresholds, so the value must be ≥ 2. + * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link + * AUCCurve#PR} for the Precision-Recall-curve. + * @param summationMethod Specifies the Riemann summation method used + * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, + * the numThresholds parameter is ignored. Values should be in [0, 1]. This method + * automatically brackets the provided {@code thresholds} with a (-{@link #EPSILON}) below and + * a (1 + {@link #EPSILON}) above. + * @param multiLabel boolean indicating whether multilabel data should be treated as such, wherein + * AUC is computed separately for each label and then averaged across labels, or (when false) + * if the data should be flattened into a single label before AUC computation. In the latter + * case, when multilabel data is passed to AUC, each label-prediction pair is treated as an + * individual data point. Should be set to {@code false} for multi-class data. + * @param labelWeights non-negative weights used to compute AUCs for multilabel data. When {@code + * multiLabel} is true, the weights are applied to the individual label AUCs when they are + * averaged to produce the multi-label AUC. When it's false, they are used to weight the + * individual label predictions in computing the confusion matrix on the flattened data. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the confusion matrix variables. + * @throws IllegalArgumentException if numThresholds is less than 2 and thresholds is null, or if + * a threshold value is less than 0 or greater than 1. + */ + public AUC( + String name, + int numThresholds, + AUCCurve curve, + AUCSummationMethod summationMethod, + float[] thresholds, + boolean multiLabel, + Operand labelWeights, + long seed, + Class type) { + super(name == null ? DEFAULT_NAME : name, seed); + truePositivesName = getVariableName(TRUE_POSITIVES); + falsePositivesName = getVariableName(FALSE_POSITIVES); + trueNegativesName = getVariableName(TRUE_NEGATIVES); + falseNegativesName = getVariableName(FALSE_NEGATIVES); + this.curve = curve; + this.summationMethod = summationMethod; + this.type = type; + + this.multiLabel = multiLabel; + + if (thresholds != null) { // ignore numThresholds + for (float t : thresholds) { + if (t < 0.0f || t > 1.0f) { + throw new IllegalArgumentException( + String.format( + "Threshold values must be in range [0, 1], inclusive. Invalid values: %s", + Arrays.toString(thresholds))); + } + } + this.numThresholds = thresholds.length + 2; + Arrays.sort(thresholds); + } else { + + if (numThresholds <= 1) { + throw new IllegalArgumentException("numThresholds must be > 1."); + } + this.numThresholds = numThresholds; + thresholds = new float[this.numThresholds - 2]; + // linearly interpolate (numThresholds - 2) thresholds between endpoints + for (int i = 0; i < thresholds.length; i++) { + thresholds[i] = (i + 1) * 1.0f / (this.numThresholds - 1); + } + } + + // Add an endpoint "threshold" below zero and above one for either + // threshold method to account for floating point imprecisions. + this.thresholds = new float[this.numThresholds]; + this.thresholds[0] = -EPSILON; + System.arraycopy(thresholds, 0, this.thresholds, 1, thresholds.length); + this.thresholds[this.numThresholds - 1] = 1 + EPSILON; + + // Handle multilabel arguments. + this.labelWeights = labelWeights; + + if (multiLabel) { + numLabels = null; + } + } + /** * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, * {@link #DEFAULT_NUM_THRESHOLDS} for the numThresholds, {@link AUCCurve#ROC} for the curve type, @@ -586,56 +1022,28 @@ public AUC( Operand labelWeights, long seed, Class type) { - super(tf, name == null ? DEFAULT_NAME : name, seed); - truePositivesName = getVariableName(TRUE_POSITIVES); - falsePositivesName = getVariableName(FALSE_POSITIVES); - trueNegativesName = getVariableName(TRUE_NEGATIVES); - falseNegativesName = getVariableName(FALSE_NEGATIVES); - this.curve = curve; - this.summationMethod = summationMethod; - this.type = type; - - this.multiLabel = multiLabel; - - if (thresholds != null) { // ignore numThresholds - for (float t : thresholds) { - if (t < 0.0f || t > 1.0f) { - throw new IllegalArgumentException( - String.format( - "Threshold values must be in range [0, 1], inclusive. Invalid values: %s", - Arrays.toString(thresholds))); - } - } - this.numThresholds = thresholds.length + 2; - Arrays.sort(thresholds); - } else { - - if (numThresholds <= 1) { - throw new IllegalArgumentException("numThresholds must be > 1."); - } - this.numThresholds = numThresholds; - thresholds = new float[this.numThresholds - 2]; - // linearly interpolate (numThresholds - 2) thresholds between endpoints - for (int i = 0; i < thresholds.length; i++) { - thresholds[i] = (i + 1) * 1.0f / (this.numThresholds - 1); - } - } - - // Add an endpoint "threshold" below zero and above one for either - // threshold method to account for floating point imprecisions. - this.thresholds = new float[this.numThresholds]; - this.thresholds[0] = -EPSILON; - System.arraycopy(thresholds, 0, this.thresholds, 1, thresholds.length); - this.thresholds[this.numThresholds - 1] = 1 + EPSILON; - - // Handle multilabel arguments. + this( + name, + numThresholds, + curve, + summationMethod, + thresholds, + multiLabel, + labelWeights, + seed, + type); + init(tf); + } + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); if (labelWeights != null) { // assert that labelWeights are non-negative. - - this.labelWeights = labelWeights; Op checks = - tf.withSubScope("AUC") + getTF() + .withSubScope("AUC") .assertThat( tf.math.greaterEqual(labelWeights, cast(tf, tf.constant(0), labelWeights.type())), Collections.singletonList( @@ -646,10 +1054,7 @@ public AUC( this.labelWeights = ltf.identity(this.labelWeights); } - - if (multiLabel) { - numLabels = null; - } + return getTF(); } /** @@ -664,7 +1069,7 @@ private Map> build(Shape shape) { if (initialized) { return Collections.EMPTY_MAP; } - Ops tf = getTF(); + Ops tf = checkTF(); if (isMultiLabel()) { if (shape == null) { @@ -726,7 +1131,7 @@ public List updateStateList( Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = getTF(); + Ops tf = checkTF(); Operand tLabels = cast(tf, labels, type); Operand tPredictions = cast(tf, predictions, type); Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; @@ -915,12 +1320,12 @@ private Operand interpolatePRAuc() { /** {@inheritDoc} */ @Override public Operand result() { - + Ops tf = checkTF(); if (getCurve() == AUCCurve.PR && getSummationMethod() == AUCSummationMethod.INTERPOLATION) { // This use case is different and is handled separately. return interpolatePRAuc(); } - Ops tf = getTF(); + Operand x; Operand y; Operand recall = tf.math.divNoNan(truePositives, tf.math.add(truePositives, falseNegatives)); @@ -988,7 +1393,7 @@ public Operand result() { @Override public Op resetStates() { List updateOperations = new ArrayList<>(initializers.values()); - return getTF().withSubScope("resetStates").withControlDependencies(updateOperations).noOp(); + return checkTF().withSubScope("resetStates").withControlDependencies(updateOperations).noOp(); } /** @return the numThresholds */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java index 14f45020739..fb30306b718 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -25,6 +23,8 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Metric that calculates how often predictions equals labels. * @@ -38,6 +38,30 @@ */ public class Accuracy extends MeanMetricWrapper implements LossMetric { + /** + * Creates an Accuracy Metric using {@link Class#getSimpleName()} for the metric name + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Accuracy(long seed, Class type) { + this((String) null, seed, type); + } + + /** + * Creates an Accuracy Metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Accuracy(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates an Accuracy Metric using {@link Class#getSimpleName()} for the metric name * @@ -60,8 +84,8 @@ public Accuracy(Ops tf, long seed, Class type) { * @param type the data type for the variables */ public Accuracy(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -76,10 +100,11 @@ public Accuracy(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); LossTuple tuple = - MetricsHelper.raggedAssertCompatibleAndGetFlatValues(getTF(), tLabels, tPredictions); + MetricsHelper.raggedAssertCompatibleAndGetFlatValues(tf, tLabels, tPredictions); tLabels = tuple.getLabels(); tPredictions = tuple.getTarget(); @@ -91,6 +116,6 @@ public Operand call( } // cast TBool to result type - return cast(getTF(), getTF().math.equal(tLabels, tPredictions), getResultType()); + return cast(tf, tf.math.equal(tLabels, tPredictions), getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java index c27bf1b2acf..d881dc5054b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Metric that calculates how often predictions matches binary labels. * @@ -41,6 +41,45 @@ public class BinaryAccuracy extends MeanMetricWrapper /** the threshold value for deciding whether prediction values are 1 or 0 */ private final float threshold; + /** + * Creates a BinaryAccuracy Metric using {@link Class#getSimpleName()} for the metric name and + * {@link #DEFAULT_THRESHOLD} for the threshold value. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public BinaryAccuracy(long seed, Class type) { + this((String) null, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a BinaryAccuracy Metric using {@link Class#getSimpleName()} for the metric name + * + * @param threshold a threshold for deciding whether prediction values are 1 or 0 + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public BinaryAccuracy(float threshold, long seed, Class type) { + this((String) null, threshold, seed, type); + } + + /** + * Creates a BinaryAccuracy Metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param threshold a threshold for deciding whether prediction values are 1 or 0 + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public BinaryAccuracy(String name, float threshold, long seed, Class type) { + super(name, seed, type); + this.threshold = threshold; + setLoss(this); + } + /** * Creates a BinaryAccuracy Metric using {@link Class#getSimpleName()} for the metric name and * {@link #DEFAULT_THRESHOLD} for the threshold value. @@ -78,9 +117,8 @@ public BinaryAccuracy(Ops tf, float threshold, long seed, Class type) { * @param type the data type for the variables */ public BinaryAccuracy(Ops tf, String name, float threshold, long seed, Class type) { - super(tf, name, seed, type); - this.threshold = threshold; - setLoss(this); + this(name, threshold, seed, type); + init(tf); } /** @@ -93,12 +131,11 @@ public BinaryAccuracy(Ops tf, String name, float threshold, long seed, Class @Override public Operand call( Operand labels, Operand predictions) { - - Operand tPredictions = cast(getTF(), predictions, getResultType()); - Operand thresholdCast = cast(getTF(), getTF().constant(threshold), getResultType()); - tPredictions = - cast(getTF(), getTF().math.greater(tPredictions, thresholdCast), getResultType()); - Operand tLabels = cast(getTF(), labels, getResultType()); - return cast(getTF(), getTF().math.equal(tLabels, tPredictions), getResultType()); + Ops tf = checkTF(); + Operand tPredictions = cast(tf, predictions, getResultType()); + Operand thresholdCast = cast(tf, getTF().constant(threshold), getResultType()); + tPredictions = cast(tf, tf.math.greater(tPredictions, thresholdCast), getResultType()); + Operand tLabels = cast(tf, labels, getResultType()); + return cast(tf, tf.math.equal(tLabels, tPredictions), getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java index 57a6f75375d..12c740c7ddc 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java @@ -40,7 +40,6 @@ public class BinaryCrossentropy extends MeanMetricWrapper /** * Creates a BinaryCrossentropy metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. @@ -53,13 +52,34 @@ public class BinaryCrossentropy extends MeanMetricWrapper * @param type the type for the variables and result */ public BinaryCrossentropy( - Ops tf, String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { - super(tf, name, seed, type); + String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { + super(name, seed, type); setLoss(this); this.fromLogits = fromLogits; this.labelSmoothing = labelSmoothing; } + /** + * Creates a BinaryCrossentropy metric + * + * @param tf the TensorFlow Ops + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a + * probability distribution. + * @param labelSmoothing value used to smooth labels, When 0, no smoothing occurs. When > 0, + * compute the loss between the predicted labels and a smoothed version of the true labels, + * where the smoothing squeezes the labels towards 0.5. Larger values of label_smoothing + * correspond to heavier smoothing. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public BinaryCrossentropy( + Ops tf, String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { + this(name, fromLogits, labelSmoothing, seed, type); + init(tf); + } + /** * Computes the binary crossentropy loss between labels and predictions. * @@ -71,8 +91,9 @@ public BinaryCrossentropy( @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.binaryCrossentropy(getTF(), tLabels, tPredictions, fromLogits, labelSmoothing); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.binaryCrossentropy(tf, tLabels, tPredictions, fromLogits, labelSmoothing); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java index 70dfebc508d..50391c0fb7c 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; @@ -24,6 +22,8 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Metric that calculates how often predictions matches one-hot labels. * @@ -46,6 +46,30 @@ public class CategoricalAccuracy extends MeanMetricWrapper implements LossMetric { + /** + * Creates a CategoricalAccuracy metric, using {@link Class#getSimpleName()} for the metric name + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public CategoricalAccuracy(long seed, Class type) { + this((String) null, seed, type); + } + + /** + * Creates a CategoricalAccuracy metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public CategoricalAccuracy(String name, long seed, Class type) { + super(name, seed, type); + super.setLoss(this); + } + /** * Creates a CategoricalAccuracy metric, using {@link Class#getSimpleName()} for the metric name * @@ -68,8 +92,8 @@ public CategoricalAccuracy(Ops tf, long seed, Class type) { * @param type the data type for the variables */ public CategoricalAccuracy(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - super.setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -86,9 +110,10 @@ public CategoricalAccuracy(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand trueMax = getTF().math.argMax(labels, getTF().constant(-1)); + Ops tf = checkTF(); + Operand trueMax = tf.math.argMax(labels, tf.constant(-1)); - Operand predMax = getTF().math.argMax(predictions, getTF().constant(-1)); - return cast(getTF(), getTF().math.equal(trueMax, predMax), getResultType()); + Operand predMax = tf.math.argMax(predictions, tf.constant(-1)); + return cast(tf, tf.math.equal(trueMax, predMax), getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java index fa7c1a1a626..6309bb1dc71 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -23,6 +21,8 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * A Metric that computes the categorical cross-entropy loss between true labels and predicted * labels. @@ -40,6 +40,55 @@ public class CategoricalCrossentropy extends MeanMetricWrappe private final float labelSmoothing; private final int axis; + /** + * Creates a CategoricalCrossentropy metric that computes the crossentropy metric between the + * labels and predictions. + * + *

Uses a {@link Losses#CHANNELS_LAST} for the channel axis. + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param fromLogits Whether to interpret predictions as a tensor of logit values oras opposed to + * a probability distribution. + * @param labelSmoothing value used to smooth labels, When > 0, label values are smoothed, + * meaning the confidence on label values are relaxed. e.g. {@code labelSmoothing=0.2} means + * that we will use a value of {@code 0.1} for label {@code 0} and {@code 0.9 } for label + * {@code 1} + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public CategoricalCrossentropy( + String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { + this(name, fromLogits, labelSmoothing, Losses.CHANNELS_LAST, seed, type); + } + + /** + * Creates a CategoricalCrossentropy metric that computes the crossentropy metric between the + * labels and predictions. + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a + * probability distribution. + * @param labelSmoothing value used to smooth labels, When > 0, label values are smoothed, + * meaning the confidence on label values are relaxed. e.g. {@code labelSmoothing=0.2} means + * that we will use a value of {@code 0.1} for label {@code 0} and {@code 0.9 } for label + * {@code 1} + * @param axis Int specifying the channels axis. {@code axis={@link Losses#CHANNELS_LAST}} + * corresponds to data format {@code channels_last}, and {@code axis={@link + * Losses#CHANNELS_FIRST}} corresponds to data format {@code channels_first}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public CategoricalCrossentropy( + String name, boolean fromLogits, float labelSmoothing, int axis, long seed, Class type) { + super(name, seed, type); + setLoss(this); + this.fromLogits = fromLogits; + this.labelSmoothing = labelSmoothing; + this.axis = axis; + } + /** * Creates a CategoricalCrossentropy metric that computes the crossentropy metric between the * labels and predictions. @@ -90,11 +139,8 @@ public CategoricalCrossentropy( int axis, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); - this.fromLogits = fromLogits; - this.labelSmoothing = labelSmoothing; - this.axis = axis; + this(name, fromLogits, labelSmoothing, axis, seed, type); + init(tf); } /** @@ -107,9 +153,10 @@ public CategoricalCrossentropy( @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); return Losses.categoricalCrossentropy( - getTF(), tLabels, tPredictions, fromLogits, labelSmoothing, axis); + tf, tLabels, tPredictions, fromLogits, labelSmoothing, axis); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java index 1f6d0fd002c..9034320b57b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java @@ -31,6 +31,19 @@ public class CategoricalHinge extends MeanMetricWrapper implements LossMetric { + /** + * Creates a CategoricalHinge metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public CategoricalHinge(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a CategoricalHinge metric * @@ -41,8 +54,8 @@ public class CategoricalHinge extends MeanMetricWrapper * @param type the type for the variables and result */ public CategoricalHinge(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -55,8 +68,9 @@ public CategoricalHinge(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.categoricalHinge(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.categoricalHinge(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java index 230286a738f..923231101a4 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java @@ -40,9 +40,52 @@ */ public class CosineSimilarity extends MeanMetricWrapper implements LossMetric { + + /** The default axis, the last axis for calculating the cosime similarity */ public static final int DEFAULT_AXIS = -1; + private final int[] axis; + /** + * Creates a metric that computes the cosine similarity metric between labels and predictions with + * a default axis, {@link #DEFAULT_AXIS} + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public CosineSimilarity(String name, long seed, Class type) { + this(name, DEFAULT_AXIS, seed, type); + } + + /** + * Creates a metric that computes the cosine similarity metric between labels and predictions. + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param axis The dimension along which the cosine similarity is computed. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public CosineSimilarity(String name, int axis, long seed, Class type) { + this(name, new int[] {axis}, seed, type); + } + /** + * Creates a CosineSimilarity metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param axis The dimension along which the cosine similarity is computed. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public CosineSimilarity(String name, int[] axis, long seed, Class type) { + super(name, seed, type); + this.axis = axis; + setLoss(this); + } + /** * Creates a metric that computes the cosine similarity metric between labels and predictions with * a default axis, {@link #DEFAULT_AXIS} @@ -81,9 +124,8 @@ public CosineSimilarity(Ops tf, String name, int axis, long seed, Class type) * @param type the type for the variables and result */ public CosineSimilarity(Ops tf, String name, int[] axis, long seed, Class type) { - super(tf, name, seed, type); - this.axis = axis; - setLoss(this); + this(name, axis, seed, type); + init(tf); } /** @@ -96,10 +138,11 @@ public CosineSimilarity(Ops tf, String name, int[] axis, long seed, Class typ @Override public Operand call( Operand labels, Operand predictions) { + Ops tf = checkTF(); // NOTE: metrics.CosineSimilarity is Losses.cosineSimilarity, // while losses.CosineSimilarity is the negative of Losses.cosineSimilarity - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.cosineSimilarity(getTF(), tLabels, tPredictions, axis); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.cosineSimilarity(tf, tLabels, tPredictions, axis); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java index 9f957ee6c17..6592e011377 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java @@ -33,6 +33,92 @@ */ public class FalseNegatives extends ConfusionMatrixConditionCount { + /** + * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name and a + * default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalseNegatives(long seed, Class type) { + this((String) null, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalseNegatives(float threshold, long seed, Class type) { + this((String) null, new float[] {threshold}, seed, type); + } + + /** + * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalseNegatives(float[] thresholds, long seed, Class type) { + this((String) null, thresholds, seed, type); + } + + /** + * Creates a FalseNegatives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalseNegatives(String name, long seed, Class type) { + this(name, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a FalseNegatives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalseNegatives(String name, float threshold, long seed, Class type) { + this(name, new float[] {threshold}, seed, type); + } + + /** + * Creates a FalseNegatives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalseNegatives(String name, float[] thresholds, long seed, Class type) { + super(name, ConfusionMatrixEnum.FALSE_NEGATIVES, thresholds, seed, type); + } + /** * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name and a * default threshold of {@link #DEFAULT_THRESHOLD}. @@ -122,6 +208,7 @@ public FalseNegatives(Ops tf, String name, float threshold, long seed, Class * @param type the data type for the variables */ public FalseNegatives(Ops tf, String name, float[] thresholds, long seed, Class type) { - super(tf, name, ConfusionMatrixEnum.FALSE_NEGATIVES, thresholds, seed, type); + this(name, thresholds, seed, type); + init(tf); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java index a3d585dea0f..f24922a8d20 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java @@ -33,6 +33,92 @@ */ public class FalsePositives extends ConfusionMatrixConditionCount { + /** + * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name and a + * default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalsePositives(long seed, Class type) { + this((String) null, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalsePositives(float threshold, long seed, Class type) { + this((String) null, new float[] {threshold}, seed, type); + } + + /** + * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalsePositives(float[] thresholds, long seed, Class type) { + this((String) null, thresholds, seed, type); + } + + /** + * Creates a FalsePositives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalsePositives(String name, long seed, Class type) { + this(name, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a FalsePositives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalsePositives(String name, float threshold, long seed, Class type) { + this(name, new float[] {threshold}, seed, type); + } + + /** + * Creates a FalsePositives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public FalsePositives(String name, float[] thresholds, long seed, Class type) { + super(name, ConfusionMatrixEnum.FALSE_POSITIVES, thresholds, seed, type); + } + /** * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name and a * default threshold of {@link #DEFAULT_THRESHOLD}. @@ -122,6 +208,7 @@ public FalsePositives(Ops tf, String name, float threshold, long seed, Class * @param type the data type for the variables */ public FalsePositives(Ops tf, String name, float[] thresholds, long seed, Class type) { - super(tf, name, ConfusionMatrixEnum.FALSE_POSITIVES, thresholds, seed, type); + this(name, thresholds, seed, type); + init(tf); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java index a2d110867b8..6685e79029c 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java @@ -30,6 +30,19 @@ */ public class Hinge extends MeanMetricWrapper implements LossMetric { + /** + * Creates a Hinge metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public Hinge(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a Hinge metric * @@ -40,8 +53,8 @@ public class Hinge extends MeanMetricWrapper implements Lo * @param type the type for the variables and result */ public Hinge(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -54,8 +67,9 @@ public Hinge(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.hinge(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.hinge(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java index 155a891ccc2..0d3a53f1288 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java @@ -31,6 +31,19 @@ */ public class KLDivergence extends MeanMetricWrapper implements LossMetric { + /** + * Creates a KLDivergence metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public KLDivergence(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a KLDivergence metric * @@ -41,8 +54,8 @@ public class KLDivergence extends MeanMetricWrapper implem * @param type the type for the variables and result */ public KLDivergence(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -55,8 +68,9 @@ public KLDivergence(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.kullbackLeiblerDivergence(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.kullbackLeiblerDivergence(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java index 786847d4b32..d075da82355 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java @@ -31,6 +31,19 @@ */ public class LogCoshError extends MeanMetricWrapper implements LossMetric { + /** + * Creates a LogCoshError metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public LogCoshError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a LogCoshError metric * @@ -41,8 +54,8 @@ public class LogCoshError extends MeanMetricWrapper implem * @param type the type for the variables and result */ public LogCoshError(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -55,8 +68,9 @@ public LogCoshError(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.logCosh(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.logCosh(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java index 8902b329bcc..789204e6ce0 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java @@ -25,6 +25,18 @@ */ public class Mean extends Reduce { + /** + * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} + * + * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected Mean(String name, long seed, Class type) { + super(name, MetricReduction.WEIGHTED_MEAN, seed, type); + } + /** * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java index b38d0a809e1..fbc51973f1e 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java @@ -31,6 +31,19 @@ public class MeanAbsoluteError extends MeanMetricWrapper implements LossMetric { + /** + * Creates a Mean Absolute Error metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public MeanAbsoluteError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a Mean Absolute Error metric * @@ -41,8 +54,8 @@ public class MeanAbsoluteError extends MeanMetricWrapper * @param type the type for the variables and result */ public MeanAbsoluteError(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -55,8 +68,9 @@ public MeanAbsoluteError(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.meanAbsoluteError(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.meanAbsoluteError(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java index 22bcd0ab0eb..28a9587cfae 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java @@ -31,6 +31,19 @@ public class MeanAbsolutePercentageError extends MeanMetricWrapper implements LossMetric { + /** + * Creates a Mean Absolute Error metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public MeanAbsolutePercentageError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a Mean Absolute Error metric * @@ -41,8 +54,8 @@ public class MeanAbsolutePercentageError extends MeanMetricWr * @param type the type for the variables and result */ public MeanAbsolutePercentageError(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -55,8 +68,9 @@ public MeanAbsolutePercentageError(Ops tf, String name, long seed, Class type @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.meanAbsolutePercentageError(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.meanAbsolutePercentageError(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java index 00ae3727249..17640d7c27d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java @@ -14,11 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.Collections; -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.MetricsHelper; @@ -29,6 +24,12 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; +import java.util.Collections; +import java.util.List; + +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes the mean Intersection-Over-Union metric. * @@ -57,6 +58,34 @@ public class MeanIoU extends Metric { private Variable totalConfusionMatrix; private Assign initializer; + /** + * Creates a metric MeanIoU, using name as {@link Class#getSimpleName()} + * + * @param numClasses The possible number of labels the prediction task can have + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + protected MeanIoU(long numClasses, long seed, Class type) { + this((String) null, numClasses, seed, type); + } + + /** + * Creates a MeanIoU metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param numClasses The possible number of labels the prediction task can have + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + protected MeanIoU(String name, long numClasses, long seed, Class type) { + super(name, seed); + this.type = type; + this.totalCMName = this.getVariableName(TOTAL_CONFUSION_MATRIX); + this.numClasses = numClasses; + } + /** * Creates a metric MeanIoU, using name as {@link Class#getSimpleName()} * @@ -81,14 +110,14 @@ protected MeanIoU(Ops tf, long numClasses, long seed, Class type) { * @param type the data type for the variables */ protected MeanIoU(Ops tf, String name, long numClasses, long seed, Class type) { - super(tf, name, seed); - this.type = type; - this.totalCMName = this.getVariableName(TOTAL_CONFUSION_MATRIX); - this.numClasses = numClasses; - init(); + this(name, numClasses, seed, type); + init(tf); } - private void init() { + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); Shape variableShape = Shape.of(numClasses, numClasses); if (totalConfusionMatrix == null) { @@ -102,6 +131,7 @@ private void init() { .assign( totalConfusionMatrix, zeros.call(getTF(), getTF().constant(variableShape), type)); } + return getTF(); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java index 915d281e44b..bc709381ffe 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java @@ -14,9 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -24,6 +21,10 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import java.util.List; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes the mean relative error by normalizing with the given values. * @@ -39,6 +40,88 @@ public class MeanRelativeError extends Mean { private Operand normalizer; + // holders for the init(Ops) method + private float[] normalizerFloat; + private double[] normalizerDouble; + + /** + * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name + * + * @param normalizer The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError(float[] normalizer, long seed, Class type) { + this((String) null, normalizer, seed, type); + } + + /** + * Creates a MeanRelativeError metric + * + * @param name the name of the metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param normalizer The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError(String name, float[] normalizer, long seed, Class type) { + super(name, seed, type); + this.normalizerFloat = normalizer; + } + + /** + * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name + * + * @param normalizer The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError(double[] normalizer, long seed, Class type) { + this((String) null, normalizer, seed, type); + } + + /** + * Creates a MeanRelativeError metric + * + * @param name the name of the metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param normalizer The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError(String name, double[] normalizer, long seed, Class type) { + super(name, seed, type); + this.normalizerDouble = normalizer; + } + + /** + * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name + * + * @param normalizer The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError(Operand normalizer, long seed, Class type) { + this((String) null, normalizer, seed, type); + } + + /** + * Creates a MeanRelativeError metric + * + * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param normalizer The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError(String name, Operand normalizer, long seed, Class type) { + super(name, seed, type); + this.normalizer = normalizer; + } + /** * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name * @@ -122,6 +205,20 @@ protected MeanRelativeError( this.normalizer = normalizer; } + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); + if (normalizer == null) { + if (normalizerFloat != null) { + normalizer = cast(getTF(), getTF().constant(normalizerFloat), getResultType()); + } else if (normalizerDouble != null) { + normalizer = cast(getTF(), getTF().constant(normalizerDouble), getResultType()); + } + } + return getTF(); + } + /** * Accumulates metric statistics. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java index fd8be29875e..e94335ac596 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java @@ -44,6 +44,19 @@ public class MeanSquaredError extends MeanMetricWrapper implements LossMetric { + /** + * Creates a Mean Absolute Error metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public MeanSquaredError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a Mean Absolute Error metric * @@ -54,8 +67,8 @@ public class MeanSquaredError extends MeanMetricWrapper * @param type the type for the variables and result */ public MeanSquaredError(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -68,8 +81,9 @@ public MeanSquaredError(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.meanSquaredError(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.meanSquaredError(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java index 4728cbab12f..792c422f494 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java @@ -31,6 +31,19 @@ public class MeanSquaredLogarithmicError extends MeanMetricWrapper implements LossMetric { + /** + * Creates a Mean Absolute Error metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public MeanSquaredLogarithmicError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a Mean Absolute Error metric * @@ -41,8 +54,8 @@ public class MeanSquaredLogarithmicError extends MeanMetricWr * @param type the type for the variables and result */ public MeanSquaredLogarithmicError(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -55,8 +68,9 @@ public MeanSquaredLogarithmicError(Ops tf, String name, long seed, Class type @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.meanSquaredLogarithmicError(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.meanSquaredLogarithmicError(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java index be09e7dd3f6..8ab0afb954b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java @@ -14,10 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.losses.impl.LossTuple; @@ -30,6 +26,11 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.List; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Metric that computes the element-wise (weighted) mean of the given tensors. * @@ -48,6 +49,31 @@ public class MeanTensor extends Metric { private Assign countInitializer; private boolean initialized; + /** + * Creates a MeanTensor metric, using {@link Class#getSimpleName()} as the name + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public MeanTensor(long seed, Class type) { + this((String) null, seed, type); + } + /** + * Creates a MeanTensor metric + * + * @param name the name of this metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public MeanTensor(String name, long seed, Class type) { + super(name, seed); + this.type = type; + this.totalName = this.getVariableName(TOTAL); + this.countName = this.getVariableName(COUNT); + } + /** * Creates a MeanTensor metric, using {@link Class#getSimpleName()} as the name * @@ -69,10 +95,8 @@ public MeanTensor(Ops tf, long seed, Class type) { * @param type the data type for the variables */ public MeanTensor(Ops tf, String name, long seed, Class type) { - super(tf, name, seed); - this.type = type; - this.totalName = this.getVariableName(TOTAL); - this.countName = this.getVariableName(COUNT); + this(name, seed, type); + init(tf); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java index 468919e696d..932ab59ffd8 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java @@ -15,28 +15,52 @@ package org.tensorflow.framework.metrics; import org.tensorflow.Operand; +import org.tensorflow.framework.metrics.impl.Initializable; import org.tensorflow.op.Op; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.function.Consumer; /** * Base class for Metrics * * @param The data type for the metric result */ -public abstract class Metric { - - /** The TensorFlow Ops */ - private final Ops tf; +public abstract class Metric implements Initializable { /** The seed for random number generation */ private final long seed; - /** The name for this metric. Defaults to {@link Class#getSimpleName()}. */ private final String name; + /** The TensorFlow Ops */ + protected Ops tf; + protected List> onInits; + + /** + * Creates a Metric with a name of {@link Class#getSimpleName()} + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + */ + protected Metric(long seed) { + this((String) null, seed); + } + + /** + * Creates a Metric + * + * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + */ + protected Metric(String name, long seed) { + this.seed = seed; + this.name = name != null ? name : this.getClass().getSimpleName(); + } /** * Creates a Metric with a name of {@link Class#getSimpleName()} @@ -58,12 +82,48 @@ protected Metric(Ops tf, long seed) { * will always produce the same random tensor for a given shape and data type. */ protected Metric(Ops tf, String name, long seed) { + this(name, seed); + init(tf); + } + + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { if (!tf.scope().env().isGraph()) { throw new IllegalArgumentException("Metrics are required to execute in Graph mode."); } - this.seed = seed; - this.name = name != null ? name : this.getClass().getSimpleName(); - this.tf = tf.withName(this.getClass().getSimpleName()); + if (this.tf == null) { + + this.tf = tf.withName(this.getClass().getSimpleName()); + if (onInits != null) { + onInits.forEach(c -> c.accept(this.tf)); + } + } + return this.tf; + } + + /** {@inheritDoc} */ + @Override + public void onInit(Consumer initFunction) { + if (onInits == null) { + onInits = new ArrayList<>(); + } + onInits.add(initFunction); + } + + /** + * Get the TensorFlow Ops for this metric. + * + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. + * @return the TensorFlow Ops for this metric. + */ + protected Ops checkTF() { + if (tf == null) { + throw new IllegalStateException( + "The TensorFlow Platform has mot been initialized with this Metric. Call 'init(Ops)' first"); + } + return tf; } /** @@ -74,11 +134,13 @@ protected Metric(Ops tf, String name, long seed) { * @param values the inputs to be passed to update state, this may not be null * @param sampleWeights sample weights to be applied to values, may be null. * @return a List of Operations to update the metric state + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ - @SuppressWarnings({"unchecked", "unused"}) + @SuppressWarnings({"unused"}) public List updateStateList( Operand values, Operand sampleWeights) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } /** @@ -90,13 +152,15 @@ public List updateStateList( * @param predictions the predictions * @param sampleWeights sample weights to be applied to values, may be null. * @return a List of Operations to update the metric state + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ - @SuppressWarnings({"unchecked", "unused"}) + @SuppressWarnings({"unused"}) public List updateStateList( Operand labels, Operand predictions, Operand sampleWeights) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } /** @@ -105,11 +169,13 @@ public List updateStateList( * @param values the inputs to be passed to update state, this may not be null * @param sampleWeights sample weights to be applied to values, may be null. * @return the Operation to update the metric state + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ public final Op updateState( Operand values, Operand sampleWeights) { List controlOps = updateStateList(values, sampleWeights); - return tf.withSubScope("updateState").withControlDependencies(controlOps).noOp(); + return checkTF().withSubScope("updateState").withControlDependencies(controlOps).noOp(); } /** @@ -119,19 +185,23 @@ public final Op updateState( * @param predictions the predictions * @param sampleWeights sample weights to be applied to values, may be null. * @return the Operation to update the metric state + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ public final Op updateState( Operand labels, Operand predictions, Operand sampleWeights) { List controlOps = updateStateList(labels, predictions, sampleWeights); - return tf.withSubScope("updateState").withControlDependencies(controlOps).noOp(); + return checkTF().withSubScope("updateState").withControlDependencies(controlOps).noOp(); } /** * Gets the current result of the metric * * @return the result, possibly with control dependencies + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ public abstract Operand result(); @@ -139,6 +209,8 @@ public final Op updateState( * Resets any state variables to their initial values * * @return the control operation for doing the reset + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ public abstract Op resetStates(); @@ -148,11 +220,13 @@ public final Op updateState( * @param values the inputs to be passed to update state, this may not be null * @param sampleWeights sample weights to be applied to values, may be null. * @return the result, possibly with control dependencies + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * #init(Ops)}. */ public final Operand callOnce( Operand values, Operand sampleWeights) { List controlOps = updateStateList(values, sampleWeights); - Ops ltf = tf.withSubScope("callOnce").withControlDependencies(controlOps); + Ops ltf = checkTF().withSubScope("callOnce").withControlDependencies(controlOps); return ltf.identity(result()); } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java index a33750ac3f6..7dfee081238 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java @@ -31,15 +31,16 @@ public class Metrics { * *

Standalone usage: * - * 

-   *     Operand<TInt32> labels = tf.constant(new int[][]
-   *                                    {{0, 0, 1}, {0, 1, 0}});
-   *     Operand<TFloat32> predictions = tf.constant(new float[][]
-   *                                    {{0.1f, 0.9f, 0.8f}, {0.05f, 0.95f, 0f}});
-   *     Operand<TFloat32> m = Metrics.topKCategoricalAccuracy(
-   *                                    labels, predictions, 3)
-   *     //m.shape().toString == "[2]"
-   *
+ * 
{@code
+   * Operand labels = tf.constant(new int[][]
+   *                                {{0, 0, 1}, {0, 1, 0}});
+   * Operand predictions = tf.constant(new float[][]
+   *                                {{0.1f, 0.9f, 0.8f}, {0.05f, 0.95f, 0f}});
+   * Operand m = Metrics.topKCategoricalAccuracy(
+   *                                labels, predictions, 3)
+   * //m.shape().toString == "[2]"
+   *
+   * }
* * @param tf the TensorFlow Ops. * @param labels the ground truth values. @@ -79,7 +80,6 @@ public static Operand topKCategoricalAccuracy( * @param the data type ofr the labels. * @return the Operand for the Sparse top K categorical accuracy value. */ - @SuppressWarnings("unchecked") public static Operand sparseTopKCategoricalAccuracy( Ops tf, Operand labels, Operand predictions, int k) { Operand tLabels = cast(tf, labels, predictions.type()); diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java index 2e4bde8ec55..cf04ffdc159 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java @@ -30,6 +30,19 @@ */ public class Poisson extends MeanMetricWrapper implements LossMetric { + /** + * Creates a Poisson metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public Poisson(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a Poisson metric * @@ -40,8 +53,8 @@ public class Poisson extends MeanMetricWrapper implements * @param type the type for the variables and result */ public Poisson(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -54,8 +67,9 @@ public Poisson(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.poisson(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.poisson(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java index f978c0e20da..3c56f712702 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java @@ -14,13 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; @@ -32,6 +25,14 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes the precision of the predictions with respect to the labels. * @@ -69,6 +70,183 @@ public class Precision extends Metric { private Variable truePositives; private Variable falsePositives; + /** + * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId + * values and with a threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(long seed, Class type) { + this((String) null, null, null, null, seed, type); + } + + /** + * Creates a Precision Metric with no topK or classId values with a threshold of {@link + * #DEFAULT_THRESHOLD}. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(String name, long seed, Class type) { + this(name, null, null, null, seed, type); + } + + /** + * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId + * values. + * + * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared + * with prediction values to determine the truth value of predictions (i.e., above the + * threshold is true, below is false). One metric value is generated for each threshold value. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(float threshold, long seed, Class type) { + this((String) null, new float[] {threshold}, null, null, seed, type); + } + + /** + * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId + * values. + * + * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is + * compared with prediction values to determine the truth value of predictions (i.e., above + * the threshold is true, below is false). One metric value is generated for each threshold + * value. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(float[] thresholds, long seed, Class type) { + this((String) null, thresholds, null, null, seed, type); + } + + /** + * Creates a Precision Metric with no topK or classId values. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared + * with prediction values to determine the truth value of predictions (i.e., above the + * threshold is true, below is false). One metric value is generated for each threshold value. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(String name, float threshold, long seed, Class type) { + this(name, new float[] {threshold}, null, null, seed, type); + } + + /** + * Creates a Precision Metric with no topK or classId values. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is + * compared with prediction values to determine the truth value of predictions (i.e., above + * the threshold is true, below is false). One metric value is generated for each threshold + * value. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(String name, float[] thresholds, long seed, Class type) { + this(name, thresholds, null, null, seed, type); + } + + /** + * Creates a Precision Metric with a name of {@link Class#getSimpleName()} + * + * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared + * with prediction values to determine the truth value of predictions (i.e., above the + * threshold is true, below is false). One metric value is generated for each threshold value. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(float threshold, Integer topK, Integer classId, long seed, Class type) { + this((String) null, new float[] {threshold}, topK, classId, seed, type); + } + + /** + * Creates a Precision Metric with a name of {@link Class#getSimpleName()} + * + * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is + * compared with prediction values to determine the truth value of predictions (i.e., above + * the threshold is true, below is false). One metric value is generated for each threshold + * value. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision(float[] thresholds, Integer topK, Integer classId, long seed, Class type) { + this((String) null, thresholds, topK, classId, seed, type); + } + + /** + * Creates a Precision Metric. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared + * with prediction values to determine the truth value of predictions (i.e., above the + * threshold is true, below is false). One metric value is generated for each threshold value. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision( + String name, float threshold, Integer topK, Integer classId, long seed, Class type) { + this(name, new float[] {threshold}, topK, classId, seed, type); + } + + /** + * Creates a Precision Metric. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is + * compared with prediction values to determine the truth value of predictions (i.e., above + * the threshold is true, below is false). One metric value is generated for each threshold + * value. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Precision( + String name, float[] thresholds, Integer topK, Integer classId, long seed, Class type) { + super(name, seed); + this.type = type; + this.truePositivesName = this.getVariableName(TRUE_POSITIVES); + this.falsePositivesName = this.getVariableName(FALSE_POSITIVES); + float defaultThreshold = topK == null ? DEFAULT_THRESHOLD : MetricsHelper.NEG_INF; + this.thresholds = thresholds == null ? new float[] {defaultThreshold} : thresholds; + this.topK = topK; + this.classId = classId; + } + /** * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId * values and with a threshold of {@link #DEFAULT_THRESHOLD}. @@ -260,32 +438,27 @@ public Precision( Integer classId, long seed, Class type) { - super(tf, name, seed); - this.type = type; - this.truePositivesName = this.getVariableName(TRUE_POSITIVES); - this.falsePositivesName = this.getVariableName(FALSE_POSITIVES); - float defaultThreshold = topK == null ? DEFAULT_THRESHOLD : MetricsHelper.NEG_INF; - this.thresholds = thresholds == null ? new float[] {defaultThreshold} : thresholds; - this.topK = topK; - this.classId = classId; + this(name, thresholds, topK, classId, seed, type); - init(); + init(tf); } - /** Initializes the variables */ - private void init() { - Ops tf = getTF(); + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); Zeros zeros = new Zeros<>(); - Operand zero = zeros.call(tf, tf.constant(Shape.of(thresholds.length)), type); + Operand zero = zeros.call(getTF(), getTF().constant(Shape.of(thresholds.length)), type); if (this.truePositives == null) { - this.truePositives = tf.withName(truePositivesName).variable(zero); - initializers.add(tf.assign(truePositives, zero)); + this.truePositives = getTF().withName(truePositivesName).variable(zero); + initializers.add(getTF().assign(truePositives, zero)); } if (this.falsePositives == null) { - this.falsePositives = tf.withName(falsePositivesName).variable(zero); - initializers.add(tf.assign(falsePositives, zero)); + this.falsePositives = getTF().withName(falsePositivesName).variable(zero); + initializers.add(getTF().assign(falsePositives, zero)); } + return getTF(); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java index a5285ff6b2d..c2be1bce511 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes best precision where recall is >= specified value. * @@ -38,6 +38,73 @@ public class PrecisionAtRecall extends SensitivitySpecificity private final float recall; + /** + * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()} and {@link + * #DEFAULT_NUM_THRESHOLDS} for the number of thresholds + * + * @param recall the recall. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public PrecisionAtRecall(float recall, long seed, Class type) { + this((String) null, recall, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a PrecisionRecall metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number of + * thresholds + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param recall the recall. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public PrecisionAtRecall(String name, float recall, long seed, Class type) { + this(name, recall, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. + * + * @param recall the recall. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * recall. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public PrecisionAtRecall(float recall, int numThresholds, long seed, Class type) { + this((String) null, recall, numThresholds, seed, type); + } + + /** + * Creates a PrecisionRecall metric. + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param recall the recall. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * recall. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public PrecisionAtRecall(String name, float recall, int numThresholds, long seed, Class type) { + super(name, numThresholds, seed, type); + if (recall < 0f || recall > 1f) + throw new IllegalArgumentException("recall must be in the range [0, 1]."); + this.recall = recall; + } + /** * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()} and {@link * #DEFAULT_NUM_THRESHOLDS} for the number of thresholds @@ -104,10 +171,8 @@ public PrecisionAtRecall(Ops tf, float recall, int numThresholds, long seed, Cla */ public PrecisionAtRecall( Ops tf, String name, float recall, int numThresholds, long seed, Class type) { - super(tf, name, numThresholds, seed, type); - if (recall < 0f || recall > 1f) - throw new IllegalArgumentException("recall must be in the range [0, 1]."); - this.recall = recall; + this(name, recall, numThresholds, seed, type); + init(tf); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java index 6cb87f5be9e..3c01770c711 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java @@ -14,13 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; @@ -32,6 +25,14 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes the recall of the predictions with respect to the labels. * @@ -67,6 +68,213 @@ public class Recall extends Metric { private Variable truePositives; private Variable falseNegatives; + /** + * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set + * to null, and thresholds set to {@link #DEFAULT_THRESHOLD} + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(long seed, Class type) { + this((String) null, null, null, null, seed, type); + } + + /** + * Creates a Recall metric with topK and classId set to null and thresholds set to {@link + * #DEFAULT_THRESHOLD}. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(String name, long seed, Class type) { + this(name, null, null, null, seed, type); + } + + /** + * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set + * to null. + * + * @param threshold A threshold is compared with prediction values to determine the truth value of + * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to + * {@link #DEFAULT_THRESHOLD}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(float threshold, long seed, Class type) { + this((String) null, threshold, null, null, seed, type); + } + + /** + * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set + * to null. + * + * @param thresholds A threshold is compared with prediction values to determine the truth value + * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults + * to {@link #DEFAULT_THRESHOLD}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(float[] thresholds, long seed, Class type) { + this((String) null, thresholds, null, null, seed, type); + } + + /** + * Creates a Recall metric with topK and classId set to null. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param threshold A threshold is compared with prediction values to determine the truth value of + * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to + * {@link #DEFAULT_THRESHOLD}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(String name, float threshold, long seed, Class type) { + this(name, threshold, null, null, seed, type); + } + + /** + * Creates a Recall metric with topK and classId set to null. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param thresholds A threshold is compared with prediction values to determine the truth value + * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults + * to {@link #DEFAULT_THRESHOLD}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(String name, float[] thresholds, long seed, Class type) { + this(name, thresholds, null, null, seed, type); + } + + /** + * Creates a Recall metric with a name of {@link Class#getSimpleName()} and using a threshold + * value of {@link #DEFAULT_THRESHOLD}. + * + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(Integer topK, Integer classId, long seed, Class type) { + this((String) null, null, topK, classId, seed, type); + } + + /** + * Creates a Recall metric using a threshold value of {@link #DEFAULT_THRESHOLD}. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(String name, Integer topK, Integer classId, long seed, Class type) { + this(name, null, topK, classId, seed, type); + } + + /** + * Creates a Recall metric with a name of {@link Class#getSimpleName()} + * + * @param threshold A threshold is compared with prediction values to determine the truth value of + * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to + * {@link #DEFAULT_THRESHOLD}. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(float threshold, Integer topK, Integer classId, long seed, Class type) { + this((String) null, new float[] {threshold}, topK, classId, seed, type); + } + + /** + * Creates a Recall metric with a name of {@link Class#getSimpleName()} + * + * @param thresholds A threshold is compared with prediction values to determine the truth value + * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults + * to {@link #DEFAULT_THRESHOLD}. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall(float[] thresholds, Integer topK, Integer classId, long seed, Class type) { + this((String) null, thresholds, topK, classId, seed, type); + } + + /** + * Creates a Recall metric. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param threshold A threshold is compared with prediction values to determine the truth value of + * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to + * {@link #DEFAULT_THRESHOLD}. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall( + String name, float threshold, Integer topK, Integer classId, long seed, Class type) { + this(name, new float[] {threshold}, topK, classId, seed, type); + } + + /** + * Creates a Recall metric. + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param thresholds A threshold is compared with prediction values to determine the truth value + * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults + * to {@link #DEFAULT_THRESHOLD}. + * @param topK An optional value specifying the top-k predictions to consider when calculating + * precision. + * @param classId Optional Integer class ID for which we want binary metrics. This must be in the + * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public Recall( + String name, float[] thresholds, Integer topK, Integer classId, long seed, Class type) { + super(name, seed); + this.type = type; + this.truePositivesName = this.getVariableName(TRUE_POSITIVES); + this.falseNegativesName = this.getVariableName(FALSE_NEGATIVES); + float defaultThreshold = topK == null ? DEFAULT_THRESHOLD : MetricsHelper.NEG_INF; + + this.thresholds = thresholds == null ? new float[] {defaultThreshold} : thresholds; + this.topK = topK; + this.classId = classId; + } + /** * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set * to null, and thresholds set to {@link #DEFAULT_THRESHOLD} @@ -298,25 +506,28 @@ public Recall( this.topK = topK; this.classId = classId; - init(); + init(tf); } - /** Initializes the Variables */ - private void init() { - Ops tf = getTF(); + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); + Zeros zeros = new Zeros<>(); Operand zero = zeros.call(tf, tf.constant(Shape.of(this.thresholds.length)), type); if (truePositives == null) { - truePositives = tf.withName(truePositivesName).variable(zero); - initializers.add(tf.assign(truePositives, zero)); + truePositives = getTF().withName(truePositivesName).variable(zero); + initializers.add(getTF().assign(truePositives, zero)); } if (this.falseNegatives == null) { - falseNegatives = tf.withName(falseNegativesName).variable(zero); - initializers.add(tf.assign(falseNegatives, zero)); + falseNegatives = getTF().withName(falseNegativesName).variable(zero); + initializers.add(getTF().assign(falseNegatives, zero)); } + return getTF(); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java index 2386087e8a2..d5d520ef219 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java @@ -14,9 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; @@ -24,6 +21,9 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes best recall where precision is >= specified value. * @@ -43,6 +43,74 @@ public class RecallAtPrecision extends SensitivitySpecificity private final float precision; + /** + * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()} and {@link + * #DEFAULT_NUM_THRESHOLDS} for the number of thresholds + * + * @param precision the precision. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public RecallAtPrecision(float precision, long seed, Class type) { + this((String) null, precision, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a PrecisionRecall metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number of + * thresholds + * + * @param name the name of the metric. If null, defaults to {@link Class#getSimpleName()} + * @param precision the precision. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public RecallAtPrecision(String name, float precision, long seed, Class type) { + this(name, precision, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. + * + * @param precision the precision. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * recall. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public RecallAtPrecision(float precision, int numThresholds, long seed, Class type) { + this((String) null, precision, numThresholds, seed, type); + } + + /** + * Creates a PrecisionRecall metric. + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param precision the precision. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * recall. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range + * [0-1]. + */ + public RecallAtPrecision( + String name, float precision, int numThresholds, long seed, Class type) { + super(name, numThresholds, seed, type); + if (precision < 0f || precision > 1f) + throw new IllegalArgumentException("recall must be in the range [0, 1]."); + this.precision = precision; + } + /** * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()} and {@link * #DEFAULT_NUM_THRESHOLDS} for the number of thresholds @@ -109,10 +177,8 @@ public RecallAtPrecision(Ops tf, float precision, int numThresholds, long seed, */ public RecallAtPrecision( Ops tf, String name, float precision, int numThresholds, long seed, Class type) { - super(tf, name, numThresholds, seed, type); - if (precision < 0f || precision > 1f) - throw new IllegalArgumentException("recall must be in the range [0, 1]."); - this.precision = precision; + this(name, precision, numThresholds, seed, type); + init(tf); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java index 8b0b06e788d..1b66556744a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java @@ -15,9 +15,6 @@ */ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -25,6 +22,10 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import java.util.List; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes root mean squared error metric between {@code labels} and {@code predictions} . * @@ -32,6 +33,30 @@ */ public class RootMeanSquaredError extends Mean { + /** + * Creates a RootMeanSquaredError metric with a name of {@link Class#getSimpleName()} + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public RootMeanSquaredError(long seed, Class type) { + this((String) null, seed, type); + } + + /** + * Creates a RootMeanSquaredError metric + * + * @param name name of the metric instance. If null, name defaults to {@link + * Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public RootMeanSquaredError(String name, long seed, Class type) { + super(name, seed, type); + } + /** * Creates a RootMeanSquaredError metric with a name of {@link Class#getSimpleName()} * @@ -55,7 +80,8 @@ public RootMeanSquaredError(Ops tf, long seed, Class type) { * @param type the data type for the variables */ public RootMeanSquaredError(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); + this(name, seed, type); + init(tf); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java index 3892af920e9..3594239c0fb 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes best sensitivity where sensitivity is >= specified value. * @@ -47,6 +47,74 @@ public class SensitivityAtSpecificity extends SensitivitySpec private final float specificity; + /** + * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()} and + * {@link #DEFAULT_NUM_THRESHOLDS} for the number of thresholds + * + * @param specificity the specificity. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range + * [0-1]. + */ + public SensitivityAtSpecificity(float specificity, long seed, Class type) { + this((String) null, specificity, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a SpecificityAtSensitivity metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number + * of thresholds + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param specificity the specificity. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range + * [0-1]. + */ + public SensitivityAtSpecificity(String name, float specificity, long seed, Class type) { + this(name, specificity, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. + * + * @param specificity the specificity. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * specificity. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range + * [0-1]. + */ + public SensitivityAtSpecificity(float specificity, int numThresholds, long seed, Class type) { + this((String) null, specificity, numThresholds, seed, type); + } + + /** + * Creates a PrecisionRecall metric. + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param specificity the specificity. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * specificity. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range + * [0-1]. + */ + public SensitivityAtSpecificity( + String name, float specificity, int numThresholds, long seed, Class type) { + super(name, numThresholds, seed, type); + if (specificity < 0f || specificity > 1f) + throw new IllegalArgumentException("specificity must be in the range [0, 1]."); + this.specificity = specificity; + } + /** * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()} and * {@link #DEFAULT_NUM_THRESHOLDS} for the number of thresholds @@ -115,10 +183,8 @@ public SensitivityAtSpecificity( */ public SensitivityAtSpecificity( Ops tf, String name, float specificity, int numThresholds, long seed, Class type) { - super(tf, name, numThresholds, seed, type); - if (specificity < 0f || specificity > 1f) - throw new IllegalArgumentException("specificity must be in the range [0, 1]."); - this.specificity = specificity; + this(name, specificity, numThresholds, seed, type); + init(tf); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java index 10d33c31508..58a5c15a5e7 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java @@ -14,9 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.Collections; import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; @@ -27,6 +24,10 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; +import java.util.Collections; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Calculates how often predictions matches integer labels. * @@ -67,6 +68,30 @@ public class SparseCategoricalAccuracy extends MeanMetricWrapper implements LossMetric { + /** + * Creates a SparseCategoricalAccuracy metric, using name of {@link Class#getSimpleName()}. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type The data type for the metric result + */ + public SparseCategoricalAccuracy(long seed, Class type) { + this((String) null, seed, type); + } + + /** + * Creates a SparseCategoricalAccuracy metric. + * + * @param name the name of the metric, if null use {@link Class#getSimpleName()} + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type of the metric result. + */ + public SparseCategoricalAccuracy(String name, long seed, Class type) { + super(name, seed, type); + super.setLoss(this); + } + /** * Creates a SparseCategoricalAccuracy metric, using name of {@link Class#getSimpleName()}. * @@ -89,8 +114,8 @@ public SparseCategoricalAccuracy(Ops tf, long seed, Class type) { * @param type the type of the metric result. */ public SparseCategoricalAccuracy(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - super.setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -103,9 +128,9 @@ public SparseCategoricalAccuracy(Ops tf, String name, long seed, Class type) @Override public Operand call( Operand labels, Operand predictions) { - - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); Shape predShape = predictions.asOutput().shape(); Shape labelsShape = labels.asOutput().shape(); long predictionsRank = predShape.numDimensions(); @@ -115,15 +140,12 @@ public Operand call( if (predictionsRank != Shape.UNKNOWN_SIZE && labelsRank != Shape.UNKNOWN_SIZE && labelsShape.size((int) labelsRank - 1) == 1) { - tLabels = getTF().squeeze(tLabels, Squeeze.axis(Collections.singletonList(labelsRank - 1L))); + tLabels = tf.squeeze(tLabels, Squeeze.axis(Collections.singletonList(labelsRank - 1L))); } Operand argMaxPred = - cast( - getTF(), - getTF().math.argMax(tPredictions, getTF().constant(-1L), TInt64.class), - getResultType()); + cast(tf, tf.math.argMax(tPredictions, tf.constant(-1L), TInt64.class), getResultType()); - Equal equals = getTF().math.equal(tLabels, argMaxPred); - return getTF().dtypes.cast(equals, getResultType()); + Equal equals = tf.math.equal(tLabels, argMaxPred); + return tf.dtypes.cast(equals, getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java index 04555d85b66..be878296337 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java @@ -41,7 +41,6 @@ public class SparseCategoricalCrossentropy extends MeanMetric /** * Creates a SparseCategoricalCrossentropy metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. @@ -51,13 +50,31 @@ public class SparseCategoricalCrossentropy extends MeanMetric * @param type the type for the variables and result */ public SparseCategoricalCrossentropy( - Ops tf, String name, boolean fromLogits, int axis, long seed, Class type) { - super(tf, name, seed, type); + String name, boolean fromLogits, int axis, long seed, Class type) { + super(name, seed, type); setLoss(this); this.fromLogits = fromLogits; this.axis = axis; } + /** + * Creates a SparseCategoricalCrossentropy metric + * + * @param tf the TensorFlow Ops + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a + * probability distribution. + * @param axis The dimension along which the entropy is computed. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public SparseCategoricalCrossentropy( + Ops tf, String name, boolean fromLogits, int axis, long seed, Class type) { + this(name, fromLogits, axis, seed, type); + init(tf); + } + /** * Calculates how often predictions matches integer labels. * @@ -68,8 +85,9 @@ public SparseCategoricalCrossentropy( @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.sparseCategoricalCrossentropy(getTF(), tLabels, tPredictions, fromLogits, axis); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.sparseCategoricalCrossentropy(tf, tLabels, tPredictions, fromLogits, axis); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java index 29dc91298d3..b6d25ff170a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java @@ -33,6 +33,34 @@ public class SparseTopKCategoricalAccuracy extends MeanMetric /** Number of top elements to look at for computing accuracy. */ private final int k; + /** + * Creates a SparseTopKCategoricalAccuracy metric using {@link #DEFAULT_K} for the number of top + * elements. + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the date type for the result + */ + public SparseTopKCategoricalAccuracy(String name, long seed, Class type) { + this(name, DEFAULT_K, seed, type); + } + + /** + * Creates a SparseTopKCategoricalAccuracy metric. + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param k Number of top elements to look at for computing accuracy. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the date type for the result + */ + public SparseTopKCategoricalAccuracy(String name, int k, long seed, Class type) { + super(name, seed, type); + this.k = k; + setLoss(this); + } + /** * Creates a SparseTopKCategoricalAccuracy metric using {@link #DEFAULT_K} for the number of top * elements. @@ -58,9 +86,8 @@ public SparseTopKCategoricalAccuracy(Ops tf, String name, long seed, Class ty * @param type the date type for the result */ public SparseTopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Class type) { - super(tf, name, seed, type); - this.k = k; - setLoss(this); + this(name, k, seed, type); + init(tf); } /** @@ -73,8 +100,9 @@ public SparseTopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Clas @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Metrics.sparseTopKCategoricalAccuracy(getTF(), tLabels, tPredictions, k); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Metrics.sparseTopKCategoricalAccuracy(tf, tLabels, tPredictions, k); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java index aa8eeb062b3..88d128d024d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes best specificity where sensitivity is >= specified value. {@code Sensitivity} * measures the proportion of actual positives that are correctly identified as such {@code (tp / @@ -46,6 +46,74 @@ public class SpecificityAtSensitivity extends SensitivitySpec private final float sensitivity; + /** + * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()} and + * {@link #DEFAULT_NUM_THRESHOLDS} for the number of thresholds + * + * @param sensitivity the sensitivity. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range + * [0-1]. + */ + public SpecificityAtSensitivity(float sensitivity, long seed, Class type) { + this((String) null, sensitivity, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a SpecificityAtSensitivity metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number + * of thresholds + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param sensitivity the sensitivity. A scalar value in range [0, 1] + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range + * [0-1]. + */ + public SpecificityAtSensitivity(String name, float sensitivity, long seed, Class type) { + this(name, sensitivity, DEFAULT_NUM_THRESHOLDS, seed, type); + } + + /** + * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()}. + * + * @param sensitivity the sensitivity. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * sensitivity. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range + * [0-1]. + */ + public SpecificityAtSensitivity(float sensitivity, int numThresholds, long seed, Class type) { + this((String) null, sensitivity, numThresholds, seed, type); + } + + /** + * Creates a SpecificityAtSensitivity metric. + * + * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} + * @param sensitivity the sensitivity. A scalar value in range [0, 1] + * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given + * sensitivity. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range + * [0-1]. + */ + public SpecificityAtSensitivity( + String name, float sensitivity, int numThresholds, long seed, Class type) { + super(name, numThresholds, seed, type); + if (sensitivity < 0f || sensitivity > 1f) + throw new IllegalArgumentException("sensitivity must be in the range [0, 1]."); + this.sensitivity = sensitivity; + } + /** * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()} and * {@link #DEFAULT_NUM_THRESHOLDS} for the number of thresholds @@ -81,7 +149,7 @@ public SpecificityAtSensitivity( } /** - * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. + * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()}. * * @param tf The TensorFlow Ops * @param sensitivity the sensitivity. A scalar value in range [0, 1] @@ -99,7 +167,7 @@ public SpecificityAtSensitivity( } /** - * Creates a PrecisionRecall metric. + * Creates a SpecificityAtSensitivity metric. * * @param tf The TensorFlow Ops * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} @@ -114,10 +182,8 @@ public SpecificityAtSensitivity( */ public SpecificityAtSensitivity( Ops tf, String name, float sensitivity, int numThresholds, long seed, Class type) { - super(tf, name, numThresholds, seed, type); - if (sensitivity < 0f || sensitivity > 1f) - throw new IllegalArgumentException("sensitivity must be in the range [0, 1]."); - this.sensitivity = sensitivity; + this(name, sensitivity, numThresholds, seed, type); + init(tf); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java index e2ff208b8f5..5b070bd6b92 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java @@ -30,6 +30,19 @@ */ public class SquaredHinge extends MeanMetricWrapper implements LossMetric { + /** + * Creates a SquaredHinge metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public SquaredHinge(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); + } + /** * Creates a SquaredHinge metric * @@ -40,8 +53,8 @@ public class SquaredHinge extends MeanMetricWrapper implem * @param type the type for the variables and result */ public SquaredHinge(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - setLoss(this); + this(name, seed, type); + init(tf); } /** @@ -56,8 +69,9 @@ public SquaredHinge(Ops tf, String name, long seed, Class type) { @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Losses.squaredHinge(getTF(), tLabels, tPredictions); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Losses.squaredHinge(tf, tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java index bcb1d7b9a36..8647c2c491e 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java @@ -31,6 +31,29 @@ */ public class Sum extends Reduce { + /** + * Creates a Sum metric with a name of {@link Class#getSimpleName()} + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public Sum(long seed, Class type) { + super(null, MetricReduction.SUM, seed, type); + } + + /** + * Creates a Sum metric. + * + * @param name the name of the metric instance. If null, defaults to {@link Class#getSimpleName()} + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + public Sum(String name, long seed, Class type) { + super(name, MetricReduction.SUM, seed, type); + } + /** * Creates a Sum metric with a name of {@link Class#getSimpleName()} * @@ -40,7 +63,7 @@ public class Sum extends Reduce { * @param type the type for the variables and result */ public Sum(Ops tf, long seed, Class type) { - super(tf, null, MetricReduction.SUM, seed, type); + this(tf, null, seed, type); } /** @@ -53,6 +76,7 @@ public Sum(Ops tf, long seed, Class type) { * @param type the type for the variables and result */ public Sum(Ops tf, String name, long seed, Class type) { - super(tf, name, MetricReduction.SUM, seed, type); + this(name, seed, type); + init(tf); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java index b630be5bcc2..ae1d6eaa7cb 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Computes the poisson loss metric between labels and predictions. * @@ -33,6 +33,34 @@ public class TopKCategoricalAccuracy extends MeanMetricWrappe /** Number of top elements to look at for computing accuracy. */ private final int k; + /** + * Creates a TopKCategoricalAccuracy metric using {@link #DEFAULT_K} for {@code k}, Number of top + * elements to look at for computing accuracy. + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type The data type for the metric result + */ + public TopKCategoricalAccuracy(String name, long seed, Class type) { + this(name, DEFAULT_K, seed, type); + } + + /** + * Creates a TopKCategoricalAccuracy metric + * + * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. + * @param k Number of top elements to look at for computing accuracy. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type The data type for the metric result + */ + public TopKCategoricalAccuracy(String name, int k, long seed, Class type) { + super(name, seed, type); + this.k = k; + setLoss(this); + } + /** * Creates a TopKCategoricalAccuracy metric using {@link #DEFAULT_K} for {@code k}, Number of top * elements to look at for computing accuracy. @@ -58,9 +86,8 @@ public TopKCategoricalAccuracy(Ops tf, String name, long seed, Class type) { * @param type The data type for the metric result */ public TopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Class type) { - super(tf, name, seed, type); - this.k = k; - setLoss(this); + this(name, k, seed, type); + init(tf); } /** @@ -73,8 +100,9 @@ public TopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Class t @Override public Operand call( Operand labels, Operand predictions) { - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); - return Metrics.topKCategoricalAccuracy(getTF(), tLabels, tPredictions, k); + Ops tf = checkTF(); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + return Metrics.topKCategoricalAccuracy(tf, tLabels, tPredictions, k); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java index fd6b95df6d2..1607eaff377 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java @@ -32,6 +32,91 @@ * @param The data type for the metric result */ public class TrueNegatives extends ConfusionMatrixConditionCount { + /** + * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name and a + * default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TrueNegatives(long seed, Class type) { + this((String) null, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TrueNegatives(float threshold, long seed, Class type) { + this((String) null, new float[] {threshold}, seed, type); + } + + /** + * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TrueNegatives(float[] thresholds, long seed, Class type) { + this((String) null, thresholds, seed, type); + } + + /** + * Creates a TrueNegatives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TrueNegatives(String name, long seed, Class type) { + this(name, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a TrueNegatives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TrueNegatives(String name, float threshold, long seed, Class type) { + this(name, new float[] {threshold}, seed, type); + } + + /** + * Creates a TrueNegatives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TrueNegatives(String name, float[] thresholds, long seed, Class type) { + super(name, ConfusionMatrixEnum.TRUE_NEGATIVES, thresholds, seed, type); + } /** * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name and a @@ -122,6 +207,7 @@ public TrueNegatives(Ops tf, String name, float threshold, long seed, Class t * @param type the data type for the variables */ public TrueNegatives(Ops tf, String name, float[] thresholds, long seed, Class type) { - super(tf, name, ConfusionMatrixEnum.TRUE_NEGATIVES, thresholds, seed, type); + this(name, thresholds, seed, type); + init(tf); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java index 90fe9142014..b08987c36aa 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java @@ -33,6 +33,92 @@ */ public class TruePositives extends ConfusionMatrixConditionCount { + /** + * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name and a + * default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TruePositives(long seed, Class type) { + this((String) null, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TruePositives(float threshold, long seed, Class type) { + this((String) null, new float[] {threshold}, seed, type); + } + + /** + * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name + * + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TruePositives(float[] thresholds, long seed, Class type) { + this((String) null, thresholds, seed, type); + } + + /** + * Creates a TruePositives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TruePositives(String name, long seed, Class type) { + this(name, DEFAULT_THRESHOLD, seed, type); + } + + /** + * Creates a TruePositives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TruePositives(String name, float threshold, long seed, Class type) { + this(name, new float[] {threshold}, seed, type); + } + + /** + * Creates a TruePositives metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with + * prediction values to determine the truth value of predictions (i.e., above the threshold is + * {@code true}, below is {@code false}). One metric value is generated for each threshold + * value + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public TruePositives(String name, float[] thresholds, long seed, Class type) { + super(name, ConfusionMatrixEnum.TRUE_POSITIVES, thresholds, seed, type); + } + /** * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name and a * default threshold of {@link #DEFAULT_THRESHOLD}. @@ -122,6 +208,7 @@ public TruePositives(Ops tf, String name, float threshold, long seed, Class t * @param type the data type for the variables */ public TruePositives(Ops tf, String name, float[] thresholds, long seed, Class type) { - super(tf, name, ConfusionMatrixEnum.TRUE_POSITIVES, thresholds, seed, type); + this(name, thresholds, seed, type); + init(tf); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java index 4463e1f8213..6805635f692 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java @@ -14,11 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.Metric; @@ -29,6 +24,12 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Abstract base class that calculates the value of the given confusion matrix condition based on * labels and predictions. @@ -45,6 +46,66 @@ public abstract class ConfusionMatrixConditionCount extends M private Variable accumulator; private Assign initializer; + /** + * Creates a ConfusionMatrixConditionCount type of Metric, using a threshold of {@link + * #DEFAULT_THRESHOLD} + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param confusionMatrixCond the confusion matrix condition to calculate + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public ConfusionMatrixConditionCount( + String name, ConfusionMatrixEnum confusionMatrixCond, long seed, Class type) { + this(name, confusionMatrixCond, DEFAULT_THRESHOLD, seed, type); + } + /** + * Creates a ConfusionMatrixConditionCount type of Metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param confusionMatrixCond the confusion matrix condition to calculate + * @param threshold a threshold value in {@code [0, 1]}. A threshold is compared with prediction + * values to determine the truth value of predictions (i.e., above the threshold is {@code + * true}, below is {@code false}). One metric value is generated for each threshold value. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public ConfusionMatrixConditionCount( + String name, + ConfusionMatrixEnum confusionMatrixCond, + float threshold, + long seed, + Class type) { + this(name, confusionMatrixCond, new float[] {threshold}, seed, type); + } + + /** + * Creates a ConfusionMatrixConditionCount type of Metric + * + * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used + * @param confusionMatrixCond the confusion matrix condition to calculate + * @param thresholds threshold values in {@code [0, 1]}. A threshold is compared with prediction + * values to determine the truth value of predictions (i.e., above the threshold is {@code + * true}, below is {@code false}). One metric value is generated for each threshold value. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + */ + public ConfusionMatrixConditionCount( + String name, + ConfusionMatrixEnum confusionMatrixCond, + float[] thresholds, + long seed, + Class type) { + super(name, seed); + accumulatorName = this.getVariableName(ACCUMULATOR); + this.type = type; + this.confusionMatrixCond = confusionMatrixCond; + this.thresholds = thresholds; + } + /** * Creates a ConfusionMatrixConditionCount type of Metric, using a threshold of {@link * #DEFAULT_THRESHOLD} @@ -103,16 +164,18 @@ public ConfusionMatrixConditionCount( float[] thresholds, long seed, Class type) { - super(tf, name, seed); - accumulatorName = this.getVariableName(ACCUMULATOR); - this.type = type; - this.confusionMatrixCond = confusionMatrixCond; - this.thresholds = thresholds; - init(); + this(name, confusionMatrixCond, thresholds, seed, type); + init(tf); } /** Initialize the metric */ - private void init() { + public Ops init(Ops tf) { + if (!tf.scope().env().isGraph()) { + throw new IllegalArgumentException("Metrics are required to execute in Graph mode."); + } + + super.init(tf); + Shape variableShape = Shape.of(this.thresholds.length); Zeros zeros = new Zeros<>(); @@ -122,6 +185,7 @@ private void init() { .variable(zeros.call(getTF(), getTF().constant(variableShape), type)); initializer = getTF().assign(accumulator, zeros.call(getTF(), getTF().constant(variableShape), type)); + return getTF(); } /** @@ -147,7 +211,7 @@ public List updateStateList( Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = getTF(); + Ops tf = checkTF(); Operand tLabels = cast(tf, labels, type); Operand tPredictions = cast(tf, predictions, type); Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; @@ -169,7 +233,7 @@ public List updateStateList( /** {@inheritDoc} */ @Override public Operand result() { - return getTF().identity(accumulator); + return checkTF().identity(accumulator); } /** {@inheritDoc} */ diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java new file mode 100644 index 00000000000..576f56c75da --- /dev/null +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java @@ -0,0 +1,37 @@ +/* Copyright 2021 The TensorFlow Authors. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +=======================================================================*/ +package org.tensorflow.framework.metrics.impl; + +import org.tensorflow.op.Ops; + +import java.util.function.Consumer; + +public interface Initializable { + + /** + * Initializes the TensorFlow platform with the Metric + * + * @param tf the TensorFlow Ops + * @return the TensorFlow Ops possibly with a subScope; + */ + Ops init(Ops tf); + + /** + * Registers an initializer function to be executed upon {@link #init(Ops)}. + * + * @param initFunction the initializer function + */ + void onInit(Consumer initFunction); +} diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java index d9f4bb60cba..1486e3ada49 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java @@ -14,9 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.metrics.Mean; import org.tensorflow.framework.metrics.MetricReduction; @@ -24,6 +21,10 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; +import java.util.List; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * A class that bridges a stateless loss function with the {@link Mean} metric using a reduction of * {@link MetricReduction#WEIGHTED_MEAN}. @@ -39,6 +40,18 @@ public class MeanMetricWrapper extends Mean { /** The loss function interface */ protected LossMetric loss; + /** + * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#WEIGHTED_MEAN} + * + * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanMetricWrapper(String name, long seed, Class type) { + super(name, seed, type); + } + /** * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#WEIGHTED_MEAN} * @@ -93,12 +106,13 @@ public List updateStateList( if (labels == null || predictions == null) { throw new IllegalArgumentException("missing required inputs for labels and predictions"); } + Ops tf = checkTF(); - Operand tLabels = cast(getTF(), labels, getResultType()); - Operand tPredictions = cast(getTF(), predictions, getResultType()); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); Operand losses = loss.call(tLabels, tPredictions); - return super.updateStateList(cast(getTF(), losses, predictions.type()), sampleWeights); + return super.updateStateList(cast(tf, losses, predictions.type()), sampleWeights); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java index 7d265ef7651..58cf957e336 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java @@ -14,16 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -48,12 +38,26 @@ import org.tensorflow.types.family.TIntegral; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; + +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * These are helper methods for Metrics and will be module private when Java modularity is applied * to TensorFlow Java. These methods should not be used outside of the metrics packages. */ public class MetricsHelper { + + /** A representation of Negative Infinity */ public static final float NEG_INF = -1e10f; + private static final String ASSERT_BROADCAST_ERROR_PREFIX = "weights can not be broadcast to values."; diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java index b96d2dfa1d0..3d8a90b3a2b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java @@ -36,9 +36,13 @@ * @param The data type for the metric result */ public abstract class Reduce extends Metric { + /** the default name for the total variable */ public static final String TOTAL = "total"; + /** the default name for the count variable */ public static final String COUNT = "count"; + /** The metric reduction to use */ protected final MetricReduction reduction; + private final String totalName; private final String countName; @@ -51,6 +55,33 @@ public abstract class Reduce extends Metric { */ protected Variable count; + /** + * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} + * + * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param resultType the type for the variables and result + */ + protected Reduce(String name, long seed, Class resultType) { + this(name, MetricReduction.SUM, seed, resultType); + } + + /** + * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param reduction The type of metric reduction to apply + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param resultType the type for the variables and result + */ + protected Reduce(String name, MetricReduction reduction, long seed, Class resultType) { + super(name, seed); + this.reduction = reduction; + this.totalName = this.getVariableName(TOTAL); + this.countName = this.getVariableName(COUNT); + this.resultType = resultType; + } + /** * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} * @@ -73,15 +104,13 @@ protected Reduce(Ops tf, String name, long seed, Class resultType) { * @param resultType the type for the variables and result */ protected Reduce(Ops tf, String name, MetricReduction reduction, long seed, Class resultType) { - super(tf, name, seed); - this.reduction = reduction; - this.totalName = this.getVariableName(TOTAL); - this.countName = this.getVariableName(COUNT); - this.resultType = resultType; - setupVars(); + this(name, reduction, seed, resultType); + init(tf); } - /** Initializes the Variables */ - private void setupVars() { + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); if (total == null) { total = getTF().withName(totalName).variable(Shape.scalar(), resultType); } @@ -91,18 +120,19 @@ private void setupVars() { count = getTF().withName(countName).variable(Shape.scalar(), resultType); } } + return getTF(); } /** {@inheritDoc} */ public Op resetStates() { List controls = new ArrayList<>(); if (total != null) { - controls.add(getTF().assign(total, cast(getTF(), getTF().constant(0), total.type()))); + controls.add(checkTF().assign(total, cast(getTF(), getTF().constant(0), total.type()))); } if (count != null) { - controls.add(getTF().assign(count, cast(getTF(), getTF().constant(0), count.type()))); + controls.add(checkTF().assign(count, cast(getTF(), getTF().constant(0), count.type()))); } - return getTF().withControlDependencies(controls).noOp(); + return checkTF().withControlDependencies(controls).noOp(); } /** @@ -121,7 +151,7 @@ public List updateStateList( if (values == null) { throw new IllegalArgumentException("values is required."); } - Ops tf = getTF(); + Ops tf = checkTF(); List updateOperations = new ArrayList<>(); // cast everything to match the variables Operand tSampleWeights = null; @@ -204,11 +234,11 @@ public Operand result() { switch (this.reduction) { case SUM: - fResult = getTF().identity(total); + fResult = checkTF().identity(total); break; case WEIGHTED_MEAN: case SUM_OVER_BATCH_SIZE: - fResult = getTF().math.divNoNan(total, cast(getTF(), count, resultType)); + fResult = checkTF().math.divNoNan(total, cast(getTF(), count, resultType)); break; default: throw new UnsupportedOperationException( diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java index 6779b6b1f5a..71a2e576945 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java @@ -1,12 +1,5 @@ package org.tensorflow.framework.metrics.impl; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.Metric; @@ -17,6 +10,14 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Abstract base class for computing sensitivity and specificity. * @@ -51,7 +52,6 @@ public abstract class SensitivitySpecificityBase extends Metr /** * Creates a SensitivitySpecificityBase Metric * - * @param tf the TensorFlow Ops * @param name the name of the metric instance, if null then {@link Class#getSimpleName()} is used * @param numThresholds The number of thresholds to use for matching the given recall. * @param seed the seed for random number generation. An initializer created with a given seed @@ -59,9 +59,8 @@ public abstract class SensitivitySpecificityBase extends Metr * @param type the data type for the variables * @throws IllegalArgumentException if numThresholds <= 0. */ - protected SensitivitySpecificityBase( - Ops tf, String name, int numThresholds, long seed, Class type) { - super(tf, name, seed); + protected SensitivitySpecificityBase(String name, int numThresholds, long seed, Class type) { + super(name, seed); if (numThresholds <= 0) throw new IllegalArgumentException("numThresholds must be > 0."); this.type = type; this.truePositivesName = this.getVariableName(TRUE_POSITIVES); @@ -80,36 +79,54 @@ protected SensitivitySpecificityBase( } this.thresholds[numThresholds - 1] = 1f; } - init(); } - /** Initializes the Variables */ - private void init() { - Ops tf = getTF(); + /** + * Creates a SensitivitySpecificityBase Metric + * + * @param tf the TensorFlow Ops + * @param name the name of the metric instance, if null then {@link Class#getSimpleName()} is used + * @param numThresholds The number of thresholds to use for matching the given recall. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the data type for the variables + * @throws IllegalArgumentException if numThresholds <= 0. + */ + protected SensitivitySpecificityBase( + Ops tf, String name, int numThresholds, long seed, Class type) { + this(name, numThresholds, seed, type); + init(tf); + } + + /** {@inheritDoc} */ + @Override + public Ops init(Ops tf) { + super.init(tf); Zeros zeros = new Zeros<>(); Shape varShape = Shape.of(numThresholds); - Operand zero = zeros.call(tf, tf.constant(varShape), type); + Operand zero = zeros.call(getTF(), getTF().constant(varShape), type); if (this.getTruePositives() == null) { - truePositives = tf.withName(truePositivesName).variable(zero); - truePositivesInitializer = tf.assign(truePositives, zero); + truePositives = getTF().withName(truePositivesName).variable(zero); + truePositivesInitializer = getTF().assign(truePositives, zero); } if (this.getFalsePositives() == null) { - falsePositives = tf.withName(falsePositivesName).variable(zero); - falsePositivesInitializer = tf.assign(falsePositives, zero); + falsePositives = getTF().withName(falsePositivesName).variable(zero); + falsePositivesInitializer = getTF().assign(falsePositives, zero); } if (this.getTrueNegatives() == null) { - trueNegatives = tf.withName(trueNegativesName).variable(zero); - trueNegativesInitializer = tf.assign(trueNegatives, zero); + trueNegatives = getTF().withName(trueNegativesName).variable(zero); + trueNegativesInitializer = getTF().assign(trueNegatives, zero); } if (this.getFalseNegatives() == null) { - falseNegatives = tf.withName(falseNegativesName).variable(zero); - falseNegativesInitializer = tf.assign(falseNegatives, zero); + falseNegatives = getTF().withName(falseNegativesName).variable(zero); + falseNegativesInitializer = getTF().assign(falseNegatives, zero); } + return getTF(); } /** @@ -151,7 +168,7 @@ public List updateStateList( Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = getTF(); + Ops tf = checkTF(); Operand tLabels = cast(tf, labels, type); Operand tPredictions = cast(tf, predictions, type); Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java index dd77a1be4aa..0553b1edac7 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import static org.tensorflow.framework.utils.CastHelper.cast; - import org.tensorflow.Operand; import org.tensorflow.op.Ops; import org.tensorflow.op.SparseOps; import org.tensorflow.op.sparse.DenseToDenseSetOperation; import org.tensorflow.types.family.TNumber; +import static org.tensorflow.framework.utils.CastHelper.cast; + /** Implementation of set operations */ public class SetsOps { diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java index b8698ab197d..7c3fda07ea9 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java @@ -14,11 +14,12 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import org.tensorflow.Operand; +import org.tensorflow.types.family.TNumber; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.tensorflow.Operand; -import org.tensorflow.types.family.TNumber; /** * A class that represents a Symbolic shape. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java index 2df90a841ee..18b11700380 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java @@ -14,11 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import static org.tensorflow.framework.utils.CastHelper.cast; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.tensorflow.Operand; import org.tensorflow.ndarray.Shape; import org.tensorflow.op.Op; @@ -28,6 +23,12 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.tensorflow.framework.utils.CastHelper.cast; + /** * Weight broadcasting operations. * diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java index bd693da1312..4778ac1a145 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java @@ -23,9 +23,9 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.tensorflow.framework.utils.CastHelper.cast; @@ -84,9 +84,6 @@ public void testCumulative() { assertNull(instance.getTrueNegatives()); assertNull(instance.getFalseNegatives()); - - - for (int i = 0; i < 3; i++) { Op update = instance.updateState(yTrue, yPred, null); session.run(update); @@ -118,7 +115,6 @@ public void basicTestSampleWeight() { float[] expectedThresholds = new float[] {-1e-7f, 0.5f, 1 + 1e-7f}; assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); - Operand yPred = tf.constant(new float[] {0, 0, 1, 1}); Operand yTrue = tf.constant(new float[] {0f, 0.5f, 0.3f, 0.9f}); Operand sampleWeights = tf.constant(new float[] {1, 0, 0, 1}); From 4f4ae8ebc7933d51af1aee31883d78116b08267a Mon Sep 17 00:00:00 2001 From: Jim Clarke Date: Mon, 14 Jun 2021 17:43:25 -0400 Subject: [PATCH 2/7] Fixed Recall CTOR, added .bazelversion --- tensorflow-core/tensorflow-core-api/.bazelversion | 1 + .../java/org/tensorflow/framework/metrics/Recall.java | 11 +---------- 2 files changed, 2 insertions(+), 10 deletions(-) create mode 100644 tensorflow-core/tensorflow-core-api/.bazelversion diff --git a/tensorflow-core/tensorflow-core-api/.bazelversion b/tensorflow-core/tensorflow-core-api/.bazelversion new file mode 100644 index 00000000000..0b2eb36f508 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/.bazelversion @@ -0,0 +1 @@ +3.7.2 diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java index 3c01770c711..11cac7a56c6 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java @@ -496,16 +496,7 @@ public Recall( Integer classId, long seed, Class type) { - super(tf, name, seed); - this.type = type; - this.truePositivesName = this.getVariableName(TRUE_POSITIVES); - this.falseNegativesName = this.getVariableName(FALSE_NEGATIVES); - float defaultThreshold = topK == null ? DEFAULT_THRESHOLD : MetricsHelper.NEG_INF; - - this.thresholds = thresholds == null ? new float[] {defaultThreshold} : thresholds; - this.topK = topK; - this.classId = classId; - + this(name, thresholds, topK, classId, seed, type); init(tf); } From da7e2f0e13c4ee7d24efd840324012c7e3c2b2b7 Mon Sep 17 00:00:00 2001 From: Jim Clarke Date: Tue, 15 Jun 2021 16:49:30 -0400 Subject: [PATCH 3/7] Fix test case on Recall, added test for initTF and chack for IllegalStateException if TF has not been set. --- .../org/tensorflow/framework/metrics/AUC.java | 8 +- .../tensorflow/framework/metrics/MeanIoU.java | 4 +- .../framework/metrics/MeanRelativeError.java | 39 +++- .../framework/metrics/MeanTensor.java | 13 +- .../tensorflow/framework/metrics/Metric.java | 39 +++- .../framework/metrics/Precision.java | 4 +- .../tensorflow/framework/metrics/Recall.java | 4 +- .../impl/ConfusionMatrixConditionCount.java | 8 +- .../framework/metrics/impl/Reduce.java | 5 +- .../impl/SensitivitySpecificityBase.java | 4 +- .../tensorflow/framework/metrics/AUCTest.java | 204 ++++++++++++++++-- .../framework/metrics/AccuracyTest.java | 86 ++++++++ .../framework/metrics/BinaryAccuracyTest.java | 80 +++++++ .../metrics/BinaryCrossentropyTest.java | 43 ++++ .../metrics/CategoricalAccuracyTest.java | 44 ++++ .../metrics/CategoricalCrossentropyTest.java | 41 ++++ .../metrics/CategoricalHingeTest.java | 49 +++++ .../metrics/CosineSimilarityTest.java | 41 ++++ .../framework/metrics/FalseNegativesTest.java | 41 +++- .../framework/metrics/FalsePositivesTest.java | 56 ++++- .../framework/metrics/HingeTest.java | 37 ++++ .../framework/metrics/KLDivergenceTest.java | 47 ++++ .../framework/metrics/LogCoshErrorTest.java | 41 ++++ .../metrics/MeanAbsoluteErrorTest.java | 58 +++++ .../MeanAbsolutePercentageErrorTest.java | 57 +++++ .../framework/metrics/MeanIoUTest.java | 42 +++- .../metrics/MeanRelativeErrorTest.java | 49 ++++- .../metrics/MeanSquaredErrorTest.java | 53 +++++ .../MeanSquaredLogarithmicErrorTest.java | 55 +++++ .../framework/metrics/MeanTensorTest.java | 41 +++- .../framework/metrics/PoissonTest.java | 37 ++++ .../metrics/PrecisionAtRecallTest.java | 35 +++ .../framework/metrics/PrecisionTest.java | 34 +++ .../metrics/RecallAtPrecisionTest.java | 33 +++ .../framework/metrics/RecallTest.java | 34 +++ .../metrics/RootMeanSquaredErrorTest.java | 37 ++++ .../metrics/SensitivityAtSpecificityTest.java | 36 ++++ .../SparseCategoricalCrossentropyTest.java | 39 ++++ .../metrics/SpecificityAtSensitivityTest.java | 36 ++++ .../framework/metrics/SquaredHingeTest.java | 46 ++++ .../tensorflow/framework/metrics/SumTest.java | 39 ++++ .../metrics/TopKCategoricalAccuracyTest.java | 47 ++++ .../framework/metrics/TrueNegativesTest.java | 40 +++- .../framework/metrics/TruePositivesTest.java | 40 +++- 44 files changed, 1753 insertions(+), 73 deletions(-) diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java index 38830df246b..deb34696d1e 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java @@ -1038,14 +1038,16 @@ public AUC( /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); + setTensorFlowOps(tf); if (labelWeights != null) { // assert that labelWeights are non-negative. Op checks = getTF() .withSubScope("AUC") .assertThat( - tf.math.greaterEqual(labelWeights, cast(tf, tf.constant(0), labelWeights.type())), + getTF() + .math + .greaterEqual(labelWeights, cast(tf, tf.constant(0), labelWeights.type())), Collections.singletonList( tf.constant("All values of labelWeights must be non-negative."))); @@ -1054,6 +1056,7 @@ public Ops init(Ops tf) { this.labelWeights = ltf.identity(this.labelWeights); } + applyOnInit(); return getTF(); } @@ -1392,6 +1395,7 @@ public Operand result() { /** {@inheritDoc} */ @Override public Op resetStates() { + checkTF(); List updateOperations = new ArrayList<>(initializers.values()); return checkTF().withSubScope("resetStates").withControlDependencies(updateOperations).noOp(); } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java index 17640d7c27d..e74c01b116c 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java @@ -117,7 +117,7 @@ protected MeanIoU(Ops tf, String name, long numClasses, long seed, Class type /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); + setTensorFlowOps(tf); Shape variableShape = Shape.of(numClasses, numClasses); if (totalConfusionMatrix == null) { @@ -131,12 +131,14 @@ public Ops init(Ops tf) { .assign( totalConfusionMatrix, zeros.call(getTF(), getTF().constant(variableShape), type)); } + applyOnInit(); return getTF(); } /** {@inheritDoc} */ @Override public Op resetStates() { + checkTF(); return initializer; } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java index bc709381ffe..6a577d1b38b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java @@ -17,11 +17,14 @@ import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; +import org.tensorflow.ndarray.DoubleNdArray; +import org.tensorflow.ndarray.StdArrays; import org.tensorflow.op.Op; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; import java.util.List; +import java.util.stream.IntStream; import static org.tensorflow.framework.utils.CastHelper.cast; @@ -41,8 +44,7 @@ public class MeanRelativeError extends Mean { private Operand normalizer; // holders for the init(Ops) method - private float[] normalizerFloat; - private double[] normalizerDouble; + private DoubleNdArray normalizerArray; /** * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name @@ -66,8 +68,11 @@ protected MeanRelativeError(float[] normalizer, long seed, Class type) { * @param type the type for the variables and result */ protected MeanRelativeError(String name, float[] normalizer, long seed, Class type) { - super(name, seed, type); - this.normalizerFloat = normalizer; + this( + name, + IntStream.range(0, normalizer.length).mapToDouble(i -> normalizer[i]).toArray(), + seed, + type); } /** @@ -92,8 +97,22 @@ protected MeanRelativeError(double[] normalizer, long seed, Class type) { * @param type the type for the variables and result */ protected MeanRelativeError(String name, double[] normalizer, long seed, Class type) { + this(name, StdArrays.ndCopyOf(normalizer), seed, type); + } + + /** + * Creates a MeanRelativeError metric + * + * @param name the name of the metric. If null, name defaults to {@link Class#getSimpleName()}. + * @param normalizerArray The normalizer values with same shape as predictions. + * @param seed the seed for random number generation. An initializer created with a given seed + * will always produce the same random tensor for a given shape and data type. + * @param type the type for the variables and result + */ + protected MeanRelativeError( + String name, DoubleNdArray normalizerArray, long seed, Class type) { super(name, seed, type); - this.normalizerDouble = normalizer; + this.normalizerArray = normalizerArray; } /** @@ -201,8 +220,8 @@ protected MeanRelativeError(Ops tf, Operand normalizer, long seed, Class t */ protected MeanRelativeError( Ops tf, String name, Operand normalizer, long seed, Class type) { - super(tf, name, seed, type); - this.normalizer = normalizer; + this(name, normalizer, seed, type); + init(tf); } /** {@inheritDoc} */ @@ -210,10 +229,8 @@ protected MeanRelativeError( public Ops init(Ops tf) { super.init(tf); if (normalizer == null) { - if (normalizerFloat != null) { - normalizer = cast(getTF(), getTF().constant(normalizerFloat), getResultType()); - } else if (normalizerDouble != null) { - normalizer = cast(getTF(), getTF().constant(normalizerDouble), getResultType()); + if (normalizerArray != null) { + normalizer = cast(getTF(), getTF().constant(normalizerArray), getResultType()); } } return getTF(); diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java index 8ab0afb954b..a8708bf95e2 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java @@ -213,9 +213,14 @@ public Variable getCount() { /** {@inheritDoc} */ @Override public Op resetStates() { - List controlOpsPre = new ArrayList<>(); - controlOpsPre.add(countInitializer); - controlOpsPre.add(totalInitializer); - return getTF().withSubScope("resetStates").withControlDependencies(controlOpsPre).noOp(); + checkTF(); + if (countInitializer != null && totalInitializer != null) { + List controlOpsPre = new ArrayList<>(); + controlOpsPre.add(countInitializer); + controlOpsPre.add(totalInitializer); + return getTF().withSubScope("resetStates").withControlDependencies(controlOpsPre).noOp(); + } else { + return getTF().withSubScope("resetStates").noOp(); + } } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java index 932ab59ffd8..659a62fa979 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java @@ -38,6 +38,7 @@ public abstract class Metric implements Initializable { private final String name; /** The TensorFlow Ops */ protected Ops tf; + protected List> onInits; /** @@ -89,15 +90,10 @@ protected Metric(Ops tf, String name, long seed) { /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - if (!tf.scope().env().isGraph()) { - throw new IllegalArgumentException("Metrics are required to execute in Graph mode."); - } - if (this.tf == null) { - this.tf = tf.withName(this.getClass().getSimpleName()); - if (onInits != null) { - onInits.forEach(c -> c.accept(this.tf)); - } + if (this.tf == null) { + setTensorFlowOps(tf); + applyOnInit(); } return this.tf; } @@ -111,6 +107,33 @@ public void onInit(Consumer initFunction) { onInits.add(initFunction); } + /** + * Sets the TensorFlow Ops. This is for sub classes that override the {@link #init(Ops)} method. + * + * @param tf the TensorFlow Ops + * @throws IllegalArgumentException if the TensorFlow environment is not in Graph mode. + */ + protected Ops setTensorFlowOps(Ops tf) { + if (!tf.scope().env().isGraph()) { + throw new IllegalArgumentException("Metrics are required to execute in Graph mode."); + } + this.tf = this.tf = tf.withName(this.getClass().getSimpleName()); + return this.tf; + } + + /** + * Applies the registered onInit functions with the TensorFlow platform. This is for sub classes + * that override the {@link #init(Ops)} method. + * + * @throws IllegalStateException if the TensorFlow Ops has not been assigned. + */ + protected void applyOnInit() { + if (onInits != null) { + checkTF(); + onInits.forEach(c -> c.accept(this.tf)); + } + } + /** * Get the TensorFlow Ops for this metric. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java index 3c56f712702..fc3fa611449 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java @@ -446,7 +446,7 @@ public Precision( /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); + setTensorFlowOps(tf); Zeros zeros = new Zeros<>(); Operand zero = zeros.call(getTF(), getTF().constant(Shape.of(thresholds.length)), type); @@ -458,6 +458,7 @@ public Ops init(Ops tf) { this.falsePositives = getTF().withName(falsePositivesName).variable(zero); initializers.add(getTF().assign(falsePositives, zero)); } + applyOnInit(); return getTF(); } @@ -519,6 +520,7 @@ public Operand result() { /** {@inheritDoc} */ @Override public Op resetStates() { + checkTF(); return getTF().withSubScope("resetStates").withControlDependencies(initializers).noOp(); } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java index 11cac7a56c6..0c28290a8b5 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java @@ -503,7 +503,7 @@ public Recall( /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); + setTensorFlowOps(tf); Zeros zeros = new Zeros<>(); Operand zero = zeros.call(tf, tf.constant(Shape.of(this.thresholds.length)), type); @@ -518,12 +518,14 @@ public Ops init(Ops tf) { falseNegatives = getTF().withName(falseNegativesName).variable(zero); initializers.add(getTF().assign(falseNegatives, zero)); } + applyOnInit(); return getTF(); } /** {@inheritDoc} */ @Override public Op resetStates() { + checkTF(); return getTF().withSubScope("resetStates").withControlDependencies(initializers).noOp(); } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java index 6805635f692..f93baf9b89e 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java @@ -170,11 +170,7 @@ public ConfusionMatrixConditionCount( /** Initialize the metric */ public Ops init(Ops tf) { - if (!tf.scope().env().isGraph()) { - throw new IllegalArgumentException("Metrics are required to execute in Graph mode."); - } - - super.init(tf); + setTensorFlowOps(tf); Shape variableShape = Shape.of(this.thresholds.length); @@ -185,6 +181,7 @@ public Ops init(Ops tf) { .variable(zeros.call(getTF(), getTF().constant(variableShape), type)); initializer = getTF().assign(accumulator, zeros.call(getTF(), getTF().constant(variableShape), type)); + applyOnInit(); return getTF(); } @@ -239,6 +236,7 @@ public Operand result() { /** {@inheritDoc} */ @Override public Op resetStates() { + checkTF(); return initializer; } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java index 3d8a90b3a2b..fe6ad0db11f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java @@ -110,7 +110,8 @@ protected Reduce(Ops tf, String name, MetricReduction reduction, long seed, Clas /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); + + setTensorFlowOps(tf); if (total == null) { total = getTF().withName(totalName).variable(Shape.scalar(), resultType); } @@ -120,11 +121,13 @@ public Ops init(Ops tf) { count = getTF().withName(countName).variable(Shape.scalar(), resultType); } } + applyOnInit(); return getTF(); } /** {@inheritDoc} */ public Op resetStates() { + checkTF(); List controls = new ArrayList<>(); if (total != null) { controls.add(checkTF().assign(total, cast(getTF(), getTF().constant(0), total.type()))); diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java index 71a2e576945..5184ef9a68b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java @@ -101,7 +101,7 @@ protected SensitivitySpecificityBase( /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); + setTensorFlowOps(tf); Zeros zeros = new Zeros<>(); Shape varShape = Shape.of(numThresholds); Operand zero = zeros.call(getTF(), getTF().constant(varShape), type); @@ -126,6 +126,7 @@ public Ops init(Ops tf) { falseNegatives = getTF().withName(falseNegativesName).variable(zero); falseNegativesInitializer = getTF().assign(falseNegatives, zero); } + applyOnInit(); return getTF(); } @@ -196,6 +197,7 @@ public List updateStateList( /** {@inheritDoc} */ @Override public Op resetStates() { + checkTF(); return initializeVariables(); } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java index 4778ac1a145..3a506eec8d1 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java @@ -47,7 +47,7 @@ public void testValueIsIdempotent() { Operand yTrue = tf.constant(trueArray); AUC instance = new AUC<>(tf, numThresholds, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, null); @@ -60,6 +60,23 @@ public void testValueIsIdempotent() { for (int i = 0; i < 10; i++) { session.evaluate(result, instance.result()); } + + // test init(tf) + instance = new AUC<>(numThresholds, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + update = instance.updateState(yTrue, yPred, null); + + for (int i = 0; i < 10; i++) { + session.run(update); + } + + result = instance.result(); + + for (int i = 0; i < 10; i++) { + session.evaluate(result, instance.result()); + } } } @@ -77,7 +94,38 @@ public void testCumulative() { Operand yTrue = tf.constant(trueArray); AUC instance = new AUC<>(tf, numThresholds, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); + + assertNull(instance.getTruePositives()); + assertNull(instance.getFalsePositives()); + assertNull(instance.getTrueNegatives()); + assertNull(instance.getFalseNegatives()); + + for (int i = 0; i < 3; i++) { + Op update = instance.updateState(yTrue, yPred, null); + session.run(update); + session.evaluate(tp[i], instance.getTruePositives()); + session.evaluate(fp[i], instance.getFalsePositives()); + session.evaluate(tn[i], instance.getTrueNegatives()); + session.evaluate(fn[i], instance.getFalseNegatives()); + } + + // test reset + session.run(instance.resetStates()); + for (int i = 0; i < 3; i++) { + Op update = instance.updateState(yTrue, yPred, null); + session.run(update); + session.evaluate(tp[i], instance.getTruePositives()); + session.evaluate(fp[i], instance.getFalsePositives()); + session.evaluate(tn[i], instance.getTrueNegatives()); + session.evaluate(fn[i], instance.getFalseNegatives()); + } + + // test init(tf) + instance = new AUC<>(numThresholds, 1001L, TFloat32.class); + instance.init(tf); + + session.run(instance.resetStates()); assertNull(instance.getTruePositives()); assertNull(instance.getFalsePositives()); @@ -123,6 +171,17 @@ public void basicTestSampleWeight() { session.run(update); Operand result = instance.result(); session.evaluate(1.0f, result); + + // test init(tf) + instance = new AUC<>(numThresholds, 1001L, TFloat32.class); + instance.init(tf); + assertEquals(numThresholds, instance.getNumThresholds()); + assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); + + update = instance.updateState(yTrue, yPred, sampleWeights); + session.run(update); + result = instance.result(); + session.evaluate(1.0f, result); } } @@ -132,13 +191,25 @@ public void testUnweightedAllCorrect() { Ops tf = session.getTF(); Operand yTrue = cast(tf, tf.constant(this.trueArray), TFloat32.class); AUC instance = new AUC<>(tf, this.numThresholds, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yTrue, null); session.run(update); Operand result = instance.result(); session.evaluate(1f, result); + + // test init(tf) + instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); + instance.init(tf); + instance.resetStates(); + session.run(instance.resetStates()); + + update = instance.updateState(yTrue, yTrue, null); + session.run(update); + result = instance.result(); + + session.evaluate(1f, result); } } @@ -149,13 +220,24 @@ public void testUnweighted() { Operand yPred = tf.constant(this.predArray); Operand yTrue = tf.constant(this.trueArray); AUC instance = new AUC<>(tf, this.numThresholds, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, null); session.run(update); Operand result = instance.result(); // float expectedResult = (0.75f * 1 + 0.25f * 0); session.evaluate(0.75f, result); + + // test init(tf) + instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, null); + session.run(update); + result = instance.result(); + + // float expectedResult = (0.75f * 1 + 0.25f * 0); + session.evaluate(0.75f, result); } } @@ -168,13 +250,26 @@ public void testManualThresholds() { AUC instance = new AUC<>(tf, new float[] {0.5f}, 1001L, TFloat32.class); float[] expectedThresholds = new float[] {-AUC.EPSILON, 0.5f, 1 + AUC.EPSILON}; assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, null); session.run(update); Operand result = instance.result(); // float expectedResult = (0.75f * 1 + 0.25f * 0); session.evaluate(0.75f, result); + + // test init(tf) + instance = new AUC<>(new float[] {0.5f}, 1001L, TFloat32.class); + assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); + instance.init(tf); + instance.resetStates(); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, null); + session.run(update); + result = instance.result(); + + // float expectedResult = (0.75f * 1 + 0.25f * 0); + session.evaluate(0.75f, result); } } @@ -187,13 +282,22 @@ public void testWeightedRocInterpolation() { Operand sampleWights = tf.constant(this.sampleWeight); AUC instance = new AUC<>(tf, this.numThresholds, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, sampleWights); session.run(update); Operand result = instance.result(); float expectedResult = (0.78571427f * 1 + 0.2857145f * 0); session.evaluate(expectedResult, result); + + // test init(tf) + instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, sampleWights); + session.run(update); + result = instance.result(); + session.evaluate(expectedResult, result); } } @@ -213,13 +317,25 @@ public void testWeightedRocMajoring() { AUCSummationMethod.MAJORING, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, sampleWights); session.run(update); Operand result = instance.result(); float expectedResult = (1.0f + .5714285f * 0f); session.evaluate(expectedResult, result); + + // test init(tf) + instance = + new AUC<>( + this.numThresholds, AUCCurve.ROC, AUCSummationMethod.MAJORING, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, sampleWights); + session.run(update); + result = instance.result(); + + session.evaluate(expectedResult, result); } } @@ -239,13 +355,25 @@ public void testWeightedRocMinoring() { AUCSummationMethod.MINORING, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, sampleWights); session.run(update); Operand result = instance.result(); float expectedResult = (0.5714285f + 0f * 0f); session.evaluate(expectedResult, result); + + // test init(tf) + instance = + new AUC<>( + this.numThresholds, AUCCurve.ROC, AUCSummationMethod.MINORING, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, sampleWights); + session.run(update); + result = instance.result(); + + session.evaluate(expectedResult, result); } } @@ -265,12 +393,23 @@ public void testWeightedPrMajoring() { AUCSummationMethod.MAJORING, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, sampleWights); session.run(update); Operand result = instance.result(); float expectedResult = 0.4285715f + 0.5714285f; session.evaluate(expectedResult, result); + + // test init(tf) + instance = + new AUC<>( + this.numThresholds, AUCCurve.PR, AUCSummationMethod.MAJORING, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, sampleWights); + session.run(update); + result = instance.result(); + session.evaluate(expectedResult, result); } } @@ -290,12 +429,23 @@ public void testWeightedPrMinoring() { AUCSummationMethod.MINORING, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, sampleWights); session.run(update); Operand result = instance.result(); float expectedResult = 0.7f * 0.4285715f + 0f * 0.5714285f; session.evaluate(expectedResult, result); + + // test init(tf) + instance = + new AUC<>( + this.numThresholds, AUCCurve.PR, AUCSummationMethod.MINORING, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, sampleWights); + session.run(update); + result = instance.result(); + session.evaluate(expectedResult, result); } } @@ -309,12 +459,21 @@ public void testWeightedPrInterpolation() { AUC instance = new AUC<>(tf, this.numThresholds, AUCCurve.PR, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(yTrue, yPred, sampleWights); session.run(update); Operand result = instance.result(); float expectedResult = 0.916613f; session.evaluate(expectedResult, result); + + // test init(tf) + instance = new AUC<>(this.numThresholds, AUCCurve.PR, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(yTrue, yPred, sampleWights); + session.run(update); + result = instance.result(); + session.evaluate(expectedResult, result); } } @@ -358,12 +517,33 @@ public void testExtraDims() { Operand labels = tf.constant(labelArray); AUC instance = new AUC<>(tf, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, logits, null); session.run(update); Operand result = instance.result(); float expectedResult = 0.5f; session.evaluate(expectedResult, result); + + // test init(tf) + instance = new AUC<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + update = instance.updateState(labels, logits, null); + session.run(update); + result = instance.result(); + session.evaluate(expectedResult, result); } } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + AUC instance = new AUC<>(1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java index 48cac95b8a6..41b84c15de2 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class AccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -46,6 +48,20 @@ public void testCorrect() { session.evaluate(4F, total); session.evaluate(4, count); session.evaluate(1F, result); + + // test init(tf) + instance = new Accuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + op = instance.updateState(labels, predictions, null); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(4F, total); + session.evaluate(4, count); + session.evaluate(1F, result); } } @@ -73,6 +89,21 @@ public void testSampleWeight() { session.evaluate(.5F, total); session.evaluate(.7, count); session.evaluate(0.71428573f, result); + + // test init(tf) + instance = new Accuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + op = instance.updateState(labels, predictions, sampleWeight); + session.run(op); + + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(.5F, total); + session.evaluate(.7, count); + session.evaluate(0.71428573f, result); } } @@ -125,6 +156,61 @@ public void testVariableState() { session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); + + // test init(tf) + instance = new Accuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + op = instance.updateState(labels, labels, sampleWeight); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(0.7F, total); + session.evaluate(.7, count); + session.evaluate(1.0F, result); + + // 2nd run + op = instance.updateState(labels, labels, sampleWeight); + session.run(op); + result = instance.result(); + session.evaluate(1.4F, total); + session.evaluate(1.4, count); + session.evaluate(1.0F, result); + + // new instance same graph + instance = new Accuracy<>(tf, 1001L, TFloat32.class); + session.run(instance.resetStates()); + op = instance.updateState(labels, labels, sampleWeight); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(0.7F, total); + session.evaluate(.7, count); + session.evaluate(1.0F, result); + + // reset variables + session.run(instance.resetStates()); + result = instance.result(); + op = instance.updateState(labels, labels, sampleWeight); + session.run(op); + session.evaluate(0.7F, total); + session.evaluate(.7, count); + session.evaluate(1.0F, result); } } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Accuracy instance = new Accuracy<>(1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java index d203815f4ab..670e75bf943 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class BinaryAccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -46,6 +48,19 @@ public void testCorrect() { session.evaluate(2F, total); session.evaluate(2, count); session.evaluate(1F, result); + + // test init(tf) + instance = new BinaryAccuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + op = instance.updateState(labels, predictions, null); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(2F, total); + session.evaluate(2, count); + session.evaluate(1F, result); } } @@ -68,6 +83,19 @@ public void testPredictionSqueeze() { session.evaluate(2F, total); session.evaluate(4, count); session.evaluate(0.5F, result); + + // test init(tf) + instance = new BinaryAccuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + op = instance.updateState(labels, predictions, null); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(2F, total); + session.evaluate(4, count); + session.evaluate(0.5F, result); } } @@ -94,6 +122,19 @@ public void testSampleWeight() { session.evaluate(0.5F, total); session.evaluate(.7, count); session.evaluate(0.71428573f, result); + + // test init(tf) + instance = new BinaryAccuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + op = instance.updateState(labels, predictions, sampleWeight); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(0.5F, total); + session.evaluate(.7, count); + session.evaluate(0.71428573f, result); } } @@ -148,6 +189,19 @@ public void testVariableState() { session.evaluate(0.2F, total); session.evaluate(.7, count); session.evaluate(0.2857143F, result); + + // test init(tf) + instance = new BinaryAccuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + op = instance.updateState(labels, labels, sampleWeight); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(0.2F, total); + session.evaluate(.7, count); + session.evaluate(0.2857143F, result); } } @@ -171,6 +225,32 @@ public void testBinaryAccuracyAThreshold() { session.evaluate(2F, total); session.evaluate(4, count); session.evaluate(0.5F, result); + + // test init(tf) + instance = new BinaryAccuracy<>(0.7f, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + op = instance.updateState(labels, predictions, null); + session.run(op); + total = instance.getTotal(); + count = instance.getCount(); + result = instance.result(); + session.evaluate(2F, total); + session.evaluate(4, count); + session.evaluate(0.5F, result); } } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + BinaryAccuracy instance = new BinaryAccuracy<>(1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java index be46bb5c282..661e05a0ca5 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class BinaryCrossentropyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -148,4 +150,45 @@ public void testLabelSmoothing() { session.evaluate(35, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + float labelSmoothing = 0.1F; + BinaryCrossentropy instance = + new BinaryCrossentropy<>( + "BCE_testWeightedLabS", true, labelSmoothing, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + float[] trueArray = {1, 0, 1}; + double[] logitsArray = {100., -100., -100.}; + Operand labels = tf.constant(trueArray); + Operand logits = tf.constant(logitsArray); + + Op op = instance.updateState(labels, logits, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + + session.evaluate(35, total); + session.evaluate(1, count); + session.evaluate(35, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + BinaryCrossentropy instance = + new BinaryCrossentropy<>( + "BCE_testWeightedLabS", false, 1.0f, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java index aea2e4e0d6e..36d4ed9ce79 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class CategoricalAccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -150,4 +152,46 @@ public void testVariableState() { session.evaluate(1.0F, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + CategoricalAccuracy instance = new CategoricalAccuracy<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = { + 0, 0, 1, + 0, 1, 0 + }; + float[] predArray = { + 0.1f, 0.1f, 0.8f, + 0.05f, 0.95f, 0f + }; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); + Op op = instance.updateState(labels, predictions, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(2F, total); + session.evaluate(2, count); + session.evaluate(1F, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + CategoricalAccuracy instance = + new CategoricalAccuracy<>(1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java index 34fc3eef884..c3448e300f7 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class CategoricalCrossentropyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -148,4 +150,43 @@ public void testLabelSmoothing() { session.evaluate(3.6678069, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + CategoricalCrossentropy instance = + new CategoricalCrossentropy<>( + "CCE_testUnweightedLogits", true, 0, -1, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = {0, 1, 0, 0, 0, 1}; + double[] predArray = {1, 9, 0, 1, 8, 1}; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); + Op op = instance.updateState(labels, predictions, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(7.0022807, total); + session.evaluate(2, count); + session.evaluate(3.5011404, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + CategoricalCrossentropy instance = + new CategoricalCrossentropy<>( + "testIllegalState", true, 0, -1, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java index 78b25a21b60..0b90ecb62ad 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class CategoricalHingeTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -94,4 +96,51 @@ public void testWeighted() { session.evaluate(0.5, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + CategoricalHinge instance = + new CategoricalHinge<>("CH_testUnweighted", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = { + 0, 1, 0, 1, 0, + 0, 0, 1, 1, 1, + 1, 1, 1, 1, 0, + 0, 0, 0, 0, 1 + }; + double[] predArray = { + 0, 0, 1, 1, 0, + 1, 1, 1, 1, 1, + 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1 + }; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(4, 5))); + Op op = instance.updateState(labels, predictions, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(2., total); + session.evaluate(4, count); + session.evaluate(0.5, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + CategoricalHinge instance = + new CategoricalHinge<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java index 18410416c42..e0dd7990604 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class CosineSimilarityTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -98,4 +100,43 @@ public void test_axis() { session.evaluate(0.18721905F, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + CosineSimilarity instance = + new CosineSimilarity<>("CS_testWeighted", 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = {1, 9, 2, -5, -2, 6}; + float[] predArray = {4, 8, 12, 8, 1, 3}; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); + + Operand sampleWeight = tf.constant(new float[] {1.2f, 3.4f}); + Op op = instance.updateState(labels, predictions, sampleWeight); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(-0.3119840621948241F, total); + session.evaluate(4.6, count); + session.evaluate(-0.06782262221626612F, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + CosineSimilarity instance = + new CosineSimilarity<>("CS_testWeighted", -1, 1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java index 4bd8d99586e..bfe8ee67bc6 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java @@ -23,6 +23,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class FalseNegativesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -46,7 +48,7 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); FalseNegatives instance = new FalseNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -64,7 +66,7 @@ public void testWeighted() { Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); FalseNegatives instance = new FalseNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -96,7 +98,7 @@ public void testUnweightedWithThresholds() { }); FalseNegatives instance = new FalseNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -130,7 +132,7 @@ public void testWeightedWithThresholds() { Operand sampleWeight = tf.constant(new double[][] {{3.0}, {5.0}, {7.0}, {4.0}}); FalseNegatives instance = new FalseNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -138,4 +140,35 @@ public void testWeightedWithThresholds() { session.evaluate(expected, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Operand predictions = tf.constant(this.predArray); + Operand labels = tf.constant(this.trueArray); + Operand sampleWeight = tf.constant(this.sampleWeightArray); + FalseNegatives instance = new FalseNegatives<>(1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(labels, predictions, sampleWeight); + session.run(update); + Operand result = instance.result(); + + session.evaluate(5.0, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + FalseNegatives instance = + new FalseNegatives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java index 2584c7a3244..4131a1a0a49 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java @@ -23,6 +23,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class FalsePositivesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -46,7 +48,7 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); FalsePositives instance = new FalsePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -64,7 +66,7 @@ public void testWeighted() { Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); FalsePositives instance = new FalsePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -96,7 +98,7 @@ public void testUnweightedWithThresholds() { }); FalsePositives instance = new FalsePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -137,7 +139,7 @@ public void testWeightedWithThresholds() { }); FalsePositives instance = new FalsePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -145,4 +147,50 @@ public void testWeightedWithThresholds() { session.evaluate(expected, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + + Operand predictions = + tf.constant( + new float[][] { + {0.9f, 0.2f, 0.8f, 0.1f}, + {0.2f, 0.9f, 0.7f, 0.6f}, + {0.1f, 0.2f, 0.4f, 0.3f}, + {0f, 1f, 0.7f, 0.3f} + }); + Operand labels = + tf.constant( + new long[][] { + {0, 1, 1, 0}, + {1, 0, 0, 0}, + {0, 0, 0, 0}, + {1, 1, 1, 1} + }); + FalsePositives instance = + new FalsePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(labels, predictions, null); + session.run(update); + Operand result = instance.result(); + float[] expected = new float[] {7.f, 4.f, 2.f}; + session.evaluate(expected, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + FalsePositives instance = + new FalsePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java index 90531d21fde..c265a607aae 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class HingeTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -79,4 +81,39 @@ public void testWeighted() { session.evaluate(.49285714f, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Hinge instance = new Hinge<>("Hinge_testUnweighted", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = {0, 1, 0, 1, 0, 0, 1, 1}; + double[] predArray = {-0.3, 0.2, -0.1, 1.6, -0.25, -1., 0.5, 0.6}; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); + Op op = instance.updateState(labels, predictions, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(1.0125, total); + session.evaluate(2, count); + session.evaluate(.5062500, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Hinge instance = new Hinge<>("Hinge_testWeighted", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java index 267578a492c..2573c3f2b2a 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; +import static org.junit.jupiter.api.Assertions.assertThrows; + class KLDivergenceTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -80,4 +82,49 @@ public void testWeighted() { session.evaluate(0.872857, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + KLDivergence instance = + new KLDivergence<>("KLD_testWeighted", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + float[] trueArray = { + .5f, .8f, .12f, + .7f, .43f, .8f + }; + float[] predArray = { + .4f, .9f, .12f, + .36f, .3f, .4f + }; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); + + Operand sampleWeight = tf.constant(new double[][] {{1.2}, {3.4}}); + Op op = instance.updateState(labels, predictions, sampleWeight); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(4.015142, total); + session.evaluate(4.6, count); + session.evaluate(0.872857, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + KLDivergence instance = + new KLDivergence<>("KLD_testWeighted", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java index 1b5b8fb7d49..f6b855cf0cb 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class LogCoshErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -77,4 +79,43 @@ public void testWeighted() { session.evaluate(4.6, count); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + LogCoshError instance = new LogCoshError<>("testInitTF", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = {1, 9, 2, -5, -2, 6}; + float[] predArray = {4, 8, 12, 8, 1, 3}; + double[][] sampleArray = {{1.2}, {3.4}}; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); + Operand sampleWeight = tf.constant(sampleArray); + + Op op = instance.updateState(labels, predictions, sampleWeight); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(5.2178759, result); + session.evaluate(24.002228, total); + session.evaluate(4.6, count); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + LogCoshError instance = + new LogCoshError<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java index 984895f2ad9..d84d50e7845 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class MeanAbsoluteErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -113,4 +115,60 @@ public void testWeighted() { session.evaluate(0., instance.getCount()); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + MeanAbsoluteError instance = + new MeanAbsoluteError<>("MAE_testUnweighted", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + session.evaluate(0.0f, instance.getTotal()); + session.evaluate(0f, instance.getCount()); + session.evaluate(0.f, instance.getCount()); + + int[] trueArray = { + 0, 1, 0, 1, 0, + 0, 0, 1, 1, 1, + 1, 1, 1, 1, 0, + 0, 0, 0, 0, 1 + }; + float[] predictionArray = { + 0, 0, 1, 1, 0, + 1, 1, 1, 1, 1, + 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1 + }; + Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); + Operand yPrediction = + tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); + Op op = instance.updateState(yTrue, yPrediction, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(2.0, total); + session.evaluate(4, count); + session.evaluate(0.5, result); + + session.run(instance.resetStates()); + session.evaluate(0.0, instance.getTotal()); + session.evaluate(0, instance.getCount()); + session.evaluate(0., instance.getCount()); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanAbsoluteError instance = + new MeanAbsoluteError<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java index 0b9e7f6b538..4178f0d4131 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java @@ -26,6 +26,8 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + class MeanAbsolutePercentageErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -112,4 +114,59 @@ public void testWeighted() { session.evaluate(4.000000096112754E8, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + MeanAbsolutePercentageError instance = + new MeanAbsolutePercentageError<>("MAPE_testWeighted", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + session.evaluate(0.0, instance.getTotal()); + session.evaluate(0, instance.getCount()); + session.evaluate(0, instance.getCount()); + + long[] trueArray = { + 0, 1, 0, 1, 0, + 0, 0, 1, 1, 1, + 1, 1, 1, 1, 0, + 0, 0, 0, 0, 1 + }; + double[] predictionArray = { + 0, 0, 1, 1, 0, + 1, 1, 1, 1, 1, + 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1 + }; + Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); + Operand yPrediction = + tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); + + Operand sampleWeight = tf.constant(new double[] {1.f, 1.5f, 2.f, 2.5f}); + Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + + session.run(op); + + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(2.800000067278928E9, total); + session.evaluate(7, count); + session.evaluate(4.000000096112754E8, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanAbsolutePercentageError instance = + new MeanAbsolutePercentageError<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java index fc08455d1c7..adb239fd728 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java @@ -24,6 +24,8 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class MeanIoUTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final long numClasses = 2L; @@ -35,7 +37,7 @@ public void testUnweighted() { Operand predictions = tf.constant(new long[] {0, 1, 0, 1}); Operand labels = tf.constant(new long[] {0, 0, 1, 1}); MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -52,7 +54,7 @@ public void testWeighted() { Operand labels = tf.constant(new long[] {0, 0, 1, 1}); Operand sampleWeight = tf.constant(new float[] {0.2f, 0.3f, 0.4f, 0.1f}); MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -70,7 +72,7 @@ public void testMultiDimInput() { Operand labels = tf.constant(new long[][] {{0, 0}, {1, 1}}); Operand sampleWeight = tf.constant(new float[][] {{0.2f, 0.3f}, {0.4f, 0.1f}}); MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -84,7 +86,7 @@ public void testZeroValidEntries() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF().withSubScope("testZeroValidEntries"); MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Operand result = instance.result(); session.evaluate(0.0f, result); } @@ -98,7 +100,7 @@ public void testZeroAndNonZeroEntries() { Operand labels = tf.constant(new int[] {1}); MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -106,4 +108,34 @@ public void testZeroAndNonZeroEntries() { session.evaluate(expected_result, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Operand predictions = tf.constant(new float[] {1}); + Operand labels = tf.constant(new int[] {1}); + + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(labels, predictions, null); + session.run(update); + Operand result = instance.result(); + float expected_result = (0f + 1f / (1f + 1f - 1f)) / 1f; + session.evaluate(expected_result, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java index 0bb9392b8b0..add1a981fc6 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java @@ -17,11 +17,16 @@ import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; +import org.tensorflow.ndarray.DoubleNdArray; +import org.tensorflow.ndarray.FloatNdArray; +import org.tensorflow.ndarray.StdArrays; import org.tensorflow.op.Op; import org.tensorflow.op.Ops; import org.tensorflow.types.TFloat32; +import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.tensorflow.framework.utils.CastHelper.cast; public class MeanRelativeErrorTest { @@ -39,7 +44,7 @@ public void testUnweighted() { MeanRelativeError instance = new MeanRelativeError<>(tf, labels, 1001L, TFloat32.class); session.run(instance.resetStates()); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -64,7 +69,7 @@ public void testWeighted() { MeanRelativeError instance = new MeanRelativeError<>(tf, labels, 1001L, TFloat32.class); session.run(instance.resetStates()); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -88,7 +93,6 @@ public void testZeroNormalizer() { new MeanRelativeError<>( tf, cast(tf, tf.zerosLike(labels), TFloat32.class), 1001L, TFloat32.class); session.run(instance.resetStates()); - session.run(tf.init()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -97,4 +101,43 @@ public void testZeroNormalizer() { session.evaluate(expectedResult, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + + double[][] predArray = new double[][] {{2, 4, 6, 8}}; + double[][] trueArray = new double[][] {{1, 3, 2, 3}}; + Operand predictions = tf.constant(predArray); + Operand labels = tf.constant(trueArray); + + DoubleNdArray normalizer = StdArrays.ndCopyOf(trueArray); + + MeanRelativeError instance = + new MeanRelativeError<>("testInitTF", normalizer, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(labels, predictions, null); + session.run(update); + Operand result = instance.result(); + + double expected_result = 1.25; + session.evaluate(expected_result, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanRelativeError instance = + new MeanRelativeError<>( + "testIllegalState", new float[] {0, 0, 0}, 1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java index e42052a9ef1..d112a62303f 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java @@ -26,6 +26,8 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + class MeanSquaredErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -104,4 +106,55 @@ public void testWeighted() { session.evaluate(0.542857, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + MeanSquaredError instance = + new MeanSquaredError<>("testInitTF", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + session.evaluate(0.0, instance.getTotal()); + session.evaluate(0, instance.getCount()); + session.evaluate(0., instance.getCount()); + + int[] trueArray = { + 0, 1, 0, 1, 0, + 0, 0, 1, 1, 1, + 1, 1, 1, 1, 0, + 0, 0, 0, 0, 1 + }; + float[] predictionArray = { + 0, 0, 1, 1, 0, + 1, 1, 1, 1, 1, + 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1 + }; + Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); + Operand yPrediction = + tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); + Op op = instance.updateState(yTrue, yPrediction, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(2.0, total); + session.evaluate(4, count); + session.evaluate(0.5, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanSquaredError instance = + new MeanSquaredError<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java index e68d63b8778..56fee788344 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class MeanSquaredLogarithmicErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -103,4 +105,57 @@ public void testWeighted() { session.evaluate(0.26082, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + MeanSquaredLogarithmicError instance = + new MeanSquaredLogarithmicError<>("testInitTF", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + session.evaluate(0.0, instance.getTotal()); + session.evaluate(0, instance.getCount()); + session.evaluate(0., instance.getCount()); + + int[] trueArray = { + 0, 1, 0, 1, 0, + 0, 0, 1, 1, 1, + 1, 1, 1, 1, 0, + 0, 0, 0, 0, 1 + }; + double[] predictionArray = { + 0, 0, 1, 1, 0, + 1, 1, 1, 1, 1, + 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1 + }; + Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); + Operand yPrediction = + tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); + + Operand sampleWeight = tf.constant(new double[] {1., 1.5, 2., 2.5}); + Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(1.8257208, total); + session.evaluate(7, count); + session.evaluate(0.26082, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanSquaredLogarithmicError instance = + new MeanSquaredLogarithmicError<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java index ce473bbdf34..9da8c43b432 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java @@ -23,6 +23,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class MeanTensorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -32,7 +34,7 @@ public void testUnweighted() { Ops tf = session.getTF(); Operand values = tf.constant(new long[] {100, 40}); MeanTensor instance = new MeanTensor<>(tf, 1001L, TFloat64.class); - session.run(tf.init()); + session.run(instance.resetStates()); Op update = instance.updateState(values, null); session.run(update); Operand result = instance.result(); @@ -54,7 +56,7 @@ public void testWeighted() { Ops tf = session.getTF(); Operand values = tf.constant(new long[] {100, 30}); MeanTensor instance = new MeanTensor<>(tf, 1001L, TFloat64.class); - session.run(tf.init()); + session.run(instance.resetStates()); // check scalar weight Op update = instance.updateState(values, tf.constant(0.5f)); @@ -116,4 +118,39 @@ public void testWeightedExpand() { session.evaluate(tf.constant(new float[][] {{1f}, {0.2f}}), instance.getCount()); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Operand values = tf.constant(new long[] {100, 40}); + MeanTensor instance = new MeanTensor<>(1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(values, null); + session.run(update); + Operand result = instance.result(); + double[] expected_result = new double[] {100, 40}; + session.evaluate(expected_result, result); + + session.evaluate(expected_result, instance.getTotal()); + session.evaluate(new double[] {1, 1}, instance.getCount()); + + session.run(instance.resetStates()); + session.evaluate(new double[] {0, 0}, instance.getTotal()); + session.evaluate(new double[] {0, 0}, instance.getCount()); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + MeanTensor instance = new MeanTensor<>(1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java index 5631bac15ee..0ab957d1802 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class PoissonTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -75,4 +77,39 @@ public void testWeighted() { session.evaluate(-2.6727562f, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Poisson instance = new Poisson<>("testInitTF", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = {4, 8, 12, 8, 1, 3}; + float[] predArray = {1, 9, 2, 5, 2, 6}; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); + Op op = instance.updateState(labels, predictions, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(-6.6131644, total); + session.evaluate(2, count); + session.evaluate(-3.3065822, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Poisson instance = new Poisson<>("testIllegalState", 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java index a817a3dc5df..53e582924c6 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java @@ -176,4 +176,39 @@ public void testInvalidNumThresholds() { } }); } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + PrecisionAtRecall instance = new PrecisionAtRecall<>(0.4f, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + Operand predictions = + tf.constant( + new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); + Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); + Operand sampleWeight = tf.constant(new float[] {2, 2, 1, 1, 1, 1, 1, 2, 2, 2}); + + Op update = instance.updateState(labels, predictions, sampleWeight); + session.run(update); + + Operand precision = instance.result(); + + session.evaluate(2.f / 3.f, precision); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + PrecisionAtRecall instance = + new PrecisionAtRecall<>(0.4f, 1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java index cfe5b483e2b..e83bfb4ce0b 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java @@ -26,6 +26,8 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class PrecisionTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -330,4 +332,36 @@ public void testUnweightedTopKAndThreshold() { session.evaluate(0, instance.getFalsePositives()); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Precision instance = new Precision<>(0.7f, 2, null, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + Operand predictions = tf.constant(new float[][] {{0.2f, 0.8f, 0.6f, 0f, 0.2f}}); + Operand labels = tf.constant(new long[][] {{0, 1, 1, 0, 1}}); + Op update = instance.updateState(labels, predictions, null); + session.run(update); + Operand precision = instance.result(); + + session.evaluate(1, precision); + session.evaluate(1, instance.getTruePositives()); + session.evaluate(0, instance.getFalsePositives()); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Precision instance = new Precision<>(0.7f, 2, null, 1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java index bd3a5273668..42528f325fc 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java @@ -204,4 +204,37 @@ public void test_invalid_num_thresholds() { } }); } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + RecallAtPrecision instance = + new RecallAtPrecision<>(2.0f / 3f, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + Operand predictions = tf.constant(new float[] {0.1f, 0.2f, 0.3f, 0.9f}); + Operand labels = tf.constant(new long[] {1, 1, 0, 0}); + + Op update = instance.updateState(labels, predictions, null); + session.run(update); + + Operand precision = instance.result(); + // The highest possible precision is 1/2 which is below the required + session.evaluate(0f, precision); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + RecallAtPrecision instance = + new RecallAtPrecision<>(2.0f / 3f, 1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java index bd9fbb1ab66..8dd3198da9d 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java @@ -24,6 +24,8 @@ import java.util.Random; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class RecallTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final Random random = new Random(); @@ -330,4 +332,36 @@ public void testUnweightedTopKAndThreshold() { session.evaluate(3f, instance.getFalseNegatives()); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Recall instance = new Recall<>((String) null, 0.7f, 2, null, 1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + Operand predictions = tf.constant(new float[][] {{0.2f, 0.8f, 0.6f, 0f, 0.2f}}); + Operand labels = tf.constant(new float[][] {{1, 1, 1, 0, 1}}); + Op update = instance.updateState(labels, predictions, null); + session.run(update); + + session.evaluate(0.25f, instance.result()); + session.evaluate(1f, instance.getTruePositives()); + session.evaluate(3f, instance.getFalseNegatives()); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Recall instance = + new Recall<>((String) null, 0.7f, 2, null, 1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java index c9ced9f5946..6b4fe862285 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java @@ -23,6 +23,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class RootMeanSquaredErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -69,4 +71,39 @@ public void testWeighted() { session.evaluate(Math.sqrt(13), result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + RootMeanSquaredError instance = new RootMeanSquaredError<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + + Operand labels = tf.constant(new float[] {2, 4, 6}); + Operand predictions = tf.constant(new float[] {1, 3, 2}); + + Op op = instance.updateState(labels, predictions, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(18, total); + session.evaluate(3, count); + session.evaluate(Math.sqrt(6), result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + RootMeanSquaredError instance = + new RootMeanSquaredError<>(1001L, TFloat32.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java index a65dc3b53da..5661adc6fce 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java @@ -182,4 +182,40 @@ public void testInvalidNumThresholds() { } }); } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + SensitivityAtSpecificity instance = + new SensitivityAtSpecificity<>(0.4f, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Operand predictions = + tf.constant( + new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); + Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); + Operand sampleWeight = tf.constant(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}); + + Op update = instance.updateState(labels, predictions, sampleWeight); + session.run(update); + + Operand precision = instance.result(); + + session.evaluate(0.675, precision); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + SensitivityAtSpecificity instance = + new SensitivityAtSpecificity<>(0.4f, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java index 0aece8c8ac9..53a1b652515 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class SparseCategoricalCrossentropyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -126,4 +128,41 @@ public void testWeightedLogits() { session.evaluate(4.001232, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + SparseCategoricalCrossentropy instance = + new SparseCategoricalCrossentropy<>("testInitTF", true, -1, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = {1, 2}; + double[] logitsArray = {1, 9, 0, 1, 8, 1}; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2))); + Operand logits = tf.reshape(tf.constant(logitsArray), tf.constant(Shape.of(2, 3))); + Op op = instance.updateState(labels, logits, null); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(7.002277, total); + session.evaluate(2, count); + session.evaluate(3.501135, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + SparseCategoricalCrossentropy instance = + new SparseCategoricalCrossentropy<>("testIllegalState", true, -1, 1001L, TFloat64.class); + session.run(instance.resetStates()); + instance.result(); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java index ff5834eda8e..2020145c902 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java @@ -181,4 +181,40 @@ public void testInvalidNumThresholds() { } }); } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + SpecificityAtSensitivity instance = + new SpecificityAtSensitivity<>(0.4f, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Operand predictions = + tf.constant( + new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); + Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); + + Op update = instance.updateState(labels, predictions, null); + session.run(update); + + Operand precision = instance.result(); + + session.evaluate(0.6f, precision); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + SpecificityAtSensitivity instance = + new SpecificityAtSensitivity<>(0.4f, 1001L, TFloat64.class); + session.run(instance.resetStates()); + instance.result(); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java index 2c80b3451ad..f403d23cf61 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java @@ -25,6 +25,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; +import static org.junit.jupiter.api.Assertions.assertThrows; + class SquaredHingeTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -87,4 +89,48 @@ public void testWeighted() { session.evaluate(0.3467857, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + SquaredHinge instance = new SquaredHinge<>("testInitTF", 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + int[] trueArray = { + 0, 1, 0, 1, + 0, 0, 1, 1 + }; + double[] predArray = { + -0.3, 0.2, -0.1, 1.6, + -0.25, -1., 0.5, 0.6 + }; + Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); + Operand predictions = + tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); + + Operand sampleWeight = tf.constant(new double[] {1.5f, 2.f}); + Op op = instance.updateState(labels, predictions, sampleWeight); + session.run(op); + Variable total = instance.getTotal(); + Variable count = instance.getCount(); + Operand result = instance.result(); + session.evaluate(1.2137499, total); + session.evaluate(3.5, count); + session.evaluate(0.3467857, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + SquaredHinge instance = + new SquaredHinge<>("testIllegalState", 1001L, TFloat64.class); + instance.result(); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java index 941f882b8c8..dbcfac48f0c 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java @@ -23,6 +23,7 @@ import org.tensorflow.types.TFloat64; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class SumTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -110,4 +111,42 @@ public void testSumWithSampleWeight() { session.evaluate(63.75, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Sum instance = new Sum<>(1001L, TFloat32.class); + instance.init(tf); + session.run(instance.resetStates()); + assertEquals(TFloat32.class, instance.getResultType()); + session.evaluate(0f, instance.getTotal()); + + Op update = instance.updateState(tf.constant(100f), null); + session.run(update); + session.evaluate(100f, instance.result()); + session.evaluate(100f, instance.getTotal()); + + update = instance.updateState(tf.constant(new float[] {1, 5}), null); + session.run(update); + session.evaluate(106f, instance.result()); + session.evaluate(106f, instance.getTotal()); + + session.run(instance.resetStates()); + session.evaluate(0f, instance.getTotal()); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Sum instance = new Sum<>(1001L, TFloat32.class); + instance.result(); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java index 023796ba367..eb231b0267f 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java @@ -22,6 +22,8 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; +import static org.junit.jupiter.api.Assertions.assertThrows; + class TopKCategoricalAccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -100,4 +102,49 @@ public void testWeighted() { session.evaluate(1., instance.result()); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + TopKCategoricalAccuracy instance = + new TopKCategoricalAccuracy<>("testInitTF", 5, 1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + + Operand labels = + tf.constant( + new double[][] { + {1, 0, 2}, + {1, 0, 0}, + {0, 0, 1} + }); + Operand predictions = + tf.constant( + new double[][] { + {0f, 0.9f, 0.1f}, + {0f, 0.9f, 0.1f}, + {0f, 0.9f, 0.1f} + }); + + Operand sampleWeight = tf.constant(new double[] {1, 0, 1}); + + Op update = instance.updateState(labels, predictions, sampleWeight); + session.run(update); + session.evaluate(1., instance.result()); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + TopKCategoricalAccuracy instance = + new TopKCategoricalAccuracy<>("testIllegalState", 5, 1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java index 1a68c2ed8b8..4bd3b1b6cef 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java @@ -23,6 +23,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TrueNegativesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -46,7 +48,7 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); TrueNegatives instance = new TrueNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -64,7 +66,7 @@ public void testWeighted() { Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); TrueNegatives instance = new TrueNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -96,7 +98,7 @@ public void testUnweightedWithThresholds() { }); TrueNegatives instance = new TrueNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -130,7 +132,7 @@ public void testWeightedWithThresholds() { Operand sampleWeight = tf.constant(new double[][] {{0.0, 2.0, 3.0, 5.0}}); TrueNegatives instance = new TrueNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -138,4 +140,34 @@ public void testWeightedWithThresholds() { session.evaluate(expected, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + + Operand predictions = tf.constant(this.predArray); + Operand labels = tf.constant(this.trueArray); + TrueNegatives instance = new TrueNegatives<>(1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(labels, predictions, null); + session.run(update); + Operand result = instance.result(); + + session.evaluate(3.0, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + TrueNegatives instance = new TrueNegatives<>(1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java index c22c1245d97..b669574842d 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java @@ -23,6 +23,8 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TruePositivesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -46,7 +48,7 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); TruePositives instance = new TruePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -64,7 +66,7 @@ public void testWeighted() { Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); TruePositives instance = new TruePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -96,7 +98,7 @@ public void testUnweightedWithThresholds() { }); TruePositives instance = new TruePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, null); session.run(update); Operand result = instance.result(); @@ -130,7 +132,7 @@ public void testWeightedWithThresholds() { Operand sampleWeight = tf.constant(37.); TruePositives instance = new TruePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.getInitializer()); + session.run(instance.resetStates()); Op update = instance.updateState(labels, predictions, sampleWeight); session.run(update); Operand result = instance.result(); @@ -138,4 +140,34 @@ public void testWeightedWithThresholds() { session.evaluate(expected, result); } } + + @Test + public void testInitTF() { + try (TestSession session = TestSession.createTestSession(tfMode)) { + Ops tf = session.getTF(); + Operand predictions = tf.constant(this.predArray); + Operand labels = tf.constant(this.trueArray); + Operand sampleWeight = tf.constant(this.sampleWeightArray); + TruePositives instance = new TruePositives<>(1001L, TFloat64.class); + instance.init(tf); + session.run(instance.resetStates()); + Op update = instance.updateState(labels, predictions, sampleWeight); + session.run(update); + Operand result = instance.result(); + + session.evaluate(12.0, result); + } + } + + @Test + public void testIllegalState() { + assertThrows( + IllegalStateException.class, + () -> { + try (TestSession session = TestSession.createTestSession(tfMode)) { + TruePositives instance = new TruePositives<>(1001L, TFloat64.class); + session.run(instance.resetStates()); + } + }); + } } From fcc24a0d2bfe742ae244e947c3dab09277aa8c17 Mon Sep 17 00:00:00 2001 From: Jim Clarke Date: Tue, 15 Jun 2021 18:49:59 -0400 Subject: [PATCH 4/7] spotless reformats --- .../org/tensorflow/framework/metrics/AUC.java | 19 ++++++++--------- .../framework/metrics/Accuracy.java | 4 ++-- .../framework/metrics/BinaryAccuracy.java | 4 ++-- .../framework/metrics/BinaryCrossentropy.java | 4 ++-- .../metrics/CategoricalAccuracy.java | 4 ++-- .../metrics/CategoricalCrossentropy.java | 4 ++-- .../framework/metrics/CategoricalHinge.java | 4 ++-- .../framework/metrics/CosineSimilarity.java | 4 ++-- .../tensorflow/framework/metrics/Hinge.java | 4 ++-- .../framework/metrics/KLDivergence.java | 4 ++-- .../framework/metrics/LogCoshError.java | 4 ++-- .../framework/metrics/MeanAbsoluteError.java | 4 ++-- .../metrics/MeanAbsolutePercentageError.java | 4 ++-- .../tensorflow/framework/metrics/MeanIoU.java | 11 +++++----- .../framework/metrics/MeanRelativeError.java | 9 ++++---- .../framework/metrics/MeanSquaredError.java | 4 ++-- .../metrics/MeanSquaredLogarithmicError.java | 4 ++-- .../framework/metrics/MeanTensor.java | 9 ++++---- .../tensorflow/framework/metrics/Metric.java | 9 ++++---- .../tensorflow/framework/metrics/Metrics.java | 4 ++-- .../tensorflow/framework/metrics/Poisson.java | 4 ++-- .../framework/metrics/Precision.java | 15 +++++++------ .../framework/metrics/PrecisionAtRecall.java | 4 ++-- .../tensorflow/framework/metrics/Recall.java | 15 +++++++------ .../framework/metrics/RecallAtPrecision.java | 6 +++--- .../metrics/RootMeanSquaredError.java | 7 +++---- .../metrics/SensitivityAtSpecificity.java | 4 ++-- .../metrics/SparseCategoricalAccuracy.java | 7 +++---- .../SparseCategoricalCrossentropy.java | 4 ++-- .../SparseTopKCategoricalAccuracy.java | 4 ++-- .../metrics/SpecificityAtSensitivity.java | 4 ++-- .../framework/metrics/SquaredHinge.java | 4 ++-- .../metrics/TopKCategoricalAccuracy.java | 4 ++-- .../impl/ConfusionMatrixConditionCount.java | 11 +++++----- .../framework/metrics/impl/Initializable.java | 3 +-- .../metrics/impl/MeanMetricWrapper.java | 7 +++---- .../framework/metrics/impl/MetricsHelper.java | 21 +++++++++---------- .../framework/metrics/impl/Reduce.java | 9 ++++---- .../impl/SensitivitySpecificityBase.java | 15 +++++++------ .../framework/metrics/impl/SetsOps.java | 4 ++-- .../framework/metrics/impl/SymbolicShape.java | 5 ++--- .../metrics/impl/WeightsBroadcastOps.java | 11 +++++----- .../tensorflow/framework/metrics/AUCTest.java | 12 +++++------ .../framework/metrics/AccuracyTest.java | 4 ++-- .../framework/metrics/BinaryAccuracyTest.java | 4 ++-- .../metrics/BinaryCrossentropyTest.java | 4 ++-- .../metrics/CategoricalAccuracyTest.java | 4 ++-- .../metrics/CategoricalCrossentropyTest.java | 4 ++-- .../metrics/CategoricalHingeTest.java | 4 ++-- .../metrics/CosineSimilarityTest.java | 4 ++-- .../framework/metrics/FalseNegativesTest.java | 4 ++-- .../framework/metrics/FalsePositivesTest.java | 4 ++-- .../framework/metrics/HingeTest.java | 9 +++----- .../framework/metrics/KLDivergenceTest.java | 4 ++-- .../framework/metrics/LogCoshErrorTest.java | 4 ++-- .../metrics/MeanAbsoluteErrorTest.java | 4 ++-- .../MeanAbsolutePercentageErrorTest.java | 4 ++-- .../framework/metrics/MeanIoUTest.java | 4 ++-- .../metrics/MeanRelativeErrorTest.java | 7 +++---- .../metrics/MeanSquaredErrorTest.java | 4 ++-- .../MeanSquaredLogarithmicErrorTest.java | 4 ++-- .../framework/metrics/MeanTensorTest.java | 4 ++-- .../framework/metrics/PoissonTest.java | 4 ++-- .../metrics/PrecisionAtRecallTest.java | 9 ++++---- .../framework/metrics/PrecisionTest.java | 4 ++-- .../metrics/RecallAtPrecisionTest.java | 9 ++++---- .../framework/metrics/RecallTest.java | 7 +++---- .../metrics/RootMeanSquaredErrorTest.java | 4 ++-- .../metrics/SensitivityAtSpecificityTest.java | 9 ++++---- .../SparseCategoricalCrossentropyTest.java | 7 ++++--- .../metrics/SpecificityAtSensitivityTest.java | 9 ++++---- .../framework/metrics/SquaredHingeTest.java | 19 +++++------------ .../tensorflow/framework/metrics/SumTest.java | 6 +++--- .../metrics/TopKCategoricalAccuracyTest.java | 4 ++-- .../framework/metrics/TrueNegativesTest.java | 4 ++-- .../framework/metrics/TruePositivesTest.java | 4 ++-- 76 files changed, 223 insertions(+), 257 deletions(-) diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java index deb34696d1e..d94c9117132 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java @@ -14,6 +14,15 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; @@ -27,16 +36,6 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Metric that computes the approximate AUC (Area under the curve) via a Riemann sum. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java index fb30306b718..2e0d79aa47f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -23,8 +25,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Metric that calculates how often predictions equals labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java index d881dc5054b..3b072393468 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Metric that calculates how often predictions matches binary labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java index 12c740c7ddc..d575ca6bc83 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A Metric that computes the binary cross-entropy loss between true labels and predicted labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java index 50391c0fb7c..0d6ff86b41a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; @@ -22,8 +24,6 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Metric that calculates how often predictions matches one-hot labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java index 6309bb1dc71..27c281f5d51 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A Metric that computes the categorical cross-entropy loss between true labels and predicted * labels. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java index 9034320b57b..ed6bf3f1670 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A Metric that computes the categorical hinge loss metric between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java index 923231101a4..6cb6704966f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the cosine similarity metric between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java index 6685e79029c..41abecccd06 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the hinge loss metric between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java index 0d3a53f1288..d1e46d32e05 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the Kullback-Leibler divergence loss metric between labels and * predictions. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java index d075da82355..b5bb709ec9b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the logarithm of the hyperbolic cosine of the prediction error metric * between labels and predictions. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java index fbc51973f1e..8cdf60d4ffe 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the mean of absolute difference between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java index 28a9587cfae..e17eeba2e0f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the mean of absolute difference between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java index e74c01b116c..ed885f62623 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java @@ -14,6 +14,11 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Collections; +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.MetricsHelper; @@ -24,12 +29,6 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; -import java.util.Collections; -import java.util.List; - -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes the mean Intersection-Over-Union metric. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java index 6a577d1b38b..817b019c949 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.List; +import java.util.stream.IntStream; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -23,11 +27,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import java.util.List; -import java.util.stream.IntStream; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes the mean relative error by normalizing with the given values. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java index e94335ac596..b23636a3d75 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the mean of absolute difference between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java index 792c422f494..5a2c8526628 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the mean of absolute difference between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java index a8708bf95e2..1350a1e8bc9 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.losses.impl.LossTuple; @@ -26,11 +30,6 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.List; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Metric that computes the element-wise (weighted) mean of the given tensors. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java index 659a62fa979..7ef5bb6a8ee 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java @@ -14,17 +14,16 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.function.Consumer; import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.Initializable; import org.tensorflow.op.Op; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.function.Consumer; - /** * Base class for Metrics * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java index 7dfee081238..55602280cf5 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metrics.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.ndarray.Shape; import org.tensorflow.op.Ops; @@ -21,8 +23,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** Static methods for computing metrics. */ public class Metrics { diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java index cf04ffdc159..44ed5c4f0d5 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the poisson loss metric between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java index fc3fa611449..e62a4b74915 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java @@ -14,6 +14,13 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; @@ -25,14 +32,6 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes the precision of the predictions with respect to the labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java index c2be1bce511..2c3d24bb730 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes best precision where recall is >= specified value. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java index 0c28290a8b5..4117f8bef1a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java @@ -14,6 +14,13 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; @@ -25,14 +32,6 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes the recall of the predictions with respect to the labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java index d5d520ef219..20e70e48749 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java @@ -14,6 +14,9 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; @@ -21,9 +24,6 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes best recall where precision is >= specified value. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java index 1b66556744a..cd1a46e5c85 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java @@ -15,6 +15,9 @@ */ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -22,10 +25,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import java.util.List; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes root mean squared error metric between {@code labels} and {@code predictions} . * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java index 3594239c0fb..b855dc929c5 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes best sensitivity where sensitivity is >= specified value. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java index 58a5c15a5e7..6cfb3c47d62 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java @@ -14,6 +14,9 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Collections; import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; @@ -24,10 +27,6 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import java.util.Collections; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Calculates how often predictions matches integer labels. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java index be878296337..d66501408e3 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the sparse categorical cross-entropy loss between true labels and * predicted labels. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java index b6d25ff170a..023ac90656d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes how often integer targets are in the top `K` predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java index 88d128d024d..3255ba0224d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.SensitivitySpecificityBase; import org.tensorflow.op.Ops; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes best specificity where sensitivity is >= specified value. {@code Sensitivity} * measures the proportion of actual positives that are correctly identified as such {@code (tp / diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java index 5b070bd6b92..9337ab6f86e 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.losses.Losses; import org.tensorflow.framework.metrics.impl.LossMetric; @@ -21,8 +23,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A metric that computes the squared hinge loss metric between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java index ae1d6eaa7cb..c6d88d5f4f4 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.LossMetric; import org.tensorflow.framework.metrics.impl.MeanMetricWrapper; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Computes the poisson loss metric between labels and predictions. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java index f93baf9b89e..109a9168224 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java @@ -14,6 +14,11 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.Metric; @@ -24,12 +29,6 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Abstract base class that calculates the value of the given confusion matrix condition based on * labels and predictions. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java index 576f56c75da..1f2c63beae2 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Initializable.java @@ -14,9 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import org.tensorflow.op.Ops; - import java.util.function.Consumer; +import org.tensorflow.op.Ops; public interface Initializable { diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java index 1486e3ada49..ddc8f3e0945 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java @@ -14,6 +14,9 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.metrics.Mean; import org.tensorflow.framework.metrics.MetricReduction; @@ -21,10 +24,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; -import java.util.List; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * A class that bridges a stateless loss function with the {@link Mean} metric using a reduction of * {@link MetricReduction#WEIGHTED_MEAN}. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java index 58cf957e336..9c05ab543ab 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java @@ -14,6 +14,16 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -38,17 +48,6 @@ import org.tensorflow.types.family.TIntegral; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; - -import static org.tensorflow.framework.losses.impl.LossesHelper.allAxes; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * These are helper methods for Metrics and will be module private when Java modularity is applied * to TensorFlow Java. These methods should not be used outside of the metrics packages. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java index fe6ad0db11f..f6e8e11019f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.framework.losses.impl.LossTuple; import org.tensorflow.framework.losses.impl.LossesHelper; @@ -25,11 +29,6 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.List; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Encapsulates metrics that perform a reduce operation on the metric values. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java index 5184ef9a68b..b6bf397f4e7 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java @@ -1,5 +1,12 @@ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.tensorflow.Operand; import org.tensorflow.framework.initializers.Zeros; import org.tensorflow.framework.metrics.Metric; @@ -10,14 +17,6 @@ import org.tensorflow.op.core.Variable; import org.tensorflow.types.family.TNumber; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Abstract base class for computing sensitivity and specificity. * diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java index 0553b1edac7..dd77a1be4aa 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SetsOps.java @@ -14,14 +14,14 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.tensorflow.Operand; import org.tensorflow.op.Ops; import org.tensorflow.op.SparseOps; import org.tensorflow.op.sparse.DenseToDenseSetOperation; import org.tensorflow.types.family.TNumber; -import static org.tensorflow.framework.utils.CastHelper.cast; - /** Implementation of set operations */ public class SetsOps { diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java index 7c3fda07ea9..b8698ab197d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SymbolicShape.java @@ -14,12 +14,11 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; -import org.tensorflow.Operand; -import org.tensorflow.types.family.TNumber; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.tensorflow.Operand; +import org.tensorflow.types.family.TNumber; /** * A class that represents a Symbolic shape. diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java index 18b11700380..2df90a841ee 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/WeightsBroadcastOps.java @@ -14,6 +14,11 @@ =======================================================================*/ package org.tensorflow.framework.metrics.impl; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.tensorflow.Operand; import org.tensorflow.ndarray.Shape; import org.tensorflow.op.Op; @@ -23,12 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.tensorflow.framework.utils.CastHelper.cast; - /** * Weight broadcasting operations. * diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java index 3a506eec8d1..f5fc80c7702 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java @@ -14,6 +14,12 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,12 +29,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.tensorflow.framework.utils.CastHelper.cast; - public class AUCTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java index 41b84c15de2..2195f61d5b4 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class AccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java index 670e75bf943..f8d833eaa6a 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class BinaryAccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java index 661e05a0ca5..7fc3a7962c6 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class BinaryCrossentropyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java index 36d4ed9ce79..6fb55e41ca3 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class CategoricalAccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java index c3448e300f7..e5f4e12251f 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class CategoricalCrossentropyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java index 0b90ecb62ad..408a049d869 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class CategoricalHingeTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java index e0dd7990604..075898ab523 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class CosineSimilarityTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java index bfe8ee67bc6..916e4d12573 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,8 +25,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class FalseNegativesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java index 4131a1a0a49..a890d8cffdf 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,8 +25,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class FalsePositivesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java index c265a607aae..1b3c3c14834 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class HingeTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -62,10 +62,7 @@ public void testWeighted() { -1, 1, -1, 1, -1, -1, 1, 1 }; - float[] predArray = { - -0.3f, 0.2f, -0.1f, 1.6f, - -0.25f, -1.f, 0.5f, 0.6f - }; + float[] predArray = {-0.3f, 0.2f, -0.1f, 1.6f, -0.25f, -1.f, 0.5f, 0.6f}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java index 2573c3f2b2a..cdcbb4e8141 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; -import static org.junit.jupiter.api.Assertions.assertThrows; - class KLDivergenceTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java index f6b855cf0cb..3511d02ef05 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class LogCoshErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java index d84d50e7845..7fa6e84589e 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class MeanAbsoluteErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java index 4178f0d4131..0a55073e8cd 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -26,8 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - class MeanAbsolutePercentageErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java index adb239fd728..1ffe330d7d1 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,8 +26,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class MeanIoUTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final long numClasses = 2L; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java index add1a981fc6..744e20a36fa 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java @@ -14,11 +14,13 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.tensorflow.framework.utils.CastHelper.cast; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; import org.tensorflow.ndarray.DoubleNdArray; -import org.tensorflow.ndarray.FloatNdArray; import org.tensorflow.ndarray.StdArrays; import org.tensorflow.op.Op; import org.tensorflow.op.Ops; @@ -26,9 +28,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.tensorflow.framework.utils.CastHelper.cast; - public class MeanRelativeErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java index d112a62303f..62c66b587b3 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -26,8 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - class MeanSquaredErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java index 56fee788344..6177d9991ec 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class MeanSquaredLogarithmicErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java index 9da8c43b432..d60832f14f5 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,8 +25,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class MeanTensorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java index 0ab957d1802..01944ef18c4 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class PoissonTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java index 53e582924c6..7ee3dccbefd 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Random; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,11 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt64; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.tensorflow.framework.utils.CastHelper.cast; - public class PrecisionAtRecallTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final Random random = new Random(); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java index e83bfb4ce0b..a2272721993 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -26,8 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class PrecisionTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java index 42528f325fc..4c031eb7841 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Random; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -24,11 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt64; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.tensorflow.framework.utils.CastHelper.cast; - public class RecallAtPrecisionTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final Random random = new Random(); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java index 8dd3198da9d..a1a4662ed60 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java @@ -14,6 +14,9 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.Random; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -22,10 +25,6 @@ import org.tensorflow.op.Ops; import org.tensorflow.types.TFloat32; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertThrows; - public class RecallTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final Random random = new Random(); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java index 6b4fe862285..d3339e1cc63 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,8 +25,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class RootMeanSquaredErrorTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java index 5661adc6fce..de4cb6ee916 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Random; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,11 +29,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.tensorflow.framework.utils.CastHelper.cast; - public class SensitivityAtSpecificityTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final Random random = new Random(); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java index 53a1b652515..bf5eafeb8bc 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class SparseCategoricalCrossentropyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -159,7 +159,8 @@ public void testIllegalState() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { SparseCategoricalCrossentropy instance = - new SparseCategoricalCrossentropy<>("testIllegalState", true, -1, 1001L, TFloat64.class); + new SparseCategoricalCrossentropy<>( + "testIllegalState", true, -1, 1001L, TFloat64.class); session.run(instance.resetStates()); instance.result(); } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java index 2020145c902..c7a10b76e29 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java @@ -14,6 +14,10 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.tensorflow.framework.utils.CastHelper.cast; + +import java.util.Random; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -26,11 +30,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.tensorflow.framework.utils.CastHelper.cast; - public class SpecificityAtSensitivityTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; private final Random random = new Random(); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java index f403d23cf61..761d5705251 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -25,8 +27,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt32; -import static org.junit.jupiter.api.Assertions.assertThrows; - class SquaredHingeTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; @@ -41,10 +41,7 @@ public void testUnweighted() { 0, 1, 0, 1, 0, 0, 1, 1 }; - float[] predArray = { - -0.3f, 0.2f, -0.1f, 1.6f, - -0.25f, -1.f, 0.5f, 0.6f - }; + float[] predArray = {-0.3f, 0.2f, -0.1f, 1.6f, -0.25f, -1.f, 0.5f, 0.6f}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); @@ -70,10 +67,7 @@ public void testWeighted() { 0, 1, 0, 1, 0, 0, 1, 1 }; - double[] predArray = { - -0.3, 0.2, -0.1, 1.6, - -0.25, -1., 0.5, 0.6 - }; + double[] predArray = {-0.3, 0.2, -0.1, 1.6, -0.25, -1., 0.5, 0.6}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); @@ -101,10 +95,7 @@ public void testInitTF() { 0, 1, 0, 1, 0, 0, 1, 1 }; - double[] predArray = { - -0.3, 0.2, -0.1, 1.6, - -0.25, -1., 0.5, 0.6 - }; + double[] predArray = {-0.3, 0.2, -0.1, 1.6, -0.25, -1., 0.5, 0.6}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java index dbcfac48f0c..9451dce2845 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java @@ -14,6 +14,9 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -22,9 +25,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class SumTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java index eb231b0267f..94122efb8c8 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -22,8 +24,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; -import static org.junit.jupiter.api.Assertions.assertThrows; - class TopKCategoricalAccuracyTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java index 4bd3b1b6cef..825598e5c85 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,8 +25,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class TrueNegativesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java index b669574842d..de64f89fb36 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java @@ -14,6 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -23,8 +25,6 @@ import org.tensorflow.types.TFloat64; import org.tensorflow.types.TInt64; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class TruePositivesTest { private final TestSession.Mode tfMode = TestSession.Mode.GRAPH; From c9673754e012f9abed702161272a32713102de8a Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Tue, 15 Jun 2021 19:18:44 -0700 Subject: [PATCH 5/7] Use OP_NAME constant instead of hard coding (#328) --- .../tensorflow/op/audio/AudioSpectrogram.java | 2 +- .../org/tensorflow/op/audio/DecodeWav.java | 2 +- .../org/tensorflow/op/audio/EncodeWav.java | 2 +- .../java/org/tensorflow/op/audio/Mfcc.java | 2 +- .../org/tensorflow/op/bitwise/BitwiseAnd.java | 2 +- .../org/tensorflow/op/bitwise/BitwiseOr.java | 2 +- .../org/tensorflow/op/bitwise/BitwiseXor.java | 2 +- .../org/tensorflow/op/bitwise/Invert.java | 2 +- .../org/tensorflow/op/bitwise/LeftShift.java | 2 +- .../org/tensorflow/op/bitwise/RightShift.java | 2 +- .../op/cluster/KMC2ChainInitialization.java | 2 +- .../cluster/KmeansPlusPlusInitialization.java | 2 +- .../tensorflow/op/collective/AllReduce.java | 2 +- .../op/collective/BroadcastRecv.java | 2 +- .../op/collective/BroadcastSend.java | 2 +- .../org/tensorflow/op/collective/Gather.java | 2 +- .../tensorflow/op/collective/GatherV2.java | 2 +- .../org/tensorflow/op/collective/Reduce.java | 2 +- .../tensorflow/op/collective/ReduceV2.java | 2 +- .../java/org/tensorflow/op/core/Abort.java | 2 +- .../gen/java/org/tensorflow/op/core/All.java | 2 +- .../gen/java/org/tensorflow/op/core/Any.java | 2 +- .../org/tensorflow/op/core/AssertThat.java | 2 +- .../java/org/tensorflow/op/core/Assign.java | 2 +- .../org/tensorflow/op/core/AssignAdd.java | 2 +- .../op/core/AssignAddVariableOp.java | 2 +- .../org/tensorflow/op/core/AssignSub.java | 2 +- .../op/core/AssignSubVariableOp.java | 2 +- .../tensorflow/op/core/AssignVariableOp.java | 2 +- .../java/org/tensorflow/op/core/Barrier.java | 2 +- .../org/tensorflow/op/core/BarrierClose.java | 2 +- .../op/core/BarrierIncompleteSize.java | 2 +- .../tensorflow/op/core/BarrierInsertMany.java | 2 +- .../tensorflow/op/core/BarrierReadySize.java | 2 +- .../tensorflow/op/core/BarrierTakeMany.java | 2 +- .../java/org/tensorflow/op/core/Batch.java | 2 +- .../org/tensorflow/op/core/BatchToSpace.java | 2 +- .../tensorflow/op/core/BatchToSpaceNd.java | 2 +- .../java/org/tensorflow/op/core/Bitcast.java | 2 +- .../op/core/BroadcastDynamicShape.java | 2 +- .../op/core/BroadcastGradientArgs.java | 2 +- .../org/tensorflow/op/core/BroadcastTo.java | 2 +- .../org/tensorflow/op/core/Bucketize.java | 2 +- .../org/tensorflow/op/core/ClipByValue.java | 2 +- .../tensorflow/op/core/CollectiveGather.java | 2 +- .../java/org/tensorflow/op/core/Concat.java | 2 +- .../tensorflow/op/core/ConsumeMutexLock.java | 2 +- .../tensorflow/op/core/ControlTrigger.java | 2 +- .../gen/java/org/tensorflow/op/core/Copy.java | 2 +- .../java/org/tensorflow/op/core/CopyHost.java | 2 +- .../org/tensorflow/op/core/CountUpTo.java | 2 +- .../org/tensorflow/op/core/DecodeProto.java | 2 +- .../java/org/tensorflow/op/core/DeepCopy.java | 2 +- .../op/core/DeleteSessionTensor.java | 2 +- .../tensorflow/op/core/DestroyResourceOp.java | 2 +- .../op/core/DestroyTemporaryVariable.java | 2 +- .../org/tensorflow/op/core/DeviceIndex.java | 2 +- .../tensorflow/op/core/DummyMemoryCache.java | 2 +- .../tensorflow/op/core/DynamicPartition.java | 2 +- .../org/tensorflow/op/core/DynamicStitch.java | 2 +- .../org/tensorflow/op/core/EditDistance.java | 2 +- .../java/org/tensorflow/op/core/Empty.java | 2 +- .../tensorflow/op/core/EmptyTensorList.java | 2 +- .../tensorflow/op/core/EmptyTensorMap.java | 2 +- .../org/tensorflow/op/core/EncodeProto.java | 2 +- .../org/tensorflow/op/core/EnsureShape.java | 2 +- .../java/org/tensorflow/op/core/Enter.java | 2 +- .../gen/java/org/tensorflow/op/core/Exit.java | 2 +- .../org/tensorflow/op/core/ExpandDims.java | 2 +- .../op/core/ExtractVolumePatches.java | 2 +- .../gen/java/org/tensorflow/op/core/Fill.java | 2 +- .../org/tensorflow/op/core/Fingerprint.java | 2 +- .../java/org/tensorflow/op/core/Gather.java | 2 +- .../java/org/tensorflow/op/core/GatherNd.java | 2 +- .../tensorflow/op/core/GetSessionHandle.java | 2 +- .../tensorflow/op/core/GetSessionTensor.java | 2 +- .../tensorflow/op/core/GuaranteeConst.java | 2 +- .../org/tensorflow/op/core/HashTable.java | 2 +- .../op/core/HistogramFixedWidth.java | 2 +- .../java/org/tensorflow/op/core/Identity.java | 2 +- .../org/tensorflow/op/core/IdentityN.java | 2 +- .../tensorflow/op/core/ImmutableConst.java | 2 +- .../tensorflow/op/core/InitializeTable.java | 2 +- .../op/core/InitializeTableFromTextFile.java | 2 +- .../org/tensorflow/op/core/InplaceAdd.java | 2 +- .../org/tensorflow/op/core/InplaceSub.java | 2 +- .../org/tensorflow/op/core/InplaceUpdate.java | 2 +- .../op/core/IsVariableInitialized.java | 2 +- .../tensorflow/op/core/KthOrderStatistic.java | 2 +- .../java/org/tensorflow/op/core/LinSpace.java | 2 +- .../tensorflow/op/core/LookupTableExport.java | 2 +- .../tensorflow/op/core/LookupTableFind.java | 2 +- .../tensorflow/op/core/LookupTableImport.java | 2 +- .../tensorflow/op/core/LookupTableInsert.java | 2 +- .../tensorflow/op/core/LookupTableRemove.java | 2 +- .../tensorflow/op/core/LookupTableSize.java | 2 +- .../java/org/tensorflow/op/core/LoopCond.java | 2 +- .../org/tensorflow/op/core/LowerBound.java | 2 +- .../org/tensorflow/op/core/MakeUnique.java | 2 +- .../java/org/tensorflow/op/core/MapClear.java | 2 +- .../tensorflow/op/core/MapIncompleteSize.java | 2 +- .../java/org/tensorflow/op/core/MapPeek.java | 2 +- .../java/org/tensorflow/op/core/MapSize.java | 2 +- .../java/org/tensorflow/op/core/MapStage.java | 2 +- .../org/tensorflow/op/core/MapUnstage.java | 2 +- .../tensorflow/op/core/MapUnstageNoKey.java | 2 +- .../gen/java/org/tensorflow/op/core/Max.java | 2 +- .../java/org/tensorflow/op/core/Merge.java | 2 +- .../gen/java/org/tensorflow/op/core/Min.java | 2 +- .../org/tensorflow/op/core/MirrorPad.java | 2 +- .../org/tensorflow/op/core/MirrorPadGrad.java | 2 +- .../tensorflow/op/core/MlirPassthroughOp.java | 2 +- .../op/core/MutableDenseHashTable.java | 2 +- .../tensorflow/op/core/MutableHashTable.java | 2 +- .../op/core/MutableHashTableOfTensors.java | 2 +- .../java/org/tensorflow/op/core/Mutex.java | 2 +- .../org/tensorflow/op/core/MutexLock.java | 2 +- .../org/tensorflow/op/core/NcclAllReduce.java | 2 +- .../org/tensorflow/op/core/NcclBroadcast.java | 2 +- .../org/tensorflow/op/core/NcclReduce.java | 2 +- .../org/tensorflow/op/core/NextIteration.java | 2 +- .../gen/java/org/tensorflow/op/core/NoOp.java | 2 +- .../java/org/tensorflow/op/core/OneHot.java | 2 +- .../java/org/tensorflow/op/core/OnesLike.java | 2 +- .../tensorflow/op/core/OrderedMapClear.java | 2 +- .../op/core/OrderedMapIncompleteSize.java | 2 +- .../tensorflow/op/core/OrderedMapPeek.java | 2 +- .../tensorflow/op/core/OrderedMapSize.java | 2 +- .../tensorflow/op/core/OrderedMapStage.java | 2 +- .../tensorflow/op/core/OrderedMapUnstage.java | 2 +- .../op/core/OrderedMapUnstageNoKey.java | 2 +- .../gen/java/org/tensorflow/op/core/Pad.java | 2 +- .../tensorflow/op/core/ParallelConcat.java | 2 +- .../op/core/ParallelDynamicStitch.java | 2 +- .../org/tensorflow/op/core/Placeholder.java | 2 +- .../op/core/PlaceholderWithDefault.java | 2 +- .../java/org/tensorflow/op/core/Print.java | 2 +- .../gen/java/org/tensorflow/op/core/Prod.java | 2 +- .../tensorflow/op/core/QuantizedReshape.java | 2 +- .../java/org/tensorflow/op/core/Range.java | 2 +- .../gen/java/org/tensorflow/op/core/Rank.java | 2 +- .../tensorflow/op/core/ReadVariableOp.java | 2 +- .../gen/java/org/tensorflow/op/core/Recv.java | 2 +- .../org/tensorflow/op/core/ReduceAll.java | 2 +- .../org/tensorflow/op/core/ReduceAny.java | 2 +- .../org/tensorflow/op/core/ReduceMax.java | 2 +- .../org/tensorflow/op/core/ReduceMin.java | 2 +- .../org/tensorflow/op/core/ReduceProd.java | 2 +- .../org/tensorflow/op/core/ReduceSum.java | 2 +- .../java/org/tensorflow/op/core/RefEnter.java | 2 +- .../java/org/tensorflow/op/core/RefExit.java | 2 +- .../org/tensorflow/op/core/RefIdentity.java | 2 +- .../java/org/tensorflow/op/core/RefMerge.java | 2 +- .../tensorflow/op/core/RefNextIteration.java | 2 +- .../org/tensorflow/op/core/RefSelect.java | 2 +- .../org/tensorflow/op/core/RefSwitch.java | 2 +- .../java/org/tensorflow/op/core/Reshape.java | 2 +- .../tensorflow/op/core/ResourceCountUpTo.java | 2 +- .../tensorflow/op/core/ResourceGather.java | 2 +- .../tensorflow/op/core/ResourceGatherNd.java | 2 +- .../op/core/ResourceScatterAdd.java | 2 +- .../op/core/ResourceScatterDiv.java | 2 +- .../op/core/ResourceScatterMax.java | 2 +- .../op/core/ResourceScatterMin.java | 2 +- .../op/core/ResourceScatterMul.java | 2 +- .../op/core/ResourceScatterNdAdd.java | 2 +- .../op/core/ResourceScatterNdMax.java | 2 +- .../op/core/ResourceScatterNdMin.java | 2 +- .../op/core/ResourceScatterNdSub.java | 2 +- .../op/core/ResourceScatterNdUpdate.java | 2 +- .../op/core/ResourceScatterSub.java | 2 +- .../op/core/ResourceScatterUpdate.java | 2 +- .../op/core/ResourceStridedSliceAssign.java | 2 +- .../java/org/tensorflow/op/core/Reverse.java | 2 +- .../tensorflow/op/core/ReverseSequence.java | 2 +- .../gen/java/org/tensorflow/op/core/Roll.java | 2 +- .../org/tensorflow/op/core/ScatterAdd.java | 2 +- .../org/tensorflow/op/core/ScatterDiv.java | 2 +- .../org/tensorflow/op/core/ScatterMax.java | 2 +- .../org/tensorflow/op/core/ScatterMin.java | 2 +- .../org/tensorflow/op/core/ScatterMul.java | 2 +- .../org/tensorflow/op/core/ScatterNd.java | 2 +- .../org/tensorflow/op/core/ScatterNdAdd.java | 2 +- .../org/tensorflow/op/core/ScatterNdMax.java | 2 +- .../org/tensorflow/op/core/ScatterNdMin.java | 2 +- .../op/core/ScatterNdNonAliasingAdd.java | 2 +- .../org/tensorflow/op/core/ScatterNdSub.java | 2 +- .../tensorflow/op/core/ScatterNdUpdate.java | 2 +- .../org/tensorflow/op/core/ScatterSub.java | 2 +- .../org/tensorflow/op/core/ScatterUpdate.java | 2 +- .../java/org/tensorflow/op/core/Select.java | 2 +- .../gen/java/org/tensorflow/op/core/Send.java | 2 +- .../org/tensorflow/op/core/SetDiff1d.java | 2 +- .../java/org/tensorflow/op/core/SetSize.java | 2 +- .../java/org/tensorflow/op/core/Shape.java | 2 +- .../java/org/tensorflow/op/core/ShapeN.java | 2 +- .../gen/java/org/tensorflow/op/core/Size.java | 2 +- .../java/org/tensorflow/op/core/Skipgram.java | 2 +- .../java/org/tensorflow/op/core/Slice.java | 2 +- .../java/org/tensorflow/op/core/Snapshot.java | 2 +- .../tensorflow/op/core/SpaceToBatchNd.java | 2 +- .../java/org/tensorflow/op/core/Split.java | 2 +- .../java/org/tensorflow/op/core/SplitV.java | 2 +- .../java/org/tensorflow/op/core/Squeeze.java | 2 +- .../java/org/tensorflow/op/core/Stack.java | 2 +- .../java/org/tensorflow/op/core/Stage.java | 2 +- .../org/tensorflow/op/core/StageClear.java | 2 +- .../org/tensorflow/op/core/StagePeek.java | 2 +- .../org/tensorflow/op/core/StageSize.java | 2 +- .../org/tensorflow/op/core/StopGradient.java | 2 +- .../org/tensorflow/op/core/StridedSlice.java | 2 +- .../op/core/StridedSliceAssign.java | 2 +- .../tensorflow/op/core/StridedSliceGrad.java | 2 +- .../gen/java/org/tensorflow/op/core/Sum.java | 2 +- .../org/tensorflow/op/core/SwitchCond.java | 2 +- .../tensorflow/op/core/TemporaryVariable.java | 2 +- .../org/tensorflow/op/core/TensorArray.java | 2 +- .../tensorflow/op/core/TensorArrayClose.java | 2 +- .../tensorflow/op/core/TensorArrayConcat.java | 2 +- .../tensorflow/op/core/TensorArrayGather.java | 2 +- .../tensorflow/op/core/TensorArrayGrad.java | 2 +- .../op/core/TensorArrayGradWithShape.java | 2 +- .../tensorflow/op/core/TensorArrayPack.java | 2 +- .../tensorflow/op/core/TensorArrayRead.java | 2 +- .../op/core/TensorArrayScatter.java | 2 +- .../tensorflow/op/core/TensorArraySize.java | 2 +- .../tensorflow/op/core/TensorArraySplit.java | 2 +- .../tensorflow/op/core/TensorArrayUnpack.java | 2 +- .../tensorflow/op/core/TensorArrayWrite.java | 2 +- .../tensorflow/op/core/TensorListConcat.java | 2 +- .../op/core/TensorListConcatLists.java | 2 +- .../op/core/TensorListElementShape.java | 2 +- .../op/core/TensorListFromTensor.java | 2 +- .../tensorflow/op/core/TensorListGather.java | 2 +- .../tensorflow/op/core/TensorListGetItem.java | 2 +- .../tensorflow/op/core/TensorListLength.java | 2 +- .../tensorflow/op/core/TensorListPopBack.java | 2 +- .../op/core/TensorListPushBack.java | 2 +- .../op/core/TensorListPushBackBatch.java | 2 +- .../tensorflow/op/core/TensorListReserve.java | 2 +- .../tensorflow/op/core/TensorListResize.java | 2 +- .../tensorflow/op/core/TensorListScatter.java | 2 +- .../TensorListScatterIntoExistingList.java | 2 +- .../tensorflow/op/core/TensorListSetItem.java | 2 +- .../tensorflow/op/core/TensorListSplit.java | 2 +- .../tensorflow/op/core/TensorListStack.java | 2 +- .../tensorflow/op/core/TensorMapErase.java | 2 +- .../tensorflow/op/core/TensorMapHasKey.java | 2 +- .../tensorflow/op/core/TensorMapInsert.java | 2 +- .../tensorflow/op/core/TensorMapLookup.java | 2 +- .../org/tensorflow/op/core/TensorMapSize.java | 2 +- .../op/core/TensorMapStackKeys.java | 2 +- .../op/core/TensorScatterNdAdd.java | 2 +- .../op/core/TensorScatterNdMax.java | 2 +- .../op/core/TensorScatterNdMin.java | 2 +- .../op/core/TensorScatterNdSub.java | 2 +- .../op/core/TensorScatterNdUpdate.java | 2 +- .../op/core/TensorStridedSliceUpdate.java | 2 +- .../gen/java/org/tensorflow/op/core/Tile.java | 2 +- .../org/tensorflow/op/core/Timestamp.java | 2 +- .../org/tensorflow/op/core/TopKUnique.java | 2 +- .../tensorflow/op/core/TopKWithUnique.java | 2 +- .../java/org/tensorflow/op/core/Unbatch.java | 2 +- .../org/tensorflow/op/core/UnbatchGrad.java | 2 +- .../java/org/tensorflow/op/core/Unique.java | 2 +- .../tensorflow/op/core/UniqueWithCounts.java | 2 +- .../org/tensorflow/op/core/UnravelIndex.java | 2 +- .../java/org/tensorflow/op/core/Unstack.java | 2 +- .../java/org/tensorflow/op/core/Unstage.java | 2 +- .../org/tensorflow/op/core/UpperBound.java | 2 +- .../org/tensorflow/op/core/VarHandleOp.java | 2 +- .../op/core/VarIsInitializedOp.java | 2 +- .../java/org/tensorflow/op/core/Variable.java | 2 +- .../org/tensorflow/op/core/VariableShape.java | 2 +- .../java/org/tensorflow/op/core/Where.java | 2 +- .../org/tensorflow/op/core/XlaConvV2.java | 2 +- .../java/org/tensorflow/op/core/XlaDotV2.java | 2 +- .../op/core/XlaSetDynamicDimensionSize.java | 2 +- .../op/core/XlaSpmdFullToShardShape.java | 2 +- .../op/core/XlaSpmdShardToFullShape.java | 2 +- .../org/tensorflow/op/core/ZerosLike.java | 2 +- .../tensorflow/op/data/AnonymousIterator.java | 2 +- .../op/data/AnonymousMemoryCache.java | 2 +- .../op/data/AnonymousMultiDeviceIterator.java | 2 +- .../tensorflow/op/data/AssertNextDataset.java | 2 +- .../tensorflow/op/data/AutoShardDataset.java | 2 +- .../org/tensorflow/op/data/BatchDataset.java | 2 +- .../op/data/BytesProducedStatsDataset.java | 2 +- .../org/tensorflow/op/data/CSVDataset.java | 2 +- .../org/tensorflow/op/data/CSVDatasetV2.java | 2 +- .../org/tensorflow/op/data/CacheDataset.java | 2 +- .../tensorflow/op/data/CacheDatasetV2.java | 2 +- .../op/data/ChooseFastestDataset.java | 2 +- .../op/data/ConcatenateDataset.java | 2 +- .../op/data/DatasetCardinality.java | 2 +- .../tensorflow/op/data/DatasetFromGraph.java | 2 +- .../tensorflow/op/data/DatasetToGraph.java | 2 +- .../op/data/DatasetToSingleElement.java | 2 +- .../tensorflow/op/data/DatasetToTfRecord.java | 2 +- .../tensorflow/op/data/DeleteIterator.java | 2 +- .../tensorflow/op/data/DeleteMemoryCache.java | 2 +- .../op/data/DeleteMultiDeviceIterator.java | 2 +- .../op/data/DenseToSparseBatchDataset.java | 2 +- .../op/data/DeserializeIterator.java | 2 +- .../op/data/DirectedInterleaveDataset.java | 2 +- .../op/data/FilterByLastComponentDataset.java | 2 +- .../op/data/FixedLengthRecordDataset.java | 2 +- .../op/data/IgnoreErrorsDataset.java | 2 +- .../op/data/InitializeTableFromDataset.java | 2 +- .../java/org/tensorflow/op/data/Iterator.java | 2 +- .../op/data/IteratorFromStringHandle.java | 2 +- .../tensorflow/op/data/IteratorGetDevice.java | 2 +- .../tensorflow/op/data/IteratorGetNext.java | 2 +- .../op/data/IteratorGetNextAsOptional.java | 2 +- .../op/data/IteratorGetNextSync.java | 2 +- .../op/data/IteratorToStringHandle.java | 2 +- .../org/tensorflow/op/data/LMDBDataset.java | 2 +- .../op/data/LatencyStatsDataset.java | 2 +- .../org/tensorflow/op/data/LeakyReluGrad.java | 2 +- .../org/tensorflow/op/data/MakeIterator.java | 2 +- .../op/data/MatchingFilesDataset.java | 2 +- .../op/data/MaxIntraOpParallelismDataset.java | 2 +- .../org/tensorflow/op/data/ModelDataset.java | 2 +- .../op/data/MultiDeviceIterator.java | 2 +- .../MultiDeviceIteratorFromStringHandle.java | 2 +- .../MultiDeviceIteratorGetNextFromShard.java | 2 +- .../op/data/MultiDeviceIteratorInit.java | 2 +- .../MultiDeviceIteratorToStringHandle.java | 2 +- .../op/data/NonSerializableDataset.java | 2 +- .../tensorflow/op/data/OptimizeDataset.java | 2 +- .../tensorflow/op/data/OptimizeDatasetV2.java | 2 +- .../tensorflow/op/data/OptionalFromValue.java | 2 +- .../tensorflow/op/data/OptionalGetValue.java | 2 +- .../tensorflow/op/data/OptionalHasValue.java | 2 +- .../org/tensorflow/op/data/OptionalNone.java | 2 +- .../op/data/PaddedBatchDataset.java | 2 +- .../tensorflow/op/data/PrefetchDataset.java | 2 +- .../op/data/PrivateThreadPoolDataset.java | 2 +- .../org/tensorflow/op/data/RandomDataset.java | 2 +- .../org/tensorflow/op/data/RangeDataset.java | 2 +- .../tensorflow/op/data/RebatchDataset.java | 2 +- .../tensorflow/op/data/RebatchDatasetV2.java | 2 +- .../tensorflow/op/data/RegisterDataset.java | 2 +- .../org/tensorflow/op/data/RepeatDataset.java | 2 +- .../tensorflow/op/data/SamplingDataset.java | 2 +- .../tensorflow/op/data/SerializeIterator.java | 2 +- .../op/data/SetStatsAggregatorDataset.java | 2 +- .../org/tensorflow/op/data/ShardDataset.java | 2 +- .../op/data/ShuffleAndRepeatDataset.java | 2 +- .../tensorflow/op/data/ShuffleDataset.java | 2 +- .../org/tensorflow/op/data/SkipDataset.java | 2 +- .../org/tensorflow/op/data/SleepDataset.java | 2 +- .../op/data/SlidingWindowDataset.java | 2 +- .../op/data/SparseTensorSliceDataset.java | 2 +- .../org/tensorflow/op/data/SqlDataset.java | 2 +- .../op/data/StatsAggregatorHandle.java | 2 +- .../org/tensorflow/op/data/TakeDataset.java | 2 +- .../org/tensorflow/op/data/TensorDataset.java | 2 +- .../op/data/TensorSliceDataset.java | 2 +- .../tensorflow/op/data/TextLineDataset.java | 2 +- .../tensorflow/op/data/TfRecordDataset.java | 2 +- .../tensorflow/op/data/ThreadPoolDataset.java | 2 +- .../tensorflow/op/data/ThreadPoolHandle.java | 2 +- .../tensorflow/op/data/UnbatchDataset.java | 2 +- .../org/tensorflow/op/data/UniqueDataset.java | 2 +- .../op/data/UnwrapDatasetVariant.java | 2 +- .../org/tensorflow/op/data/WindowDataset.java | 2 +- .../op/data/WrapDatasetVariant.java | 2 +- .../org/tensorflow/op/data/ZipDataset.java | 2 +- .../AssertCardinalityDataset.java | 2 +- .../data/experimental/AssertNextDataset.java | 2 +- .../data/experimental/AutoShardDataset.java | 2 +- .../BytesProducedStatsDataset.java | 2 +- .../op/data/experimental/CSVDataset.java | 2 +- .../experimental/ChooseFastestDataset.java | 2 +- .../op/data/experimental/CompressElement.java | 2 +- .../data/experimental/DataServiceDataset.java | 2 +- .../data/experimental/DatasetCardinality.java | 2 +- .../data/experimental/DatasetToTFRecord.java | 2 +- .../DenseToSparseBatchDataset.java | 2 +- .../DirectedInterleaveDataset.java | 2 +- .../experimental/DummyIterationCounter.java | 2 +- .../experimental/IgnoreErrorsDataset.java | 2 +- .../data/experimental/IteratorGetDevice.java | 2 +- .../experimental/LatencyStatsDataset.java | 2 +- .../op/data/experimental/LmdbDataset.java | 2 +- .../experimental/MatchingFilesDataset.java | 2 +- .../MaxIntraOpParallelismDataset.java | 2 +- .../experimental/NonSerializableDataset.java | 2 +- .../experimental/ParseExampleDataset.java | 2 +- .../PrivateThreadPoolDataset.java | 2 +- .../op/data/experimental/RandomDataset.java | 2 +- .../op/data/experimental/RebatchDataset.java | 2 +- .../SetStatsAggregatorDataset.java | 2 +- .../op/data/experimental/SleepDataset.java | 2 +- .../experimental/SlidingWindowDataset.java | 2 +- .../op/data/experimental/SqlDataset.java | 2 +- .../experimental/StatsAggregatorHandle.java | 2 +- .../StatsAggregatorSetSummaryWriter.java | 2 +- .../experimental/StatsAggregatorSummary.java | 2 +- .../data/experimental/ThreadPoolDataset.java | 2 +- .../data/experimental/ThreadPoolHandle.java | 2 +- .../op/data/experimental/UnbatchDataset.java | 2 +- .../data/experimental/UncompressElement.java | 2 +- .../op/data/experimental/UniqueDataset.java | 2 +- .../op/debugging/CheckNumerics.java | 2 +- .../op/debugging/DebugGradientIdentity.java | 2 +- .../debugging/DebugGradientRefIdentity.java | 2 +- .../op/debugging/DebugIdentity.java | 2 +- .../op/debugging/DebugNanCount.java | 2 +- .../op/debugging/DebugNumericsSummary.java | 2 +- .../op/distribute/NcclAllReduce.java | 2 +- .../op/distribute/NcclBroadcast.java | 2 +- .../tensorflow/op/distribute/NcclReduce.java | 2 +- .../org/tensorflow/op/dtypes/AsString.java | 2 +- .../java/org/tensorflow/op/dtypes/Cast.java | 2 +- .../org/tensorflow/op/dtypes/Complex.java | 2 +- .../java/org/tensorflow/op/dtypes/ToBool.java | 2 +- .../estimator/BoostedTreesAggregateStats.java | 2 +- .../op/estimator/BoostedTreesBucketize.java | 2 +- ...BoostedTreesCalculateBestFeatureSplit.java | 2 +- ...ostedTreesCalculateBestFeatureSplitV2.java | 2 +- ...stedTreesCalculateBestGainsPerFeature.java | 2 +- .../op/estimator/BoostedTreesCenterBias.java | 2 +- .../estimator/BoostedTreesCreateEnsemble.java | 2 +- ...stedTreesCreateQuantileStreamResource.java | 2 +- .../BoostedTreesDeserializeEnsemble.java | 2 +- .../BoostedTreesEnsembleResourceHandleOp.java | 2 +- .../BoostedTreesExampleDebugOutputs.java | 2 +- .../BoostedTreesFlushQuantileSummaries.java | 2 +- .../BoostedTreesGetEnsembleStates.java | 2 +- .../BoostedTreesMakeQuantileSummaries.java | 2 +- .../BoostedTreesMakeStatsSummary.java | 2 +- .../op/estimator/BoostedTreesPredict.java | 2 +- ...eesQuantileStreamResourceAddSummaries.java | 2 +- ...reesQuantileStreamResourceDeserialize.java | 2 +- ...ostedTreesQuantileStreamResourceFlush.java | 2 +- ...tileStreamResourceGetBucketBoundaries.java | 2 +- ...edTreesQuantileStreamResourceHandleOp.java | 2 +- .../BoostedTreesSerializeEnsemble.java | 2 +- .../BoostedTreesSparseAggregateStats.java | 2 +- ...dTreesSparseCalculateBestFeatureSplit.java | 2 +- .../BoostedTreesTrainingPredict.java | 2 +- .../estimator/BoostedTreesUpdateEnsemble.java | 2 +- .../BoostedTreesUpdateEnsembleV2.java | 2 +- .../IsBoostedTreesEnsembleInitialized.java | 2 +- ...reesQuantileStreamResourceInitialized.java | 2 +- .../tensorflow/op/image/AdjustContrast.java | 2 +- .../org/tensorflow/op/image/AdjustHue.java | 2 +- .../tensorflow/op/image/AdjustSaturation.java | 2 +- .../op/image/CombinedNonMaxSuppression.java | 2 +- .../tensorflow/op/image/CropAndResize.java | 2 +- .../op/image/CropAndResizeGradBoxes.java | 2 +- .../op/image/CropAndResizeGradImage.java | 2 +- .../op/image/DecodeAndCropJpeg.java | 2 +- .../org/tensorflow/op/image/DecodeBmp.java | 2 +- .../org/tensorflow/op/image/DecodeGif.java | 2 +- .../org/tensorflow/op/image/DecodeImage.java | 2 +- .../org/tensorflow/op/image/DecodeJpeg.java | 2 +- .../org/tensorflow/op/image/DecodePng.java | 2 +- .../op/image/DrawBoundingBoxes.java | 2 +- .../org/tensorflow/op/image/EncodeJpeg.java | 2 +- .../op/image/EncodeJpegVariableQuality.java | 2 +- .../org/tensorflow/op/image/EncodePng.java | 2 +- .../tensorflow/op/image/ExtractGlimpse.java | 2 +- .../op/image/ExtractImagePatches.java | 2 +- .../tensorflow/op/image/ExtractJpegShape.java | 2 +- .../image/GenerateBoundingBoxProposals.java | 2 +- .../org/tensorflow/op/image/HsvToRgb.java | 2 +- .../op/image/ImageProjectiveTransformV2.java | 2 +- .../op/image/ImageProjectiveTransformV3.java | 2 +- .../tensorflow/op/image/NearestNeighbors.java | 2 +- .../op/image/NonMaxSuppression.java | 2 +- .../image/NonMaxSuppressionWithOverlaps.java | 2 +- .../op/image/QuantizedResizeBilinear.java | 2 +- .../org/tensorflow/op/image/RandomCrop.java | 2 +- .../org/tensorflow/op/image/ResizeArea.java | 2 +- .../tensorflow/op/image/ResizeBicubic.java | 2 +- .../op/image/ResizeBicubicGrad.java | 2 +- .../tensorflow/op/image/ResizeBilinear.java | 2 +- .../op/image/ResizeBilinearGrad.java | 2 +- .../op/image/ResizeNearestNeighbor.java | 2 +- .../op/image/ResizeNearestNeighborGrad.java | 2 +- .../org/tensorflow/op/image/RgbToHsv.java | 2 +- .../op/image/SampleDistortedBoundingBox.java | 2 +- .../op/image/ScaleAndTranslate.java | 2 +- .../op/image/ScaleAndTranslateGrad.java | 2 +- .../StatelessSampleDistortedBoundingBox.java | 2 +- .../org/tensorflow/op/io/DecodeBase64.java | 2 +- .../tensorflow/op/io/DecodeCompressed.java | 2 +- .../java/org/tensorflow/op/io/DecodeCsv.java | 2 +- .../tensorflow/op/io/DecodeJsonExample.java | 2 +- .../org/tensorflow/op/io/DecodePaddedRaw.java | 2 +- .../java/org/tensorflow/op/io/DecodeRaw.java | 2 +- .../op/io/DeserializeManySparse.java | 2 +- .../org/tensorflow/op/io/EncodeBase64.java | 2 +- .../java/org/tensorflow/op/io/FifoQueue.java | 2 +- .../op/io/FixedLengthRecordReader.java | 2 +- .../org/tensorflow/op/io/IdentityReader.java | 2 +- .../java/org/tensorflow/op/io/LmdbReader.java | 2 +- .../org/tensorflow/op/io/MatchingFiles.java | 2 +- .../tensorflow/op/io/PaddingFifoQueue.java | 2 +- .../org/tensorflow/op/io/ParseExample.java | 2 +- .../op/io/ParseSequenceExample.java | 2 +- .../tensorflow/op/io/ParseSingleExample.java | 2 +- .../op/io/ParseSingleSequenceExample.java | 2 +- .../org/tensorflow/op/io/ParseTensor.java | 2 +- .../org/tensorflow/op/io/PriorityQueue.java | 2 +- .../java/org/tensorflow/op/io/QueueClose.java | 2 +- .../org/tensorflow/op/io/QueueDequeue.java | 2 +- .../tensorflow/op/io/QueueDequeueMany.java | 2 +- .../tensorflow/op/io/QueueDequeueUpTo.java | 2 +- .../org/tensorflow/op/io/QueueEnqueue.java | 2 +- .../tensorflow/op/io/QueueEnqueueMany.java | 2 +- .../org/tensorflow/op/io/QueueIsClosed.java | 2 +- .../java/org/tensorflow/op/io/QueueSize.java | 2 +- .../tensorflow/op/io/RandomShuffleQueue.java | 2 +- .../java/org/tensorflow/op/io/ReadFile.java | 2 +- .../op/io/ReaderNumRecordsProduced.java | 2 +- .../op/io/ReaderNumWorkUnitsCompleted.java | 2 +- .../java/org/tensorflow/op/io/ReaderRead.java | 2 +- .../org/tensorflow/op/io/ReaderReadUpTo.java | 2 +- .../org/tensorflow/op/io/ReaderReset.java | 2 +- .../tensorflow/op/io/ReaderRestoreState.java | 2 +- .../op/io/ReaderSerializeState.java | 2 +- .../tensorflow/op/io/SerializeManySparse.java | 2 +- .../org/tensorflow/op/io/SerializeSparse.java | 2 +- .../org/tensorflow/op/io/SerializeTensor.java | 2 +- .../org/tensorflow/op/io/ShardedFilename.java | 2 +- .../org/tensorflow/op/io/ShardedFilespec.java | 2 +- .../org/tensorflow/op/io/TextLineReader.java | 2 +- .../org/tensorflow/op/io/TfRecordReader.java | 2 +- .../org/tensorflow/op/io/WholeFileReader.java | 2 +- .../java/org/tensorflow/op/io/WriteFile.java | 2 +- .../org/tensorflow/op/linalg/BandPart.java | 2 +- .../op/linalg/BandedTriangularSolve.java | 2 +- .../tensorflow/op/linalg/BatchCholesky.java | 2 +- .../op/linalg/BatchCholeskyGrad.java | 2 +- .../op/linalg/BatchMatrixBandPart.java | 2 +- .../op/linalg/BatchMatrixDeterminant.java | 2 +- .../tensorflow/op/linalg/BatchMatrixDiag.java | 2 +- .../op/linalg/BatchMatrixDiagPart.java | 2 +- .../op/linalg/BatchMatrixInverse.java | 2 +- .../op/linalg/BatchMatrixSetDiag.java | 2 +- .../op/linalg/BatchMatrixSolve.java | 2 +- .../op/linalg/BatchMatrixSolveLs.java | 2 +- .../op/linalg/BatchMatrixTriangularSolve.java | 2 +- .../op/linalg/BatchSelfAdjointEig.java | 2 +- .../org/tensorflow/op/linalg/BatchSvd.java | 2 +- .../org/tensorflow/op/linalg/Cholesky.java | 2 +- .../tensorflow/op/linalg/CholeskyGrad.java | 2 +- .../op/linalg/ConjugateTranspose.java | 2 +- .../java/org/tensorflow/op/linalg/Cross.java | 2 +- .../java/org/tensorflow/op/linalg/Det.java | 2 +- .../java/org/tensorflow/op/linalg/Eig.java | 2 +- .../java/org/tensorflow/op/linalg/Einsum.java | 2 +- .../tensorflow/op/linalg/EuclideanNorm.java | 2 +- .../java/org/tensorflow/op/linalg/Inv.java | 2 +- .../op/linalg/LoadAndRemapMatrix.java | 2 +- .../op/linalg/LogMatrixDeterminant.java | 2 +- .../gen/java/org/tensorflow/op/linalg/Lu.java | 2 +- .../java/org/tensorflow/op/linalg/MatMul.java | 2 +- .../org/tensorflow/op/linalg/MatrixDiag.java | 2 +- .../tensorflow/op/linalg/MatrixDiagPart.java | 2 +- .../op/linalg/MatrixDiagPartV3.java | 2 +- .../tensorflow/op/linalg/MatrixDiagV3.java | 2 +- .../tensorflow/op/linalg/MatrixLogarithm.java | 2 +- .../tensorflow/op/linalg/MatrixSetDiag.java | 2 +- .../tensorflow/op/linalg/MatrixSolveLs.java | 2 +- .../gen/java/org/tensorflow/op/linalg/Qr.java | 2 +- .../tensorflow/op/linalg/QuantizedMatMul.java | 2 +- .../op/linalg/QuantizedMatMulWithBias.java | 2 +- .../QuantizedMatMulWithBiasAndRelu.java | 2 +- ...zedMatMulWithBiasAndReluAndRequantize.java | 2 +- .../tensorflow/op/linalg/SelfAdjointEig.java | 2 +- .../java/org/tensorflow/op/linalg/Solve.java | 2 +- .../java/org/tensorflow/op/linalg/Sqrtm.java | 2 +- .../java/org/tensorflow/op/linalg/Svd.java | 2 +- .../org/tensorflow/op/linalg/TensorDiag.java | 2 +- .../tensorflow/op/linalg/TensorDiagPart.java | 2 +- .../org/tensorflow/op/linalg/Transpose.java | 2 +- .../tensorflow/op/linalg/TriangularSolve.java | 2 +- .../op/linalg/TridiagonalMatMul.java | 2 +- .../op/linalg/TridiagonalSolve.java | 2 +- .../sparse/CSRSparseMatrixComponents.java | 2 +- .../linalg/sparse/CSRSparseMatrixToDense.java | 2 +- .../sparse/CSRSparseMatrixToSparseTensor.java | 2 +- .../linalg/sparse/DenseToCSRSparseMatrix.java | 2 +- .../op/linalg/sparse/SparseMatrixAdd.java | 2 +- .../op/linalg/sparse/SparseMatrixMatMul.java | 2 +- .../op/linalg/sparse/SparseMatrixMul.java | 2 +- .../op/linalg/sparse/SparseMatrixNNZ.java | 2 +- .../sparse/SparseMatrixOrderingAMD.java | 2 +- .../op/linalg/sparse/SparseMatrixSoftmax.java | 2 +- .../sparse/SparseMatrixSoftmaxGrad.java | 2 +- .../sparse/SparseMatrixSparseCholesky.java | 2 +- .../sparse/SparseMatrixSparseMatMul.java | 2 +- .../linalg/sparse/SparseMatrixTranspose.java | 2 +- .../op/linalg/sparse/SparseMatrixZeros.java | 2 +- .../sparse/SparseTensorToCSRSparseMatrix.java | 2 +- .../gen/java/org/tensorflow/op/math/Abs.java | 2 +- .../org/tensorflow/op/math/AccumulateN.java | 2 +- .../gen/java/org/tensorflow/op/math/Acos.java | 2 +- .../java/org/tensorflow/op/math/Acosh.java | 2 +- .../gen/java/org/tensorflow/op/math/Add.java | 2 +- .../gen/java/org/tensorflow/op/math/AddN.java | 2 +- .../java/org/tensorflow/op/math/Angle.java | 2 +- .../tensorflow/op/math/ApproximateEqual.java | 2 +- .../java/org/tensorflow/op/math/ArgMax.java | 2 +- .../java/org/tensorflow/op/math/ArgMin.java | 2 +- .../gen/java/org/tensorflow/op/math/Asin.java | 2 +- .../java/org/tensorflow/op/math/Asinh.java | 2 +- .../gen/java/org/tensorflow/op/math/Atan.java | 2 +- .../java/org/tensorflow/op/math/Atan2.java | 2 +- .../java/org/tensorflow/op/math/Atanh.java | 2 +- .../java/org/tensorflow/op/math/BesselI0.java | 2 +- .../org/tensorflow/op/math/BesselI0e.java | 2 +- .../java/org/tensorflow/op/math/BesselI1.java | 2 +- .../org/tensorflow/op/math/BesselI1e.java | 2 +- .../java/org/tensorflow/op/math/Betainc.java | 2 +- .../java/org/tensorflow/op/math/Bincount.java | 2 +- .../gen/java/org/tensorflow/op/math/Ceil.java | 2 +- .../tensorflow/op/math/CompareAndBitpack.java | 2 +- .../org/tensorflow/op/math/ComplexAbs.java | 2 +- .../gen/java/org/tensorflow/op/math/Conj.java | 2 +- .../gen/java/org/tensorflow/op/math/Cos.java | 2 +- .../gen/java/org/tensorflow/op/math/Cosh.java | 2 +- .../java/org/tensorflow/op/math/Cumprod.java | 2 +- .../java/org/tensorflow/op/math/Cumsum.java | 2 +- .../op/math/CumulativeLogsumexp.java | 2 +- .../org/tensorflow/op/math/DenseBincount.java | 2 +- .../java/org/tensorflow/op/math/Digamma.java | 2 +- .../gen/java/org/tensorflow/op/math/Div.java | 2 +- .../java/org/tensorflow/op/math/DivNoNan.java | 2 +- .../java/org/tensorflow/op/math/Equal.java | 2 +- .../gen/java/org/tensorflow/op/math/Erf.java | 2 +- .../gen/java/org/tensorflow/op/math/Erfc.java | 2 +- .../gen/java/org/tensorflow/op/math/Exp.java | 2 +- .../java/org/tensorflow/op/math/Expm1.java | 2 +- .../gen/java/org/tensorflow/op/math/Fact.java | 2 +- .../java/org/tensorflow/op/math/Floor.java | 2 +- .../java/org/tensorflow/op/math/FloorDiv.java | 2 +- .../java/org/tensorflow/op/math/FloorMod.java | 2 +- .../java/org/tensorflow/op/math/Greater.java | 2 +- .../org/tensorflow/op/math/GreaterEqual.java | 2 +- .../java/org/tensorflow/op/math/Igamma.java | 2 +- .../org/tensorflow/op/math/IgammaGradA.java | 2 +- .../java/org/tensorflow/op/math/Igammac.java | 2 +- .../gen/java/org/tensorflow/op/math/Imag.java | 2 +- .../tensorflow/op/math/InvertPermutation.java | 2 +- .../java/org/tensorflow/op/math/IsFinite.java | 2 +- .../java/org/tensorflow/op/math/IsInf.java | 2 +- .../java/org/tensorflow/op/math/IsNan.java | 2 +- .../gen/java/org/tensorflow/op/math/Less.java | 2 +- .../org/tensorflow/op/math/LessEqual.java | 2 +- .../java/org/tensorflow/op/math/Lgamma.java | 2 +- .../gen/java/org/tensorflow/op/math/Log.java | 2 +- .../java/org/tensorflow/op/math/Log1p.java | 2 +- .../org/tensorflow/op/math/LogicalAnd.java | 2 +- .../org/tensorflow/op/math/LogicalNot.java | 2 +- .../org/tensorflow/op/math/LogicalOr.java | 2 +- .../java/org/tensorflow/op/math/Maximum.java | 2 +- .../gen/java/org/tensorflow/op/math/Mean.java | 2 +- .../java/org/tensorflow/op/math/Minimum.java | 2 +- .../gen/java/org/tensorflow/op/math/Mod.java | 2 +- .../gen/java/org/tensorflow/op/math/Mul.java | 2 +- .../java/org/tensorflow/op/math/MulNoNan.java | 2 +- .../java/org/tensorflow/op/math/Ndtri.java | 2 +- .../gen/java/org/tensorflow/op/math/Neg.java | 2 +- .../org/tensorflow/op/math/NextAfter.java | 2 +- .../java/org/tensorflow/op/math/NotEqual.java | 2 +- .../org/tensorflow/op/math/Polygamma.java | 2 +- .../tensorflow/op/math/PopulationCount.java | 2 +- .../gen/java/org/tensorflow/op/math/Pow.java | 2 +- .../org/tensorflow/op/math/QuantizedAdd.java | 2 +- .../org/tensorflow/op/math/QuantizedMul.java | 2 +- .../gen/java/org/tensorflow/op/math/Real.java | 2 +- .../java/org/tensorflow/op/math/RealDiv.java | 2 +- .../org/tensorflow/op/math/Reciprocal.java | 2 +- .../tensorflow/op/math/ReciprocalGrad.java | 2 +- .../math/RequantizationRangePerChannel.java | 2 +- .../op/math/RequantizePerChannel.java | 2 +- .../gen/java/org/tensorflow/op/math/Rint.java | 2 +- .../java/org/tensorflow/op/math/Round.java | 2 +- .../java/org/tensorflow/op/math/Rsqrt.java | 2 +- .../org/tensorflow/op/math/RsqrtGrad.java | 2 +- .../org/tensorflow/op/math/SegmentMax.java | 2 +- .../org/tensorflow/op/math/SegmentMean.java | 2 +- .../org/tensorflow/op/math/SegmentMin.java | 2 +- .../org/tensorflow/op/math/SegmentProd.java | 2 +- .../org/tensorflow/op/math/SegmentSum.java | 2 +- .../java/org/tensorflow/op/math/Sigmoid.java | 2 +- .../org/tensorflow/op/math/SigmoidGrad.java | 2 +- .../gen/java/org/tensorflow/op/math/Sign.java | 2 +- .../gen/java/org/tensorflow/op/math/Sin.java | 2 +- .../gen/java/org/tensorflow/op/math/Sinh.java | 2 +- .../org/tensorflow/op/math/SobolSample.java | 2 +- .../java/org/tensorflow/op/math/Softplus.java | 2 +- .../org/tensorflow/op/math/SoftplusGrad.java | 2 +- .../gen/java/org/tensorflow/op/math/Sqrt.java | 2 +- .../java/org/tensorflow/op/math/SqrtGrad.java | 2 +- .../java/org/tensorflow/op/math/Square.java | 2 +- .../tensorflow/op/math/SquaredDifference.java | 2 +- .../gen/java/org/tensorflow/op/math/Sub.java | 2 +- .../gen/java/org/tensorflow/op/math/Tan.java | 2 +- .../gen/java/org/tensorflow/op/math/Tanh.java | 2 +- .../java/org/tensorflow/op/math/TanhGrad.java | 2 +- .../org/tensorflow/op/math/TruncateDiv.java | 2 +- .../org/tensorflow/op/math/TruncateMod.java | 2 +- .../op/math/UnsortedSegmentMax.java | 2 +- .../op/math/UnsortedSegmentMin.java | 2 +- .../op/math/UnsortedSegmentProd.java | 2 +- .../op/math/UnsortedSegmentSum.java | 2 +- .../java/org/tensorflow/op/math/Xdivy.java | 2 +- .../java/org/tensorflow/op/math/Xlog1py.java | 2 +- .../java/org/tensorflow/op/math/Xlogy.java | 2 +- .../gen/java/org/tensorflow/op/math/Zeta.java | 2 +- .../java/org/tensorflow/op/math/erfinv.java | 2 +- .../tensorflow/op/math/special/BesselJ0.java | 2 +- .../tensorflow/op/math/special/BesselJ1.java | 2 +- .../tensorflow/op/math/special/BesselK0.java | 2 +- .../tensorflow/op/math/special/BesselK0e.java | 2 +- .../tensorflow/op/math/special/BesselK1.java | 2 +- .../tensorflow/op/math/special/BesselK1e.java | 2 +- .../tensorflow/op/math/special/BesselY0.java | 2 +- .../tensorflow/op/math/special/BesselY1.java | 2 +- .../org/tensorflow/op/math/special/Dawsn.java | 2 +- .../tensorflow/op/math/special/Expint.java | 2 +- .../op/math/special/FresnelCos.java | 2 +- .../op/math/special/FresnelSin.java | 2 +- .../tensorflow/op/math/special/Spence.java | 2 +- .../java/org/tensorflow/op/nn/AvgPool.java | 2 +- .../java/org/tensorflow/op/nn/AvgPool3d.java | 2 +- .../org/tensorflow/op/nn/AvgPool3dGrad.java | 2 +- .../org/tensorflow/op/nn/AvgPoolGrad.java | 2 +- .../nn/BatchNormWithGlobalNormalization.java | 2 +- .../BatchNormWithGlobalNormalizationGrad.java | 2 +- .../java/org/tensorflow/op/nn/BiasAdd.java | 2 +- .../org/tensorflow/op/nn/BiasAddGrad.java | 2 +- .../java/org/tensorflow/op/nn/BlockLSTM.java | 2 +- .../org/tensorflow/op/nn/BlockLSTMGrad.java | 2 +- .../java/org/tensorflow/op/nn/CTCLossV2.java | 2 +- .../op/nn/ComputeAccidentalHits.java | 2 +- .../gen/java/org/tensorflow/op/nn/Conv2d.java | 2 +- .../op/nn/Conv2dBackpropFilter.java | 2 +- .../tensorflow/op/nn/Conv2dBackpropInput.java | 2 +- .../gen/java/org/tensorflow/op/nn/Conv3d.java | 2 +- .../op/nn/Conv3dBackpropFilter.java | 2 +- .../tensorflow/op/nn/Conv3dBackpropInput.java | 2 +- .../op/nn/CtcBeamSearchDecoder.java | 2 +- .../tensorflow/op/nn/CtcGreedyDecoder.java | 2 +- .../java/org/tensorflow/op/nn/CtcLoss.java | 2 +- .../java/org/tensorflow/op/nn/CudnnRNN.java | 2 +- .../tensorflow/op/nn/CudnnRNNBackprop.java | 2 +- .../op/nn/CudnnRNNCanonicalToParams.java | 2 +- .../op/nn/CudnnRNNParamsToCanonical.java | 2 +- .../tensorflow/op/nn/CudnnRnnParamsSize.java | 2 +- .../tensorflow/op/nn/DataFormatDimMap.java | 2 +- .../op/nn/DataFormatVecPermute.java | 2 +- .../org/tensorflow/op/nn/DepthToSpace.java | 2 +- .../op/nn/DepthwiseConv2dNative.java | 2 +- .../DepthwiseConv2dNativeBackpropFilter.java | 2 +- .../DepthwiseConv2dNativeBackpropInput.java | 2 +- .../java/org/tensorflow/op/nn/Dilation2d.java | 2 +- .../op/nn/Dilation2dBackpropFilter.java | 2 +- .../op/nn/Dilation2dBackpropInput.java | 2 +- .../gen/java/org/tensorflow/op/nn/Elu.java | 2 +- .../java/org/tensorflow/op/nn/EluGrad.java | 2 +- .../op/nn/FixedUnigramCandidateSampler.java | 2 +- .../tensorflow/op/nn/FractionalAvgPool.java | 2 +- .../op/nn/FractionalAvgPoolGrad.java | 2 +- .../tensorflow/op/nn/FractionalMaxPool.java | 2 +- .../op/nn/FractionalMaxPoolGrad.java | 2 +- .../org/tensorflow/op/nn/FusedBatchNorm.java | 2 +- .../tensorflow/op/nn/FusedBatchNormGrad.java | 2 +- .../org/tensorflow/op/nn/FusedPadConv2d.java | 2 +- .../op/nn/FusedResizeAndPadConv2d.java | 2 +- .../org/tensorflow/op/nn/GRUBlockCell.java | 2 +- .../tensorflow/op/nn/GRUBlockCellGrad.java | 2 +- .../gen/java/org/tensorflow/op/nn/InTopK.java | 2 +- .../java/org/tensorflow/op/nn/InvGrad.java | 2 +- .../tensorflow/op/nn/IsotonicRegression.java | 2 +- .../gen/java/org/tensorflow/op/nn/L2Loss.java | 2 +- .../org/tensorflow/op/nn/LSTMBlockCell.java | 2 +- .../tensorflow/op/nn/LSTMBlockCellGrad.java | 2 +- .../java/org/tensorflow/op/nn/LeakyRelu.java | 2 +- .../op/nn/LearnedUnigramCandidateSampler.java | 2 +- .../op/nn/LocalResponseNormalization.java | 2 +- .../op/nn/LocalResponseNormalizationGrad.java | 2 +- .../java/org/tensorflow/op/nn/LogSoftmax.java | 2 +- .../java/org/tensorflow/op/nn/MaxPool.java | 2 +- .../java/org/tensorflow/op/nn/MaxPool3d.java | 2 +- .../org/tensorflow/op/nn/MaxPool3dGrad.java | 2 +- .../tensorflow/op/nn/MaxPool3dGradGrad.java | 2 +- .../org/tensorflow/op/nn/MaxPoolGrad.java | 2 +- .../org/tensorflow/op/nn/MaxPoolGradGrad.java | 2 +- .../op/nn/MaxPoolGradGradWithArgmax.java | 2 +- .../op/nn/MaxPoolGradWithArgmax.java | 2 +- .../tensorflow/op/nn/MaxPoolWithArgmax.java | 2 +- .../java/org/tensorflow/op/nn/NthElement.java | 2 +- .../tensorflow/op/nn/QuantizedAvgPool.java | 2 +- ...tizedBatchNormWithGlobalNormalization.java | 2 +- .../tensorflow/op/nn/QuantizedBiasAdd.java | 2 +- .../op/nn/QuantizedConv2DAndRelu.java | 2 +- .../QuantizedConv2DAndReluAndRequantize.java | 2 +- .../op/nn/QuantizedConv2DAndRequantize.java | 2 +- .../op/nn/QuantizedConv2DPerChannel.java | 2 +- .../op/nn/QuantizedConv2DWithBias.java | 2 +- .../op/nn/QuantizedConv2DWithBiasAndRelu.java | 2 +- ...zedConv2DWithBiasAndReluAndRequantize.java | 2 +- .../QuantizedConv2DWithBiasAndRequantize.java | 2 +- ...WithBiasSignedSumAndReluAndRequantize.java | 2 +- .../nn/QuantizedConv2DWithBiasSumAndRelu.java | 2 +- ...Conv2DWithBiasSumAndReluAndRequantize.java | 2 +- .../org/tensorflow/op/nn/QuantizedConv2d.java | 2 +- .../op/nn/QuantizedDepthwiseConv2D.java | 2 +- .../nn/QuantizedDepthwiseConv2DWithBias.java | 2 +- ...antizedDepthwiseConv2DWithBiasAndRelu.java | 2 +- ...iseConv2DWithBiasAndReluAndRequantize.java | 2 +- .../op/nn/QuantizedInstanceNorm.java | 2 +- .../tensorflow/op/nn/QuantizedMaxPool.java | 2 +- .../org/tensorflow/op/nn/QuantizedRelu.java | 2 +- .../org/tensorflow/op/nn/QuantizedRelu6.java | 2 +- .../org/tensorflow/op/nn/QuantizedReluX.java | 2 +- .../gen/java/org/tensorflow/op/nn/Relu.java | 2 +- .../gen/java/org/tensorflow/op/nn/Relu6.java | 2 +- .../java/org/tensorflow/op/nn/Relu6Grad.java | 2 +- .../java/org/tensorflow/op/nn/ReluGrad.java | 2 +- .../gen/java/org/tensorflow/op/nn/Selu.java | 2 +- .../java/org/tensorflow/op/nn/SeluGrad.java | 2 +- .../java/org/tensorflow/op/nn/Softmax.java | 2 +- .../java/org/tensorflow/op/nn/Softsign.java | 2 +- .../org/tensorflow/op/nn/SoftsignGrad.java | 2 +- .../org/tensorflow/op/nn/SpaceToBatch.java | 2 +- .../org/tensorflow/op/nn/SpaceToDepth.java | 2 +- .../gen/java/org/tensorflow/op/nn/TopK.java | 2 +- .../nn/raw/SoftmaxCrossEntropyWithLogits.java | 2 +- .../SparseSoftmaxCrossEntropyWithLogits.java | 2 +- .../op/quantization/Dequantize.java | 2 +- .../quantization/FakeQuantWithMinMaxArgs.java | 2 +- .../FakeQuantWithMinMaxArgsGradient.java | 2 +- .../quantization/FakeQuantWithMinMaxVars.java | 2 +- .../FakeQuantWithMinMaxVarsGradient.java | 2 +- .../FakeQuantWithMinMaxVarsPerChannel.java | 2 +- ...QuantWithMinMaxVarsPerChannelGradient.java | 2 +- .../tensorflow/op/quantization/Quantize.java | 2 +- .../quantization/QuantizeAndDequantize.java | 2 +- .../quantization/QuantizeAndDequantizeV3.java | 2 +- .../quantization/QuantizeAndDequantizeV4.java | 2 +- .../QuantizeAndDequantizeV4Grad.java | 2 +- .../QuantizeDownAndShrinkRange.java | 2 +- .../op/quantization/QuantizedConcat.java | 2 +- .../QuantizedMatMulWithBiasAndDequantize.java | 2 +- .../QuantizedMatMulWithBiasAndRequantize.java | 2 +- .../op/quantization/RequantizationRange.java | 2 +- .../op/quantization/Requantize.java | 2 +- .../tensorflow/op/ragged/RaggedBincount.java | 2 +- .../op/ragged/RaggedCountSparseOutput.java | 2 +- .../org/tensorflow/op/ragged/RaggedCross.java | 2 +- .../tensorflow/op/ragged/RaggedGather.java | 2 +- .../org/tensorflow/op/ragged/RaggedRange.java | 2 +- .../op/ragged/RaggedTensorFromVariant.java | 2 +- .../op/ragged/RaggedTensorToSparse.java | 2 +- .../op/ragged/RaggedTensorToTensor.java | 2 +- .../op/ragged/RaggedTensorToVariant.java | 2 +- .../ragged/RaggedTensorToVariantGradient.java | 2 +- .../op/random/AllCandidateSampler.java | 2 +- .../random/AnonymousRandomSeedGenerator.java | 2 +- .../op/random/AnonymousSeedGenerator.java | 2 +- .../op/random/DeleteRandomSeedGenerator.java | 2 +- .../op/random/DeleteSeedGenerator.java | 2 +- .../op/random/LogUniformCandidateSampler.java | 2 +- .../org/tensorflow/op/random/Multinomial.java | 2 +- .../op/random/NonDeterministicInts.java | 2 +- .../random/ParameterizedTruncatedNormal.java | 2 +- .../org/tensorflow/op/random/RandomGamma.java | 2 +- .../tensorflow/op/random/RandomGammaGrad.java | 2 +- .../tensorflow/op/random/RandomPoisson.java | 2 +- .../tensorflow/op/random/RandomShuffle.java | 2 +- .../op/random/RandomStandardNormal.java | 2 +- .../tensorflow/op/random/RandomUniform.java | 2 +- .../op/random/RandomUniformInt.java | 2 +- .../org/tensorflow/op/random/RecordInput.java | 2 +- .../tensorflow/op/random/RngReadAndSkip.java | 2 +- .../org/tensorflow/op/random/RngSkip.java | 2 +- .../op/random/StatefulRandomBinomial.java | 2 +- .../op/random/StatefulStandardNormal.java | 2 +- .../op/random/StatefulTruncatedNormal.java | 2 +- .../tensorflow/op/random/StatefulUniform.java | 2 +- .../op/random/StatefulUniformFullInt.java | 2 +- .../op/random/StatefulUniformInt.java | 2 +- .../op/random/StatelessMultinomial.java | 2 +- ...StatelessParameterizedTruncatedNormal.java | 2 +- .../op/random/StatelessRandomBinomial.java | 2 +- .../op/random/StatelessRandomGamma.java | 2 +- .../StatelessRandomGetKeyCounterAlg.java | 2 +- .../op/random/StatelessRandomNormal.java | 2 +- .../op/random/StatelessRandomNormalV2.java | 2 +- .../op/random/StatelessRandomPoisson.java | 2 +- .../op/random/StatelessRandomUniform.java | 2 +- .../random/StatelessRandomUniformFullInt.java | 2 +- .../StatelessRandomUniformFullIntV2.java | 2 +- .../op/random/StatelessRandomUniformInt.java | 2 +- .../random/StatelessRandomUniformIntV2.java | 2 +- .../op/random/StatelessRandomUniformV2.java | 2 +- .../op/random/StatelessTruncatedNormal.java | 2 +- .../op/random/StatelessTruncatedNormalV2.java | 2 +- .../tensorflow/op/random/TruncatedNormal.java | 2 +- .../op/random/UniformCandidateSampler.java | 2 +- .../experimental/DummySeedGenerator.java | 2 +- .../op/rawops/CollectiveBcastRecvV2.java | 2 +- .../op/rawops/CollectiveBcastSendV2.java | 2 +- .../op/rawops/DataServiceDatasetV2.java | 2 +- .../tensorflow/op/rawops/FinalizeDataset.java | 2 +- .../org/tensorflow/op/rawops/GetOptions.java | 2 +- ...EmbeddingFrequencyEstimatorParameters.java | 2 +- ...encyEstimatorParametersGradAccumDebug.java | 2 +- .../tensorflow/op/rawops/OptionsDataset.java | 2 +- .../op/rawops/ParallelBatchDataset.java | 2 +- ...EmbeddingFrequencyEstimatorParameters.java | 2 +- ...encyEstimatorParametersGradAccumDebug.java | 2 +- .../op/rawops/StatelessRandomGetAlg.java | 2 +- .../rawops/StatelessRandomGetKeyCounter.java | 2 +- .../java/org/tensorflow/op/risc/RiscAbs.java | 2 +- .../java/org/tensorflow/op/risc/RiscAdd.java | 2 +- .../op/risc/RiscBinaryArithmetic.java | 2 +- .../op/risc/RiscBinaryComparison.java | 2 +- .../org/tensorflow/op/risc/RiscBitcast.java | 2 +- .../org/tensorflow/op/risc/RiscBroadcast.java | 2 +- .../java/org/tensorflow/op/risc/RiscCast.java | 2 +- .../java/org/tensorflow/op/risc/RiscCeil.java | 2 +- .../org/tensorflow/op/risc/RiscCholesky.java | 2 +- .../org/tensorflow/op/risc/RiscConcat.java | 2 +- .../java/org/tensorflow/op/risc/RiscConv.java | 2 +- .../java/org/tensorflow/op/risc/RiscCos.java | 2 +- .../java/org/tensorflow/op/risc/RiscDiv.java | 2 +- .../java/org/tensorflow/op/risc/RiscDot.java | 2 +- .../java/org/tensorflow/op/risc/RiscExp.java | 2 +- .../java/org/tensorflow/op/risc/RiscFft.java | 2 +- .../org/tensorflow/op/risc/RiscFloor.java | 2 +- .../org/tensorflow/op/risc/RiscGather.java | 2 +- .../java/org/tensorflow/op/risc/RiscImag.java | 2 +- .../org/tensorflow/op/risc/RiscIsFinite.java | 2 +- .../java/org/tensorflow/op/risc/RiscLog.java | 2 +- .../tensorflow/op/risc/RiscLogicalAnd.java | 2 +- .../tensorflow/op/risc/RiscLogicalNot.java | 2 +- .../org/tensorflow/op/risc/RiscLogicalOr.java | 2 +- .../java/org/tensorflow/op/risc/RiscMax.java | 2 +- .../java/org/tensorflow/op/risc/RiscMin.java | 2 +- .../java/org/tensorflow/op/risc/RiscMul.java | 2 +- .../java/org/tensorflow/op/risc/RiscNeg.java | 2 +- .../java/org/tensorflow/op/risc/RiscPad.java | 2 +- .../java/org/tensorflow/op/risc/RiscPool.java | 2 +- .../java/org/tensorflow/op/risc/RiscPow.java | 2 +- .../tensorflow/op/risc/RiscRandomUniform.java | 2 +- .../java/org/tensorflow/op/risc/RiscReal.java | 2 +- .../org/tensorflow/op/risc/RiscReduce.java | 2 +- .../java/org/tensorflow/op/risc/RiscRem.java | 2 +- .../org/tensorflow/op/risc/RiscReshape.java | 2 +- .../org/tensorflow/op/risc/RiscReverse.java | 2 +- .../org/tensorflow/op/risc/RiscScatter.java | 2 +- .../org/tensorflow/op/risc/RiscShape.java | 2 +- .../java/org/tensorflow/op/risc/RiscSign.java | 2 +- .../org/tensorflow/op/risc/RiscSlice.java | 2 +- .../java/org/tensorflow/op/risc/RiscSort.java | 2 +- .../org/tensorflow/op/risc/RiscSqueeze.java | 2 +- .../java/org/tensorflow/op/risc/RiscSub.java | 2 +- .../org/tensorflow/op/risc/RiscTranspose.java | 2 +- .../op/risc/RiscTriangularSolve.java | 2 +- .../org/tensorflow/op/risc/RiscUnary.java | 2 +- .../org/tensorflow/op/signal/BatchFft.java | 2 +- .../org/tensorflow/op/signal/BatchFft2d.java | 2 +- .../org/tensorflow/op/signal/BatchFft3d.java | 2 +- .../org/tensorflow/op/signal/BatchIfft.java | 2 +- .../org/tensorflow/op/signal/BatchIfft2d.java | 2 +- .../org/tensorflow/op/signal/BatchIfft3d.java | 2 +- .../java/org/tensorflow/op/signal/Fft.java | 2 +- .../java/org/tensorflow/op/signal/Fft2d.java | 2 +- .../java/org/tensorflow/op/signal/Fft3d.java | 2 +- .../java/org/tensorflow/op/signal/Ifft.java | 2 +- .../java/org/tensorflow/op/signal/Ifft2d.java | 2 +- .../java/org/tensorflow/op/signal/Ifft3d.java | 2 +- .../java/org/tensorflow/op/signal/Irfft.java | 2 +- .../org/tensorflow/op/signal/Irfft2d.java | 2 +- .../org/tensorflow/op/signal/Irfft3d.java | 2 +- .../java/org/tensorflow/op/signal/Rfft.java | 2 +- .../java/org/tensorflow/op/signal/Rfft2d.java | 2 +- .../java/org/tensorflow/op/signal/Rfft3d.java | 2 +- .../op/sparse/AddManySparseToTensorsMap.java | 2 +- .../op/sparse/AddSparseToTensorsMap.java | 2 +- .../op/sparse/DenseCountSparseOutput.java | 2 +- .../op/sparse/DenseToDenseSetOperation.java | 2 +- .../op/sparse/DenseToSparseSetOperation.java | 2 +- .../op/sparse/DeserializeSparse.java | 2 +- .../SparseAccumulatorApplyGradient.java | 2 +- .../sparse/SparseAccumulatorTakeGradient.java | 2 +- .../org/tensorflow/op/sparse/SparseAdd.java | 2 +- .../tensorflow/op/sparse/SparseAddGrad.java | 2 +- .../tensorflow/op/sparse/SparseBincount.java | 2 +- .../tensorflow/op/sparse/SparseConcat.java | 2 +- .../sparse/SparseConditionalAccumulator.java | 2 +- .../op/sparse/SparseCountSparseOutput.java | 2 +- .../org/tensorflow/op/sparse/SparseCross.java | 2 +- .../op/sparse/SparseCrossHashed.java | 2 +- .../op/sparse/SparseDenseCwiseAdd.java | 2 +- .../op/sparse/SparseDenseCwiseDiv.java | 2 +- .../op/sparse/SparseDenseCwiseMul.java | 2 +- .../op/sparse/SparseFillEmptyRows.java | 2 +- .../op/sparse/SparseFillEmptyRowsGrad.java | 2 +- .../tensorflow/op/sparse/SparseMatMul.java | 2 +- .../tensorflow/op/sparse/SparseReduceMax.java | 2 +- .../op/sparse/SparseReduceMaxSparse.java | 2 +- .../tensorflow/op/sparse/SparseReduceSum.java | 2 +- .../op/sparse/SparseReduceSumSparse.java | 2 +- .../tensorflow/op/sparse/SparseReorder.java | 2 +- .../tensorflow/op/sparse/SparseReshape.java | 2 +- .../op/sparse/SparseSegmentMean.java | 2 +- .../op/sparse/SparseSegmentMeanGrad.java | 2 +- .../SparseSegmentMeanWithNumSegments.java | 2 +- .../op/sparse/SparseSegmentSqrtN.java | 2 +- .../op/sparse/SparseSegmentSqrtNGrad.java | 2 +- .../SparseSegmentSqrtNWithNumSegments.java | 2 +- .../op/sparse/SparseSegmentSum.java | 2 +- .../SparseSegmentSumWithNumSegments.java | 2 +- .../org/tensorflow/op/sparse/SparseSlice.java | 2 +- .../tensorflow/op/sparse/SparseSliceGrad.java | 2 +- .../tensorflow/op/sparse/SparseSoftmax.java | 2 +- .../op/sparse/SparseSparseMaximum.java | 2 +- .../op/sparse/SparseSparseMinimum.java | 2 +- .../org/tensorflow/op/sparse/SparseSplit.java | 2 +- .../op/sparse/SparseTensorDenseAdd.java | 2 +- .../op/sparse/SparseTensorDenseMatMul.java | 2 +- .../tensorflow/op/sparse/SparseToDense.java | 2 +- .../op/sparse/SparseToSparseSetOperation.java | 2 +- .../sparse/TakeManySparseFromTensorsMap.java | 2 +- .../java/org/tensorflow/op/strings/Join.java | 2 +- .../java/org/tensorflow/op/strings/Lower.java | 2 +- .../org/tensorflow/op/strings/ReduceJoin.java | 2 +- .../tensorflow/op/strings/RegexFullMatch.java | 2 +- .../tensorflow/op/strings/RegexReplace.java | 2 +- .../op/strings/StaticRegexFullMatch.java | 2 +- .../op/strings/StaticRegexReplace.java | 2 +- .../tensorflow/op/strings/StringFormat.java | 2 +- .../tensorflow/op/strings/StringLength.java | 2 +- .../tensorflow/op/strings/StringNGrams.java | 2 +- .../tensorflow/op/strings/StringSplit.java | 2 +- .../java/org/tensorflow/op/strings/Strip.java | 2 +- .../org/tensorflow/op/strings/Substr.java | 2 +- .../tensorflow/op/strings/ToHashBucket.java | 2 +- .../op/strings/ToHashBucketFast.java | 2 +- .../op/strings/ToHashBucketStrong.java | 2 +- .../org/tensorflow/op/strings/ToNumber.java | 2 +- .../tensorflow/op/strings/UnicodeDecode.java | 2 +- .../op/strings/UnicodeDecodeWithOffsets.java | 2 +- .../tensorflow/op/strings/UnicodeEncode.java | 2 +- .../tensorflow/op/strings/UnicodeScript.java | 2 +- .../op/strings/UnicodeTranscode.java | 2 +- .../op/strings/UnsortedSegmentJoin.java | 2 +- .../java/org/tensorflow/op/strings/Upper.java | 2 +- .../tensorflow/op/summary/AudioSummary.java | 2 +- .../op/summary/CloseSummaryWriter.java | 2 +- .../op/summary/CreateSummaryDbWriter.java | 2 +- .../op/summary/CreateSummaryFileWriter.java | 2 +- .../op/summary/FlushSummaryWriter.java | 2 +- .../op/summary/HistogramSummary.java | 2 +- .../tensorflow/op/summary/ImageSummary.java | 2 +- .../tensorflow/op/summary/ImportEvent.java | 2 +- .../tensorflow/op/summary/MergeSummary.java | 2 +- .../tensorflow/op/summary/ScalarSummary.java | 2 +- .../op/summary/StatsAggregatorSummary.java | 2 +- .../tensorflow/op/summary/SummaryWriter.java | 2 +- .../tensorflow/op/summary/TensorSummary.java | 2 +- .../op/summary/WriteAudioSummary.java | 2 +- .../op/summary/WriteGraphSummary.java | 2 +- .../op/summary/WriteHistogramSummary.java | 2 +- .../op/summary/WriteImageSummary.java | 2 +- .../op/summary/WriteRawProtoSummary.java | 2 +- .../op/summary/WriteScalarSummary.java | 2 +- .../tensorflow/op/summary/WriteSummary.java | 2 +- .../java/org/tensorflow/op/tpu/AllToAll.java | 2 +- .../tensorflow/op/tpu/CollectivePermute.java | 2 +- .../tensorflow/op/tpu/CompilationResult.java | 2 +- .../op/tpu/CompileSucceededAssert.java | 2 +- .../op/tpu/ConfigureDistributedTPU.java | 2 +- .../op/tpu/ConfigureTPUEmbedding.java | 2 +- .../tensorflow/op/tpu/CrossReplicaSum.java | 2 +- .../op/tpu/EmbeddingActivations.java | 2 +- .../tpu/EnqueueTPUEmbeddingIntegerBatch.java | 2 +- .../EnqueueTPUEmbeddingRaggedTensorBatch.java | 2 +- .../tpu/EnqueueTPUEmbeddingSparseBatch.java | 2 +- .../EnqueueTPUEmbeddingSparseTensorBatch.java | 2 +- .../java/org/tensorflow/op/tpu/Execute.java | 2 +- .../op/tpu/ExecuteAndUpdateVariables.java | 2 +- .../org/tensorflow/op/tpu/InfeedDequeue.java | 2 +- .../tensorflow/op/tpu/InfeedDequeueTuple.java | 2 +- .../org/tensorflow/op/tpu/InfeedEnqueue.java | 2 +- .../tpu/InfeedEnqueuePrelinearizedBuffer.java | 2 +- .../tensorflow/op/tpu/InfeedEnqueueTuple.java | 2 +- .../tpu/LoadTPUEmbeddingADAMParameters.java | 2 +- ...EmbeddingADAMParametersGradAccumDebug.java | 2 +- .../LoadTPUEmbeddingAdadeltaParameters.java | 2 +- ...ddingAdadeltaParametersGradAccumDebug.java | 2 +- .../LoadTPUEmbeddingAdagradParameters.java | 2 +- ...eddingAdagradParametersGradAccumDebug.java | 2 +- ...TPUEmbeddingCenteredRMSPropParameters.java | 2 +- .../tpu/LoadTPUEmbeddingFTRLParameters.java | 2 +- ...EmbeddingFTRLParametersGradAccumDebug.java | 2 +- ...TPUEmbeddingMDLAdagradLightParameters.java | 2 +- .../LoadTPUEmbeddingMomentumParameters.java | 2 +- ...ddingMomentumParametersGradAccumDebug.java | 2 +- ...TPUEmbeddingProximalAdagradParameters.java | 2 +- ...oximalAdagradParametersGradAccumDebug.java | 2 +- ...oadTPUEmbeddingProximalYogiParameters.java | 2 +- ...gProximalYogiParametersGradAccumDebug.java | 2 +- .../LoadTPUEmbeddingRMSPropParameters.java | 2 +- ...eddingRMSPropParametersGradAccumDebug.java | 2 +- ...ngStochasticGradientDescentParameters.java | 2 +- ...adientDescentParametersGradAccumDebug.java | 2 +- .../tensorflow/op/tpu/OrdinalSelector.java | 2 +- .../org/tensorflow/op/tpu/OutfeedDequeue.java | 2 +- .../op/tpu/OutfeedDequeueTuple.java | 2 +- .../op/tpu/OutfeedDequeueTupleV2.java | 2 +- .../tensorflow/op/tpu/OutfeedDequeueV2.java | 2 +- .../org/tensorflow/op/tpu/OutfeedEnqueue.java | 2 +- .../op/tpu/OutfeedEnqueueTuple.java | 2 +- .../tensorflow/op/tpu/PartitionedInput.java | 2 +- .../tensorflow/op/tpu/PartitionedOutput.java | 2 +- .../org/tensorflow/op/tpu/Prelinearize.java | 2 +- .../tensorflow/op/tpu/PrelinearizeTuple.java | 2 +- .../op/tpu/RecvTPUEmbeddingActivations.java | 2 +- .../tensorflow/op/tpu/ReplicateMetadata.java | 2 +- .../tensorflow/op/tpu/ReplicatedInput.java | 2 +- .../tensorflow/op/tpu/ReplicatedOutput.java | 2 +- .../RetrieveTPUEmbeddingADAMParameters.java | 2 +- ...EmbeddingADAMParametersGradAccumDebug.java | 2 +- ...etrieveTPUEmbeddingAdadeltaParameters.java | 2 +- ...ddingAdadeltaParametersGradAccumDebug.java | 2 +- ...RetrieveTPUEmbeddingAdagradParameters.java | 2 +- ...eddingAdagradParametersGradAccumDebug.java | 2 +- ...TPUEmbeddingCenteredRMSPropParameters.java | 2 +- .../RetrieveTPUEmbeddingFTRLParameters.java | 2 +- ...EmbeddingFTRLParametersGradAccumDebug.java | 2 +- ...TPUEmbeddingMDLAdagradLightParameters.java | 2 +- ...etrieveTPUEmbeddingMomentumParameters.java | 2 +- ...ddingMomentumParametersGradAccumDebug.java | 2 +- ...TPUEmbeddingProximalAdagradParameters.java | 2 +- ...oximalAdagradParametersGradAccumDebug.java | 2 +- ...eveTPUEmbeddingProximalYogiParameters.java | 2 +- ...gProximalYogiParametersGradAccumDebug.java | 2 +- ...RetrieveTPUEmbeddingRMSPropParameters.java | 2 +- ...eddingRMSPropParametersGradAccumDebug.java | 2 +- ...ngStochasticGradientDescentParameters.java | 2 +- ...adientDescentParametersGradAccumDebug.java | 2 +- .../op/tpu/SendTPUEmbeddingGradients.java | 2 +- .../op/tpu/ShutdownDistributedTPU.java | 2 +- .../op/tpu/TPUCompilationResult.java | 2 +- .../op/tpu/TPUEmbeddingActivations.java | 2 +- .../op/tpu/TPUReplicateMetadata.java | 2 +- .../tensorflow/op/tpu/TPUReplicatedInput.java | 2 +- .../op/tpu/TPUReplicatedOutput.java | 2 +- .../op/tpu/TPUReshardVariables.java | 2 +- .../tensorflow/op/tpu/WorkerHeartbeat.java | 2 +- .../op/train/AccumulatorApplyGradient.java | 2 +- .../op/train/AccumulatorNumAccumulated.java | 2 +- .../op/train/AccumulatorSetGlobalStep.java | 2 +- .../op/train/AccumulatorTakeGradient.java | 2 +- .../org/tensorflow/op/train/ApplyAdaMax.java | 2 +- .../tensorflow/op/train/ApplyAdadelta.java | 2 +- .../org/tensorflow/op/train/ApplyAdagrad.java | 2 +- .../tensorflow/op/train/ApplyAdagradDa.java | 2 +- .../tensorflow/op/train/ApplyAdagradV2.java | 2 +- .../org/tensorflow/op/train/ApplyAdam.java | 2 +- .../org/tensorflow/op/train/ApplyAddSign.java | 2 +- .../op/train/ApplyCenteredRmsProp.java | 2 +- .../org/tensorflow/op/train/ApplyFtrl.java | 2 +- .../op/train/ApplyGradientDescent.java | 2 +- .../tensorflow/op/train/ApplyMomentum.java | 2 +- .../tensorflow/op/train/ApplyPowerSign.java | 2 +- .../op/train/ApplyProximalAdagrad.java | 2 +- .../train/ApplyProximalGradientDescent.java | 2 +- .../org/tensorflow/op/train/ApplyRmsProp.java | 2 +- .../org/tensorflow/op/train/BatchMatMul.java | 2 +- .../tensorflow/op/train/ComputeBatchSize.java | 2 +- .../op/train/ConditionalAccumulator.java | 2 +- .../op/train/GenerateVocabRemapping.java | 2 +- .../op/train/MergeV2Checkpoints.java | 2 +- .../org/tensorflow/op/train/NegTrain.java | 2 +- .../tensorflow/op/train/PreventGradient.java | 2 +- .../ResourceAccumulatorApplyGradient.java | 2 +- .../ResourceAccumulatorNumAccumulated.java | 2 +- .../ResourceAccumulatorSetGlobalStep.java | 2 +- .../ResourceAccumulatorTakeGradient.java | 2 +- .../op/train/ResourceApplyAdaMax.java | 2 +- .../op/train/ResourceApplyAdadelta.java | 2 +- .../op/train/ResourceApplyAdagrad.java | 2 +- .../op/train/ResourceApplyAdagradDa.java | 2 +- .../op/train/ResourceApplyAdam.java | 2 +- .../train/ResourceApplyAdamWithAmsgrad.java | 2 +- .../op/train/ResourceApplyAddSign.java | 2 +- .../train/ResourceApplyCenteredRmsProp.java | 2 +- .../op/train/ResourceApplyFtrl.java | 2 +- .../train/ResourceApplyGradientDescent.java | 2 +- .../op/train/ResourceApplyKerasMomentum.java | 2 +- .../op/train/ResourceApplyMomentum.java | 2 +- .../op/train/ResourceApplyPowerSign.java | 2 +- .../train/ResourceApplyProximalAdagrad.java | 2 +- .../ResourceApplyProximalGradientDescent.java | 2 +- .../op/train/ResourceApplyRmsProp.java | 2 +- .../train/ResourceConditionalAccumulator.java | 2 +- .../op/train/ResourceSparseApplyAdadelta.java | 2 +- .../op/train/ResourceSparseApplyAdagrad.java | 2 +- .../train/ResourceSparseApplyAdagradDa.java | 2 +- .../train/ResourceSparseApplyAdagradV2.java | 2 +- .../ResourceSparseApplyCenteredRmsProp.java | 2 +- .../op/train/ResourceSparseApplyFtrl.java | 2 +- .../ResourceSparseApplyKerasMomentum.java | 2 +- .../op/train/ResourceSparseApplyMomentum.java | 2 +- .../ResourceSparseApplyProximalAdagrad.java | 2 +- ...rceSparseApplyProximalGradientDescent.java | 2 +- .../op/train/ResourceSparseApplyRmsProp.java | 2 +- .../java/org/tensorflow/op/train/Restore.java | 2 +- .../org/tensorflow/op/train/RestoreSlice.java | 2 +- .../java/org/tensorflow/op/train/Save.java | 2 +- .../org/tensorflow/op/train/SaveSlices.java | 2 +- .../org/tensorflow/op/train/SdcaFprint.java | 2 +- .../tensorflow/op/train/SdcaOptimizer.java | 2 +- .../org/tensorflow/op/train/SdcaShrinkL1.java | 2 +- .../op/train/SparseApplyAdadelta.java | 2 +- .../op/train/SparseApplyAdagrad.java | 2 +- .../op/train/SparseApplyAdagradDa.java | 2 +- .../op/train/SparseApplyCenteredRmsProp.java | 2 +- .../tensorflow/op/train/SparseApplyFtrl.java | 2 +- .../op/train/SparseApplyMomentum.java | 2 +- .../op/train/SparseApplyProximalAdagrad.java | 2 +- .../SparseApplyProximalGradientDescent.java | 2 +- .../op/train/SparseApplyRmsProp.java | 2 +- .../org/tensorflow/op/train/TileGrad.java | 2 +- .../tensorflow/op/xla/BroadcastHelper.java | 2 +- .../org/tensorflow/op/xla/ClusterOutput.java | 2 +- .../gen/java/org/tensorflow/op/xla/Conv.java | 2 +- .../org/tensorflow/op/xla/Dequantize.java | 2 +- .../gen/java/org/tensorflow/op/xla/Dot.java | 2 +- .../org/tensorflow/op/xla/DynamicSlice.java | 2 +- .../tensorflow/op/xla/DynamicUpdateSlice.java | 2 +- .../java/org/tensorflow/op/xla/Einsum.java | 2 +- .../java/org/tensorflow/op/xla/Gather.java | 2 +- .../org/tensorflow/op/xla/KeyValueSort.java | 2 +- .../gen/java/org/tensorflow/op/xla/Pad.java | 2 +- .../gen/java/org/tensorflow/op/xla/Recv.java | 2 +- .../java/org/tensorflow/op/xla/ReplicaId.java | 2 +- .../org/tensorflow/op/xla/SelfAdjointEig.java | 2 +- .../gen/java/org/tensorflow/op/xla/Send.java | 2 +- .../java/org/tensorflow/op/xla/Sharding.java | 2 +- .../gen/java/org/tensorflow/op/xla/Sort.java | 2 +- .../gen/java/org/tensorflow/op/xla/Svd.java | 2 +- .../tensorflow/op/xla/XlaRecvFromHost.java | 2 +- .../org/tensorflow/op/xla/XlaSendToHost.java | 2 +- .../org/tensorflow/op/xla/XlaSetBound.java | 2 +- .../op/generator/ClassGenerator.java | 364 +++++++++--------- 1259 files changed, 1447 insertions(+), 1433 deletions(-) diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java index def97e77e47..953453ab63b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java @@ -84,7 +84,7 @@ private AudioSpectrogram(Operation operation) { ) public static AudioSpectrogram create(Scope scope, Operand input, Long windowSize, Long stride, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AudioSpectrogram", scope.makeOpName("AudioSpectrogram")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AudioSpectrogram")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("window_size", windowSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java index 2d69fa63df2..7c52e765255 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java @@ -75,7 +75,7 @@ private DecodeWav(Operation operation) { describeByClass = true ) public static DecodeWav create(Scope scope, Operand contents, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeWav", scope.makeOpName("DecodeWav")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeWav")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java index 4eca7ec84fd..33007a9dd56 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java @@ -67,7 +67,7 @@ private EncodeWav(Operation operation) { describeByClass = true ) public static EncodeWav create(Scope scope, Operand audio, Operand sampleRate) { - OperationBuilder opBuilder = scope.env().opBuilder("EncodeWav", scope.makeOpName("EncodeWav")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeWav")); opBuilder.addInput(audio.asOutput()); opBuilder.addInput(sampleRate.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java index 22ae99ad3c8..7ed896394aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java @@ -69,7 +69,7 @@ private Mfcc(Operation operation) { ) public static Mfcc create(Scope scope, Operand spectrogram, Operand sampleRate, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Mfcc", scope.makeOpName("Mfcc")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mfcc")); opBuilder.addInput(spectrogram.asOutput()); opBuilder.addInput(sampleRate.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java index 4cfde6b7c7a..130d6f5179b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java @@ -79,7 +79,7 @@ private BitwiseAnd(Operation operation) { describeByClass = true ) public static BitwiseAnd create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("BitwiseAnd", scope.makeOpName("BitwiseAnd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BitwiseAnd")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java index d8d0eb67edf..ce511138fd1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java @@ -79,7 +79,7 @@ private BitwiseOr(Operation operation) { describeByClass = true ) public static BitwiseOr create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("BitwiseOr", scope.makeOpName("BitwiseOr")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BitwiseOr")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java index 6749b9427dd..cd843a187b3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java @@ -79,7 +79,7 @@ private BitwiseXor(Operation operation) { describeByClass = true ) public static BitwiseXor create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("BitwiseXor", scope.makeOpName("BitwiseXor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BitwiseXor")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java index f3e64ead598..5b6c115c237 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java @@ -99,7 +99,7 @@ private Invert(Operation operation) { describeByClass = true ) public static Invert create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Invert", scope.makeOpName("Invert")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Invert")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Invert<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java index ad6bfc18f5c..6bc1d9e6db5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java @@ -90,7 +90,7 @@ private LeftShift(Operation operation) { describeByClass = true ) public static LeftShift create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("LeftShift", scope.makeOpName("LeftShift")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LeftShift")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java index 5660c65ea14..54e2d7ad3c6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java @@ -92,7 +92,7 @@ private RightShift(Operation operation) { describeByClass = true ) public static RightShift create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RightShift", scope.makeOpName("RightShift")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RightShift")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java index b8cf65899ca..420db07958b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java @@ -62,7 +62,7 @@ private KMC2ChainInitialization(Operation operation) { ) public static KMC2ChainInitialization create(Scope scope, Operand distances, Operand seed) { - OperationBuilder opBuilder = scope.env().opBuilder("KMC2ChainInitialization", scope.makeOpName("KMC2ChainInitialization")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KMC2ChainInitialization")); opBuilder.addInput(distances.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java index 79ebec34735..4bb144c3006 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java @@ -66,7 +66,7 @@ private KmeansPlusPlusInitialization(Operation operation) { ) public static KmeansPlusPlusInitialization create(Scope scope, Operand points, Operand numToSample, Operand seed, Operand numRetriesPerSample) { - OperationBuilder opBuilder = scope.env().opBuilder("KmeansPlusPlusInitialization", scope.makeOpName("KmeansPlusPlusInitialization")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KmeansPlusPlusInitialization")); opBuilder.addInput(points.asOutput()); opBuilder.addInput(numToSample.asOutput()); opBuilder.addInput(seed.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java index f6eef64971b..e3c2b791e16 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java @@ -71,7 +71,7 @@ private AllReduce(Operation operation) { public static AllReduce create(Scope scope, Operand input, Long groupSize, Long groupKey, Long instanceKey, String mergeOp, String finalOp, List subdivOffsets, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveReduce", scope.makeOpName("AllReduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AllReduce")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("group_size", groupSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java index 94999f5884f..922b66c56d5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java @@ -65,7 +65,7 @@ private BroadcastRecv(Operation operation) { ) public static BroadcastRecv create(Scope scope, Class T, Long groupSize, Long groupKey, Long instanceKey, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveBcastRecv", scope.makeOpName("BroadcastRecv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastRecv")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("T", Operands.toDataType(T)); opBuilder.setAttr("group_size", groupSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java index f2290763758..784246929ab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java @@ -64,7 +64,7 @@ private BroadcastSend(Operation operation) { ) public static BroadcastSend create(Scope scope, Operand input, Long groupSize, Long groupKey, Long instanceKey, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveBcastSend", scope.makeOpName("BroadcastSend")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastSend")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("group_size", groupSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java index 8d8f7cc3cbb..3acd91096b2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Gather.java @@ -64,7 +64,7 @@ private Gather(Operation operation) { ) public static Gather create(Scope scope, Operand input, Long groupSize, Long groupKey, Long instanceKey, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveGather", scope.makeOpName("Gather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Gather")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("group_size", groupSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java index 346216e935b..abc7d8728d3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/GatherV2.java @@ -67,7 +67,7 @@ private GatherV2(Operation operation) { public static GatherV2 create(Scope scope, Operand input, Operand groupSize, Operand groupKey, Operand instanceKey, Iterable> orderingToken, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveGatherV2", scope.makeOpName("GatherV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GatherV2")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(groupSize.asOutput()); opBuilder.addInput(groupKey.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java index ea031c4e91d..62d913030c1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/Reduce.java @@ -68,7 +68,7 @@ private Reduce(Operation operation) { public static Reduce create(Scope scope, Operand input, Long groupSize, Long groupKey, Long instanceKey, String mergeOp, String finalOp, List subdivOffsets, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveReduce", scope.makeOpName("Reduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reduce")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("group_size", groupSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java index f6b7321ac66..42912daf5f5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/ReduceV2.java @@ -70,7 +70,7 @@ public static ReduceV2 create(Scope scope, Operand inp Operand groupSize, Operand groupKey, Operand instanceKey, Iterable> orderingToken, String mergeOp, String finalOp, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveReduceV2", scope.makeOpName("ReduceV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceV2")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(groupSize.asOutput()); opBuilder.addInput(groupKey.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java index acc328c114b..4fc67af11fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java @@ -52,7 +52,7 @@ private Abort(Operation operation) { describeByClass = true ) public static Abort create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Abort", scope.makeOpName("Abort")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Abort")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java index 73f3fa1af9f..b0f51547809 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java @@ -65,7 +65,7 @@ private All(Operation operation) { ) public static All create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("All", scope.makeOpName("All")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("All")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java index 63f4c45dcd9..5f8eb0cfdbd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java @@ -65,7 +65,7 @@ private Any(Operation operation) { ) public static Any create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Any", scope.makeOpName("Any")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Any")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java index f0aa019e759..e3cb2b4dcfe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java @@ -57,7 +57,7 @@ private AssertThat(Operation operation) { ) public static AssertThat create(Scope scope, Operand condition, Iterable> data, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Assert", scope.makeOpName("AssertThat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertThat")); opBuilder.addInput(condition.asOutput()); opBuilder.addInputList(Operands.asOutputs(data)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java index c20b3d4f0c9..aed03cfb7a1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java @@ -64,7 +64,7 @@ private Assign(Operation operation) { ) public static Assign create(Scope scope, Operand ref, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Assign", scope.makeOpName("Assign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Assign")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java index 1b5e0e89d40..427cea1db9a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java @@ -64,7 +64,7 @@ private AssignAdd(Operation operation) { ) public static AssignAdd create(Scope scope, Operand ref, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AssignAdd", scope.makeOpName("AssignAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignAdd")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java index eabf77fddae..aabcd9e756b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAddVariableOp.java @@ -55,7 +55,7 @@ private AssignAddVariableOp(Operation operation) { ) public static AssignAddVariableOp create(Scope scope, Operand resource, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("AssignAddVariableOp", scope.makeOpName("AssignAddVariableOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignAddVariableOp")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java index 97483964362..68569e36fc5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSub.java @@ -64,7 +64,7 @@ private AssignSub(Operation operation) { ) public static AssignSub create(Scope scope, Operand ref, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AssignSub", scope.makeOpName("AssignSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignSub")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java index 37fb16f97ce..6501d4c070f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignSubVariableOp.java @@ -55,7 +55,7 @@ private AssignSubVariableOp(Operation operation) { ) public static AssignSubVariableOp create(Scope scope, Operand resource, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("AssignSubVariableOp", scope.makeOpName("AssignSubVariableOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignSubVariableOp")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java index 47423220ecb..f186649e329 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignVariableOp.java @@ -55,7 +55,7 @@ private AssignVariableOp(Operation operation) { ) public static AssignVariableOp create(Scope scope, Operand resource, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("AssignVariableOp", scope.makeOpName("AssignVariableOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssignVariableOp")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java index b18d8ad1b1c..4cbd38c0b15 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Barrier.java @@ -70,7 +70,7 @@ private Barrier(Operation operation) { ) public static Barrier create(Scope scope, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Barrier", scope.makeOpName("Barrier")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Barrier")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java index 09ad79d51bd..ec1e6abb01d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierClose.java @@ -58,7 +58,7 @@ private BarrierClose(Operation operation) { describeByClass = true ) public static BarrierClose create(Scope scope, Operand handle, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BarrierClose", scope.makeOpName("BarrierClose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierClose")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java index 7c30abc15f1..e08c9d8479d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierIncompleteSize.java @@ -57,7 +57,7 @@ private BarrierIncompleteSize(Operation operation) { describeByClass = true ) public static BarrierIncompleteSize create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("BarrierIncompleteSize", scope.makeOpName("BarrierIncompleteSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierIncompleteSize")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new BarrierIncompleteSize(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java index f321bf67018..5569ea03f02 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierInsertMany.java @@ -61,7 +61,7 @@ private BarrierInsertMany(Operation operation) { ) public static BarrierInsertMany create(Scope scope, Operand handle, Operand keys, Operand values, Long componentIndex) { - OperationBuilder opBuilder = scope.env().opBuilder("BarrierInsertMany", scope.makeOpName("BarrierInsertMany")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierInsertMany")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(keys.asOutput()); opBuilder.addInput(values.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java index 6f296a79f28..8be08271082 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierReadySize.java @@ -57,7 +57,7 @@ private BarrierReadySize(Operation operation) { describeByClass = true ) public static BarrierReadySize create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("BarrierReadySize", scope.makeOpName("BarrierReadySize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierReadySize")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new BarrierReadySize(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java index 69499753169..2b480131f06 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BarrierTakeMany.java @@ -83,7 +83,7 @@ private BarrierTakeMany(Operation operation) { public static BarrierTakeMany create(Scope scope, Operand handle, Operand numElements, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BarrierTakeMany", scope.makeOpName("BarrierTakeMany")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BarrierTakeMany")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(numElements.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java index 066c44a18b4..7b155fcbcb2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Batch.java @@ -105,7 +105,7 @@ private Batch(Operation operation) { ) public static Batch create(Scope scope, Iterable> inTensors, Long numBatchThreads, Long maxBatchSize, Long batchTimeoutMicros, Long gradTimeoutMicros, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Batch", scope.makeOpName("Batch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Batch")); opBuilder.addInputList(Operands.asOutputs(inTensors)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_batch_threads", numBatchThreads); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java index 1e706ba8f9e..e908a1bb72a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpace.java @@ -76,7 +76,7 @@ private BatchToSpace(Operation operation) { ) public static BatchToSpace create(Scope scope, Operand input, Operand crops, Long blockSize) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchToSpace", scope.makeOpName("BatchToSpace")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchToSpace")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(crops.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java index f8ffc060c71..5f5067ebebe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BatchToSpaceNd.java @@ -160,7 +160,7 @@ private BatchToSpaceNd(Operation operation) { ) public static BatchToSpaceNd create(Scope scope, Operand input, Operand blockShape, Operand crops) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchToSpaceND", scope.makeOpName("BatchToSpaceNd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchToSpaceNd")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(blockShape.asOutput()); opBuilder.addInput(crops.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java index 88536734ce8..cb2cffd1dd5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bitcast.java @@ -120,7 +120,7 @@ private Bitcast(Operation operation) { ) public static Bitcast create(Scope scope, Operand input, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("Bitcast", scope.makeOpName("Bitcast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Bitcast")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("type", Operands.toDataType(type)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java index 8aa3a3a7151..d081f39c50f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastDynamicShape.java @@ -63,7 +63,7 @@ private BroadcastDynamicShape(Operation operation) { ) public static BroadcastDynamicShape create(Scope scope, Operand s0, Operand s1) { - OperationBuilder opBuilder = scope.env().opBuilder("BroadcastArgs", scope.makeOpName("BroadcastDynamicShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastDynamicShape")); opBuilder.addInput(s0.asOutput()); opBuilder.addInput(s1.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java index 0da00a87d58..6264a26ccbf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastGradientArgs.java @@ -63,7 +63,7 @@ private BroadcastGradientArgs(Operation operation) { ) public static BroadcastGradientArgs create(Scope scope, Operand s0, Operand s1) { - OperationBuilder opBuilder = scope.env().opBuilder("BroadcastGradientArgs", scope.makeOpName("BroadcastGradientArgs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastGradientArgs")); opBuilder.addInput(s0.asOutput()); opBuilder.addInput(s1.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java index 670ac6cc074..2e8dd8c5668 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/BroadcastTo.java @@ -90,7 +90,7 @@ private BroadcastTo(Operation operation) { ) public static BroadcastTo create(Scope scope, Operand input, Operand shape) { - OperationBuilder opBuilder = scope.env().opBuilder("BroadcastTo", scope.makeOpName("BroadcastTo")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastTo")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java index 603a8624fd0..cfe1db8d428 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Bucketize.java @@ -69,7 +69,7 @@ private Bucketize(Operation operation) { ) public static Bucketize create(Scope scope, Operand input, List boundaries) { - OperationBuilder opBuilder = scope.env().opBuilder("Bucketize", scope.makeOpName("Bucketize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Bucketize")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); float[] boundariesArray = new float[boundaries.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java index 5d5a0309f73..8e26025c2d7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ClipByValue.java @@ -68,7 +68,7 @@ private ClipByValue(Operation operation) { ) public static ClipByValue create(Scope scope, Operand t, Operand clipValueMin, Operand clipValueMax) { - OperationBuilder opBuilder = scope.env().opBuilder("ClipByValue", scope.makeOpName("ClipByValue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ClipByValue")); opBuilder.addInput(t.asOutput()); opBuilder.addInput(clipValueMin.asOutput()); opBuilder.addInput(clipValueMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java index f6351158b4c..84df176b3aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CollectiveGather.java @@ -67,7 +67,7 @@ private CollectiveGather(Operation operation) { ) public static CollectiveGather create(Scope scope, Operand input, Long groupSize, Long groupKey, Long instanceKey, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveGather", scope.makeOpName("CollectiveGather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectiveGather")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("group_size", groupSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java index 5e7a33542b4..3244d20c649 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Concat.java @@ -65,7 +65,7 @@ private Concat(Operation operation) { ) public static Concat create(Scope scope, Iterable> values, Operand axis) { - OperationBuilder opBuilder = scope.env().opBuilder("ConcatV2", scope.makeOpName("Concat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Concat")); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java index f32dd58b6bc..a48e91b6ebd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ConsumeMutexLock.java @@ -57,7 +57,7 @@ private ConsumeMutexLock(Operation operation) { describeByClass = true ) public static ConsumeMutexLock create(Scope scope, Operand mutexLock) { - OperationBuilder opBuilder = scope.env().opBuilder("ConsumeMutexLock", scope.makeOpName("ConsumeMutexLock")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConsumeMutexLock")); opBuilder.addInput(mutexLock.asOutput()); opBuilder = scope.apply(opBuilder); return new ConsumeMutexLock(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java index a5c5037acf0..a83912d608d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ControlTrigger.java @@ -49,7 +49,7 @@ private ControlTrigger(Operation operation) { describeByClass = true ) public static ControlTrigger create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("ControlTrigger", scope.makeOpName("ControlTrigger")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ControlTrigger")); opBuilder = scope.apply(opBuilder); return new ControlTrigger(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java index d038d538036..f31cc35dc83 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Copy.java @@ -68,7 +68,7 @@ private Copy(Operation operation) { ) public static Copy create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Copy", scope.makeOpName("Copy")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Copy")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java index 03bb0ca7ee2..6e7495f17f1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CopyHost.java @@ -66,7 +66,7 @@ private CopyHost(Operation operation) { ) public static CopyHost create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CopyHost", scope.makeOpName("CopyHost")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CopyHost")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java index ffa579e9b04..17db07035b8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/CountUpTo.java @@ -61,7 +61,7 @@ private CountUpTo(Operation operation) { describeByClass = true ) public static CountUpTo create(Scope scope, Operand ref, Long limit) { - OperationBuilder opBuilder = scope.env().opBuilder("CountUpTo", scope.makeOpName("CountUpTo")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CountUpTo")); opBuilder.addInput(ref.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("limit", limit); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java index dbf9a464425..d0c32ff2601 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DecodeProto.java @@ -124,7 +124,7 @@ private DecodeProto(Operation operation) { ) public static DecodeProto create(Scope scope, Operand bytes, String messageType, List fieldNames, List> outputTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeProtoV2", scope.makeOpName("DecodeProto")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeProto")); opBuilder.addInput(bytes.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("message_type", messageType); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java index a5da8c99bbd..b5662c7ae3d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeepCopy.java @@ -59,7 +59,7 @@ private DeepCopy(Operation operation) { describeByClass = true ) public static DeepCopy create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("DeepCopy", scope.makeOpName("DeepCopy")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeepCopy")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new DeepCopy<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java index 6526e917d48..bd971e462e2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeleteSessionTensor.java @@ -51,7 +51,7 @@ private DeleteSessionTensor(Operation operation) { describeByClass = true ) public static DeleteSessionTensor create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("DeleteSessionTensor", scope.makeOpName("DeleteSessionTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteSessionTensor")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new DeleteSessionTensor(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java index 68c9ec3f0fb..d421e61e929 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyResourceOp.java @@ -55,7 +55,7 @@ private DestroyResourceOp(Operation operation) { ) public static DestroyResourceOp create(Scope scope, Operand resource, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DestroyResourceOp", scope.makeOpName("DestroyResourceOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DestroyResourceOp")); opBuilder.addInput(resource.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java index 556966198fb..cd6a18100fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DestroyTemporaryVariable.java @@ -68,7 +68,7 @@ private DestroyTemporaryVariable(Operation operation) { ) public static DestroyTemporaryVariable create(Scope scope, Operand ref, String varName) { - OperationBuilder opBuilder = scope.env().opBuilder("DestroyTemporaryVariable", scope.makeOpName("DestroyTemporaryVariable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DestroyTemporaryVariable")); opBuilder.addInput(ref.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("var_name", varName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java index f3eb69df194..4e947cb254a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DeviceIndex.java @@ -59,7 +59,7 @@ private DeviceIndex(Operation operation) { describeByClass = true ) public static DeviceIndex create(Scope scope, List deviceNames) { - OperationBuilder opBuilder = scope.env().opBuilder("DeviceIndex", scope.makeOpName("DeviceIndex")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeviceIndex")); opBuilder = scope.apply(opBuilder); String[] deviceNamesArray = new String[deviceNames.size()]; for (int i = 0 ; i < deviceNamesArray.length ; i++) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java index 23b589d33da..32e5713b0b3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DummyMemoryCache.java @@ -54,7 +54,7 @@ private DummyMemoryCache(Operation operation) { describeByClass = true ) public static DummyMemoryCache create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("DummyMemoryCache", scope.makeOpName("DummyMemoryCache")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DummyMemoryCache")); opBuilder = scope.apply(opBuilder); return new DummyMemoryCache(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java index c3048d289b8..277f44372db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicPartition.java @@ -100,7 +100,7 @@ private DynamicPartition(Operation operation) { ) public static DynamicPartition create(Scope scope, Operand data, Operand partitions, Long numPartitions) { - OperationBuilder opBuilder = scope.env().opBuilder("DynamicPartition", scope.makeOpName("DynamicPartition")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicPartition")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(partitions.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java index 61263d0e65c..c314c0b2440 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/DynamicStitch.java @@ -116,7 +116,7 @@ private DynamicStitch(Operation operation) { ) public static DynamicStitch create(Scope scope, Iterable> indices, Iterable> data) { - OperationBuilder opBuilder = scope.env().opBuilder("DynamicStitch", scope.makeOpName("DynamicStitch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicStitch")); opBuilder.addInputList(Operands.asOutputs(indices)); opBuilder.addInputList(Operands.asOutputs(data)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java index 7d233a705ea..a302596aea3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EditDistance.java @@ -78,7 +78,7 @@ public static EditDistance create(Scope scope, Operand hypothesisIndices, Operand hypothesisValues, Operand hypothesisShape, Operand truthIndices, Operand truthValues, Operand truthShape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EditDistance", scope.makeOpName("EditDistance")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EditDistance")); opBuilder.addInput(hypothesisIndices.asOutput()); opBuilder.addInput(hypothesisValues.asOutput()); opBuilder.addInput(hypothesisShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java index e49c9330262..c59b5088a57 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Empty.java @@ -65,7 +65,7 @@ private Empty(Operation operation) { ) public static Empty create(Scope scope, Operand shape, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Empty", scope.makeOpName("Empty")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Empty")); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java index 974c8c4a4fe..f7ca73ecba5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorList.java @@ -70,7 +70,7 @@ private EmptyTensorList(Operation operation) { public static EmptyTensorList create(Scope scope, Operand elementShape, Operand maxNumElements, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("EmptyTensorList", scope.makeOpName("EmptyTensorList")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EmptyTensorList")); opBuilder.addInput(elementShape.asOutput()); opBuilder.addInput(maxNumElements.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java index 3602dd5b457..336ec9ae30c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EmptyTensorMap.java @@ -57,7 +57,7 @@ private EmptyTensorMap(Operation operation) { describeByClass = true ) public static EmptyTensorMap create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("EmptyTensorMap", scope.makeOpName("EmptyTensorMap")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EmptyTensorMap")); opBuilder = scope.apply(opBuilder); return new EmptyTensorMap(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java index d8d4cd12ef8..b640e15d503 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EncodeProto.java @@ -109,7 +109,7 @@ private EncodeProto(Operation operation) { ) public static EncodeProto create(Scope scope, Operand sizes, Iterable> values, List fieldNames, String messageType, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EncodeProto", scope.makeOpName("EncodeProto")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeProto")); opBuilder.addInput(sizes.asOutput()); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java index 113f88c1238..dbe6942d163 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/EnsureShape.java @@ -64,7 +64,7 @@ private EnsureShape(Operation operation) { ) public static EnsureShape create(Scope scope, Operand input, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("EnsureShape", scope.makeOpName("EnsureShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnsureShape")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java index f65f5cff7e2..a7612acd1c5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Enter.java @@ -65,7 +65,7 @@ private Enter(Operation operation) { ) public static Enter create(Scope scope, Operand data, String frameName, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Enter", scope.makeOpName("Enter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Enter")); opBuilder.addInput(data.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("frame_name", frameName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java index 2d2c1499c29..26ecefa0494 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Exit.java @@ -58,7 +58,7 @@ private Exit(Operation operation) { describeByClass = true ) public static Exit create(Scope scope, Operand data) { - OperationBuilder opBuilder = scope.env().opBuilder("Exit", scope.makeOpName("Exit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Exit")); opBuilder.addInput(data.asOutput()); opBuilder = scope.apply(opBuilder); return new Exit<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java index f36d595669c..36442b72024 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExpandDims.java @@ -87,7 +87,7 @@ private ExpandDims(Operation operation) { ) public static ExpandDims create(Scope scope, Operand input, Operand axis) { - OperationBuilder opBuilder = scope.env().opBuilder("ExpandDims", scope.makeOpName("ExpandDims")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExpandDims")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java index eb6f8b4bc34..ea431071365 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ExtractVolumePatches.java @@ -70,7 +70,7 @@ private ExtractVolumePatches(Operation operation) { ) public static ExtractVolumePatches create(Scope scope, Operand input, List ksizes, List strides, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("ExtractVolumePatches", scope.makeOpName("ExtractVolumePatches")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractVolumePatches")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizesArray = new long[ksizes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java index 1aacfb1bd75..1405a16d0be 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fill.java @@ -82,7 +82,7 @@ private Fill(Operation operation) { ) public static Fill create(Scope scope, Operand dims, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("Fill", scope.makeOpName("Fill")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fill")); opBuilder.addInput(dims.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java index 0e4dfcb233d..337dc5b85c6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Fingerprint.java @@ -84,7 +84,7 @@ private Fingerprint(Operation operation) { ) public static Fingerprint create(Scope scope, Operand data, Operand method) { - OperationBuilder opBuilder = scope.env().opBuilder("Fingerprint", scope.makeOpName("Fingerprint")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fingerprint")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(method.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java index cd090bfee84..d2b330568f6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Gather.java @@ -88,7 +88,7 @@ private Gather(Operation operation) { ) public static Gather create(Scope scope, Operand params, Operand indices, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("GatherV2", scope.makeOpName("Gather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Gather")); opBuilder.addInput(params.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(axis.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java index c61a86dcd5f..f57c56e41cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GatherNd.java @@ -151,7 +151,7 @@ private GatherNd(Operation operation) { ) public static GatherNd create(Scope scope, Operand params, Operand indices) { - OperationBuilder opBuilder = scope.env().opBuilder("GatherNd", scope.makeOpName("GatherNd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GatherNd")); opBuilder.addInput(params.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java index be00df796d7..876072b7222 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionHandle.java @@ -57,7 +57,7 @@ private GetSessionHandle(Operation operation) { describeByClass = true ) public static GetSessionHandle create(Scope scope, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("GetSessionHandleV2", scope.makeOpName("GetSessionHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GetSessionHandle")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); return new GetSessionHandle(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java index c4b4d9603d1..319ac2b0ac9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GetSessionTensor.java @@ -63,7 +63,7 @@ private GetSessionTensor(Operation operation) { ) public static GetSessionTensor create(Scope scope, Operand handle, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("GetSessionTensor", scope.makeOpName("GetSessionTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GetSessionTensor")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java index e03e5079309..5b600d66af7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/GuaranteeConst.java @@ -63,7 +63,7 @@ private GuaranteeConst(Operation operation) { describeByClass = true ) public static GuaranteeConst create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("GuaranteeConst", scope.makeOpName("GuaranteeConst")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GuaranteeConst")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new GuaranteeConst<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java index bd0b930f591..5063ab9d291 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HashTable.java @@ -66,7 +66,7 @@ private HashTable(Operation operation) { ) public static HashTable create(Scope scope, Class keyDtype, Class valueDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("HashTableV2", scope.makeOpName("HashTable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HashTable")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype)); opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java index b6ac22168d1..c7417683e00 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/HistogramFixedWidth.java @@ -82,7 +82,7 @@ private HistogramFixedWidth(Operation operation) { ) public static HistogramFixedWidth create(Scope scope, Operand values, Operand valueRange, Operand nbins, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("HistogramFixedWidth", scope.makeOpName("HistogramFixedWidth")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HistogramFixedWidth")); opBuilder.addInput(values.asOutput()); opBuilder.addInput(valueRange.asOutput()); opBuilder.addInput(nbins.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java index aaed04c8743..9e0f7be5a22 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Identity.java @@ -59,7 +59,7 @@ private Identity(Operation operation) { describeByClass = true ) public static Identity create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("Identity", scope.makeOpName("Identity")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Identity")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Identity<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java index dc658b90eb8..d70d42698a0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IdentityN.java @@ -76,7 +76,7 @@ private IdentityN(Operation operation) { describeByClass = true ) public static IdentityN create(Scope scope, Iterable> input) { - OperationBuilder opBuilder = scope.env().opBuilder("IdentityN", scope.makeOpName("IdentityN")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IdentityN")); opBuilder.addInputList(Operands.asOutputs(input)); opBuilder = scope.apply(opBuilder); return new IdentityN(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java index 7dd2c608b9f..8c49af16350 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ImmutableConst.java @@ -66,7 +66,7 @@ private ImmutableConst(Operation operation) { ) public static ImmutableConst create(Scope scope, Class dtype, Shape shape, String memoryRegionName) { - OperationBuilder opBuilder = scope.env().opBuilder("ImmutableConst", scope.makeOpName("ImmutableConst")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImmutableConst")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java index 20ef82fc0b6..23c86e955c5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTable.java @@ -54,7 +54,7 @@ private InitializeTable(Operation operation) { ) public static InitializeTable create(Scope scope, Operand tableHandle, Operand keys, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("InitializeTableV2", scope.makeOpName("InitializeTable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InitializeTable")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(keys.asOutput()); opBuilder.addInput(values.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java index eb3cf4e2c03..ef81b6bb3d2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InitializeTableFromTextFile.java @@ -70,7 +70,7 @@ private InitializeTableFromTextFile(Operation operation) { public static InitializeTableFromTextFile create(Scope scope, Operand tableHandle, Operand filename, Long keyIndex, Long valueIndex, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("InitializeTableFromTextFileV2", scope.makeOpName("InitializeTableFromTextFile")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InitializeTableFromTextFile")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(filename.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java index c7cc00f87cf..fe81153c9db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceAdd.java @@ -66,7 +66,7 @@ private InplaceAdd(Operation operation) { ) public static InplaceAdd create(Scope scope, Operand x, Operand i, Operand v) { - OperationBuilder opBuilder = scope.env().opBuilder("InplaceAdd", scope.makeOpName("InplaceAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InplaceAdd")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(i.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java index f84e7ece5e7..9ed3b0011af 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceSub.java @@ -67,7 +67,7 @@ private InplaceSub(Operation operation) { ) public static InplaceSub create(Scope scope, Operand x, Operand i, Operand v) { - OperationBuilder opBuilder = scope.env().opBuilder("InplaceSub", scope.makeOpName("InplaceSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InplaceSub")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(i.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java index c7543a8b780..69fca893ec2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/InplaceUpdate.java @@ -66,7 +66,7 @@ private InplaceUpdate(Operation operation) { ) public static InplaceUpdate create(Scope scope, Operand x, Operand i, Operand v) { - OperationBuilder opBuilder = scope.env().opBuilder("InplaceUpdate", scope.makeOpName("InplaceUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InplaceUpdate")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(i.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java index e18d8d61178..9b2e1217dd9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/IsVariableInitialized.java @@ -58,7 +58,7 @@ private IsVariableInitialized(Operation operation) { describeByClass = true ) public static IsVariableInitialized create(Scope scope, Operand ref) { - OperationBuilder opBuilder = scope.env().opBuilder("IsVariableInitialized", scope.makeOpName("IsVariableInitialized")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsVariableInitialized")); opBuilder.addInput(ref.asOutput()); opBuilder = scope.apply(opBuilder); return new IsVariableInitialized(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java index b67996f7a77..a576cc8541e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/KthOrderStatistic.java @@ -71,7 +71,7 @@ private KthOrderStatistic(Operation operation) { describeByClass = true ) public static KthOrderStatistic create(Scope scope, Operand input, Long k) { - OperationBuilder opBuilder = scope.env().opBuilder("KthOrderStatistic", scope.makeOpName("KthOrderStatistic")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KthOrderStatistic")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("k", k); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java index 14764b62003..8b852ac10e7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LinSpace.java @@ -67,7 +67,7 @@ private LinSpace(Operation operation) { ) public static LinSpace create(Scope scope, Operand start, Operand stop, Operand num) { - OperationBuilder opBuilder = scope.env().opBuilder("LinSpace", scope.makeOpName("LinSpace")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LinSpace")); opBuilder.addInput(start.asOutput()); opBuilder.addInput(stop.asOutput()); opBuilder.addInput(num.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java index 524064d6b52..7d662618b0f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableExport.java @@ -69,7 +69,7 @@ private LookupTableExport(Operation operation) { ) public static LookupTableExport create(Scope scope, Operand tableHandle, Class Tkeys, Class Tvalues) { - OperationBuilder opBuilder = scope.env().opBuilder("LookupTableExportV2", scope.makeOpName("LookupTableExport")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableExport")); opBuilder.addInput(tableHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tkeys", Operands.toDataType(Tkeys)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java index 6e4f6f597ba..16c773922c2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableFind.java @@ -67,7 +67,7 @@ private LookupTableFind(Operation operation) { public static LookupTableFind create(Scope scope, Operand tableHandle, Operand keys, Operand defaultValue) { - OperationBuilder opBuilder = scope.env().opBuilder("LookupTableFindV2", scope.makeOpName("LookupTableFind")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableFind")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(keys.asOutput()); opBuilder.addInput(defaultValue.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java index 3a670d9de68..1c76d9056dd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableImport.java @@ -56,7 +56,7 @@ private LookupTableImport(Operation operation) { ) public static LookupTableImport create(Scope scope, Operand tableHandle, Operand keys, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("LookupTableImportV2", scope.makeOpName("LookupTableImport")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableImport")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(keys.asOutput()); opBuilder.addInput(values.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java index c235064e1bf..e7b94e49d9d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableInsert.java @@ -56,7 +56,7 @@ private LookupTableInsert(Operation operation) { ) public static LookupTableInsert create(Scope scope, Operand tableHandle, Operand keys, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("LookupTableInsertV2", scope.makeOpName("LookupTableInsert")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableInsert")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(keys.asOutput()); opBuilder.addInput(values.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java index 5d3ca1e8507..8c9c0201259 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableRemove.java @@ -53,7 +53,7 @@ private LookupTableRemove(Operation operation) { ) public static LookupTableRemove create(Scope scope, Operand tableHandle, Operand keys) { - OperationBuilder opBuilder = scope.env().opBuilder("LookupTableRemoveV2", scope.makeOpName("LookupTableRemove")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableRemove")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(keys.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java index eb41130753f..e0cd2a31ed3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LookupTableSize.java @@ -57,7 +57,7 @@ private LookupTableSize(Operation operation) { describeByClass = true ) public static LookupTableSize create(Scope scope, Operand tableHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("LookupTableSizeV2", scope.makeOpName("LookupTableSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LookupTableSize")); opBuilder.addInput(tableHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new LookupTableSize(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java index 0c6321bafcc..f5cbb248d29 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LoopCond.java @@ -58,7 +58,7 @@ private LoopCond(Operation operation) { describeByClass = true ) public static LoopCond create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("LoopCond", scope.makeOpName("LoopCond")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoopCond")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new LoopCond(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java index 9f16a1bcc93..14f14ecb6a5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/LowerBound.java @@ -78,7 +78,7 @@ private LowerBound(Operation operation) { ) public static LowerBound create(Scope scope, Operand sortedInputs, Operand values, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("LowerBound", scope.makeOpName("LowerBound")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LowerBound")); opBuilder.addInput(sortedInputs.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java index 3d0e3be8a16..ad2274a2f8d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MakeUnique.java @@ -60,7 +60,7 @@ private MakeUnique(Operation operation) { describeByClass = true ) public static MakeUnique create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("MakeUnique", scope.makeOpName("MakeUnique")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MakeUnique")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new MakeUnique(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java index ea67839c337..0708a1f9515 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapClear.java @@ -54,7 +54,7 @@ private MapClear(Operation operation) { ) public static MapClear create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapClear", scope.makeOpName("MapClear")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapClear")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java index 0a533d39d69..c6e0947f969 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapIncompleteSize.java @@ -61,7 +61,7 @@ private MapIncompleteSize(Operation operation) { ) public static MapIncompleteSize create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapIncompleteSize", scope.makeOpName("MapIncompleteSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapIncompleteSize")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java index b6a9896d220..06f322f2b8c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapPeek.java @@ -71,7 +71,7 @@ private MapPeek(Operation operation) { ) public static MapPeek create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapPeek", scope.makeOpName("MapPeek")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapPeek")); opBuilder.addInput(key.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java index 874a1e86618..d1f01833a66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapSize.java @@ -61,7 +61,7 @@ private MapSize(Operation operation) { ) public static MapSize create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapSize", scope.makeOpName("MapSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapSize")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java index 1b6835d287a..3da1ee55f5c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapStage.java @@ -61,7 +61,7 @@ private MapStage(Operation operation) { ) public static MapStage create(Scope scope, Operand key, Operand indices, Iterable> values, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapStage", scope.makeOpName("MapStage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapStage")); opBuilder.addInput(key.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInputList(Operands.asOutputs(values)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java index c3c9bc34cdb..9e5290c695d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstage.java @@ -71,7 +71,7 @@ private MapUnstage(Operation operation) { ) public static MapUnstage create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapUnstage", scope.makeOpName("MapUnstage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapUnstage")); opBuilder.addInput(key.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java index aab2555eb9b..9d5dafbb305 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MapUnstageNoKey.java @@ -72,7 +72,7 @@ private MapUnstageNoKey(Operation operation) { ) public static MapUnstageNoKey create(Scope scope, Operand indices, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MapUnstageNoKey", scope.makeOpName("MapUnstageNoKey")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MapUnstageNoKey")); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java index 4109afa098f..8d56d0ff5fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Max.java @@ -67,7 +67,7 @@ private Max(Operation operation) { ) public static Max create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Max", scope.makeOpName("Max")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Max")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java index e8ce85de4cc..a6bc464d73c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Merge.java @@ -68,7 +68,7 @@ private Merge(Operation operation) { describeByClass = true ) public static Merge create(Scope scope, Iterable> inputs) { - OperationBuilder opBuilder = scope.env().opBuilder("Merge", scope.makeOpName("Merge")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Merge")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); return new Merge<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java index b438709b808..660cfc923e4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Min.java @@ -67,7 +67,7 @@ private Min(Operation operation) { ) public static Min create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Min", scope.makeOpName("Min")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Min")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java index 793b4a133fc..a8a74e51839 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPad.java @@ -89,7 +89,7 @@ private MirrorPad(Operation operation) { ) public static MirrorPad create(Scope scope, Operand input, Operand paddings, String mode) { - OperationBuilder opBuilder = scope.env().opBuilder("MirrorPad", scope.makeOpName("MirrorPad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MirrorPad")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddings.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java index 6e87eaa45ac..cb8ffb0e203 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MirrorPadGrad.java @@ -76,7 +76,7 @@ private MirrorPadGrad(Operation operation) { ) public static MirrorPadGrad create(Scope scope, Operand input, Operand paddings, String mode) { - OperationBuilder opBuilder = scope.env().opBuilder("MirrorPadGrad", scope.makeOpName("MirrorPadGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MirrorPadGrad")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddings.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java index 648bd01bf02..fef5ae4f0e0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MlirPassthroughOp.java @@ -94,7 +94,7 @@ private MlirPassthroughOp(Operation operation) { ) public static MlirPassthroughOp create(Scope scope, Iterable> inputs, String mlirModule, List> Toutputs) { - OperationBuilder opBuilder = scope.env().opBuilder("MlirPassthroughOp", scope.makeOpName("MlirPassthroughOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MlirPassthroughOp")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("mlir_module", mlirModule); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java index b94faeb89c2..b1fae2e37ba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableDenseHashTable.java @@ -71,7 +71,7 @@ private MutableDenseHashTable(Operation operation) { ) public static MutableDenseHashTable create(Scope scope, Operand emptyKey, Operand deletedKey, Class valueDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MutableDenseHashTableV2", scope.makeOpName("MutableDenseHashTable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutableDenseHashTable")); opBuilder.addInput(emptyKey.asOutput()); opBuilder.addInput(deletedKey.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java index 3d37d0a4746..432aa2b40fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTable.java @@ -66,7 +66,7 @@ private MutableHashTable(Operation operation) { ) public static MutableHashTable create(Scope scope, Class keyDtype, Class valueDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MutableHashTableV2", scope.makeOpName("MutableHashTable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutableHashTable")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype)); opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java index 60afac5f7a2..ba82e946164 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutableHashTableOfTensors.java @@ -67,7 +67,7 @@ private MutableHashTableOfTensors(Operation operation) { ) public static MutableHashTableOfTensors create(Scope scope, Class keyDtype, Class valueDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MutableHashTableOfTensorsV2", scope.makeOpName("MutableHashTableOfTensors")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutableHashTableOfTensors")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype)); opBuilder.setAttr("value_dtype", Operands.toDataType(valueDtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java index 36d7656478c..1082c127774 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Mutex.java @@ -57,7 +57,7 @@ private Mutex(Operation operation) { describeByClass = true ) public static Mutex create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MutexV2", scope.makeOpName("Mutex")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mutex")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java index d3e8ae93897..dc24a517b7a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/MutexLock.java @@ -90,7 +90,7 @@ private MutexLock(Operation operation) { describeByClass = true ) public static MutexLock create(Scope scope, Operand mutex) { - OperationBuilder opBuilder = scope.env().opBuilder("MutexLock", scope.makeOpName("MutexLock")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MutexLock")); opBuilder.addInput(mutex.asOutput()); opBuilder = scope.apply(opBuilder); return new MutexLock(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java index 20cdf1e184b..ac392938fdf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclAllReduce.java @@ -74,7 +74,7 @@ private NcclAllReduce(Operation operation) { ) public static NcclAllReduce create(Scope scope, Operand input, String reduction, Long numDevices, String sharedName) { - OperationBuilder opBuilder = scope.env().opBuilder("NcclAllReduce", scope.makeOpName("NcclAllReduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclAllReduce")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("reduction", reduction); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java index 7b3240b9119..e7c25c28823 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclBroadcast.java @@ -69,7 +69,7 @@ private NcclBroadcast(Operation operation) { ) public static NcclBroadcast create(Scope scope, Operand input, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("NcclBroadcast", scope.makeOpName("NcclBroadcast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclBroadcast")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java index cda500edda0..a17b786d775 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NcclReduce.java @@ -69,7 +69,7 @@ private NcclReduce(Operation operation) { ) public static NcclReduce create(Scope scope, Iterable> input, String reduction) { - OperationBuilder opBuilder = scope.env().opBuilder("NcclReduce", scope.makeOpName("NcclReduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclReduce")); opBuilder.addInputList(Operands.asOutputs(input)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("reduction", reduction); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java index 1685840610b..04da6e134c5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NextIteration.java @@ -59,7 +59,7 @@ private NextIteration(Operation operation) { describeByClass = true ) public static NextIteration create(Scope scope, Operand data) { - OperationBuilder opBuilder = scope.env().opBuilder("NextIteration", scope.makeOpName("NextIteration")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NextIteration")); opBuilder.addInput(data.asOutput()); opBuilder = scope.apply(opBuilder); return new NextIteration<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java index 741e9397e69..b5934d56a0d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/NoOp.java @@ -48,7 +48,7 @@ private NoOp(Operation operation) { describeByClass = true ) public static NoOp create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("NoOp", scope.makeOpName("NoOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NoOp")); opBuilder = scope.apply(opBuilder); return new NoOp(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java index 0cb7522274b..5792ff7118d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OneHot.java @@ -140,7 +140,7 @@ private OneHot(Operation operation) { ) public static OneHot create(Scope scope, Operand indices, Operand depth, Operand onValue, Operand offValue, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OneHot", scope.makeOpName("OneHot")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OneHot")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(depth.asOutput()); opBuilder.addInput(onValue.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java index bc94f4bdd88..45edcd7a34f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OnesLike.java @@ -59,7 +59,7 @@ private OnesLike(Operation operation) { describeByClass = true ) public static OnesLike create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("OnesLike", scope.makeOpName("OnesLike")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OnesLike")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new OnesLike<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java index 1d487caaa1f..eba41545c22 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapClear.java @@ -54,7 +54,7 @@ private OrderedMapClear(Operation operation) { ) public static OrderedMapClear create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapClear", scope.makeOpName("OrderedMapClear")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapClear")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java index 81b4b4d8e00..c5d30ab0923 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapIncompleteSize.java @@ -61,7 +61,7 @@ private OrderedMapIncompleteSize(Operation operation) { ) public static OrderedMapIncompleteSize create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapIncompleteSize", scope.makeOpName("OrderedMapIncompleteSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapIncompleteSize")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java index 3073a97acbf..a6f8795b3cc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapPeek.java @@ -72,7 +72,7 @@ private OrderedMapPeek(Operation operation) { ) public static OrderedMapPeek create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapPeek", scope.makeOpName("OrderedMapPeek")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapPeek")); opBuilder.addInput(key.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java index 97cb7da14ca..41a0bad3554 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapSize.java @@ -61,7 +61,7 @@ private OrderedMapSize(Operation operation) { ) public static OrderedMapSize create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapSize", scope.makeOpName("OrderedMapSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapSize")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java index b4df966b71f..a5b84ec8e64 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapStage.java @@ -62,7 +62,7 @@ private OrderedMapStage(Operation operation) { ) public static OrderedMapStage create(Scope scope, Operand key, Operand indices, Iterable> values, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapStage", scope.makeOpName("OrderedMapStage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapStage")); opBuilder.addInput(key.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInputList(Operands.asOutputs(values)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java index 761f9e3c705..fcf11ce38bf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstage.java @@ -71,7 +71,7 @@ private OrderedMapUnstage(Operation operation) { ) public static OrderedMapUnstage create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapUnstage", scope.makeOpName("OrderedMapUnstage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapUnstage")); opBuilder.addInput(key.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java index 952704844f8..9656eaaa302 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/OrderedMapUnstageNoKey.java @@ -72,7 +72,7 @@ private OrderedMapUnstageNoKey(Operation operation) { ) public static OrderedMapUnstageNoKey create(Scope scope, Operand indices, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapUnstageNoKey", scope.makeOpName("OrderedMapUnstageNoKey")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrderedMapUnstageNoKey")); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java index 7dde13cf5ee..5590bf808e8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Pad.java @@ -83,7 +83,7 @@ private Pad(Operation operation) { ) public static Pad create(Scope scope, Operand input, Operand paddings, Operand constantValues) { - OperationBuilder opBuilder = scope.env().opBuilder("PadV2", scope.makeOpName("Pad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Pad")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddings.asOutput()); opBuilder.addInput(constantValues.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java index c82ed8c6d3d..5ecabefbf81 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelConcat.java @@ -78,7 +78,7 @@ private ParallelConcat(Operation operation) { ) public static ParallelConcat create(Scope scope, Iterable> values, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("ParallelConcat", scope.makeOpName("ParallelConcat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelConcat")); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java index 7cdaf7186dc..8ca88c679ab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ParallelDynamicStitch.java @@ -115,7 +115,7 @@ private ParallelDynamicStitch(Operation operation) { ) public static ParallelDynamicStitch create(Scope scope, Iterable> indices, Iterable> data) { - OperationBuilder opBuilder = scope.env().opBuilder("ParallelDynamicStitch", scope.makeOpName("ParallelDynamicStitch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelDynamicStitch")); opBuilder.addInputList(Operands.asOutputs(indices)); opBuilder.addInputList(Operands.asOutputs(data)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java index ce982c9fec3..084c7e60ca5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Placeholder.java @@ -66,7 +66,7 @@ private Placeholder(Operation operation) { ) public static Placeholder create(Scope scope, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Placeholder", scope.makeOpName("Placeholder")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Placeholder")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java index aaf92d4b7d1..6c4f5ea8cf8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/PlaceholderWithDefault.java @@ -62,7 +62,7 @@ private PlaceholderWithDefault(Operation operation) { ) public static PlaceholderWithDefault create(Scope scope, Operand input, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("PlaceholderWithDefault", scope.makeOpName("PlaceholderWithDefault")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PlaceholderWithDefault")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java index e453803464a..7984706a37f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Print.java @@ -53,7 +53,7 @@ private Print(Operation operation) { describeByClass = true ) public static Print create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PrintV2", scope.makeOpName("Print")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Print")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java index 4644a025a92..3f9aadce98b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Prod.java @@ -68,7 +68,7 @@ private Prod(Operation operation) { ) public static Prod create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Prod", scope.makeOpName("Prod")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Prod")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java index 2b449817340..962d31d0c66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/QuantizedReshape.java @@ -71,7 +71,7 @@ private QuantizedReshape(Operation operation) { ) public static QuantizedReshape create(Scope scope, Operand tensor, Operand shape, Operand inputMin, Operand inputMax) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedReshape", scope.makeOpName("QuantizedReshape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedReshape")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(inputMin.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java index ea9bafe214d..9e957e384db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Range.java @@ -71,7 +71,7 @@ private Range(Operation operation) { ) public static Range create(Scope scope, Operand start, Operand limit, Operand delta) { - OperationBuilder opBuilder = scope.env().opBuilder("Range", scope.makeOpName("Range")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Range")); opBuilder.addInput(start.asOutput()); opBuilder.addInput(limit.asOutput()); opBuilder.addInput(delta.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java index c32961a10b4..1a1643d3a66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rank.java @@ -67,7 +67,7 @@ private Rank(Operation operation) { describeByClass = true ) public static Rank create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("Rank", scope.makeOpName("Rank")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rank")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Rank(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java index d7d329f37f3..0839d68b8dc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReadVariableOp.java @@ -67,7 +67,7 @@ private ReadVariableOp(Operation operation) { ) public static ReadVariableOp create(Scope scope, Operand resource, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("ReadVariableOp", scope.makeOpName("ReadVariableOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReadVariableOp")); opBuilder.addInput(resource.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java index dfc29a0cdc7..5c4792ea1f1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Recv.java @@ -65,7 +65,7 @@ private Recv(Operation operation) { public static Recv create(Scope scope, Class tensorType, String tensorName, String sendDevice, Long sendDeviceIncarnation, String recvDevice, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Recv", scope.makeOpName("Recv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Recv")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("tensor_type", Operands.toDataType(tensorType)); opBuilder.setAttr("tensor_name", tensorName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java index b684ba9d6be..93750a4f95a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAll.java @@ -65,7 +65,7 @@ private ReduceAll(Operation operation) { ) public static ReduceAll create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("All", scope.makeOpName("ReduceAll")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceAll")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java index aa446a167f3..cf53d3a2071 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceAny.java @@ -65,7 +65,7 @@ private ReduceAny(Operation operation) { ) public static ReduceAny create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Any", scope.makeOpName("ReduceAny")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceAny")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java index 5f561d2e5dd..66090f91d32 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMax.java @@ -67,7 +67,7 @@ private ReduceMax(Operation operation) { ) public static ReduceMax create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Max", scope.makeOpName("ReduceMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceMax")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java index 92ec0761a02..91d1d46b9b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceMin.java @@ -67,7 +67,7 @@ private ReduceMin(Operation operation) { ) public static ReduceMin create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Min", scope.makeOpName("ReduceMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceMin")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java index 3d7b22863b7..cde85542fe4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceProd.java @@ -68,7 +68,7 @@ private ReduceProd(Operation operation) { ) public static ReduceProd create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Prod", scope.makeOpName("ReduceProd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceProd")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java index 4928188d4cd..d39d5549be3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReduceSum.java @@ -68,7 +68,7 @@ private ReduceSum(Operation operation) { ) public static ReduceSum create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Sum", scope.makeOpName("ReduceSum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceSum")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java index 7f399c80d94..fcd9dbce973 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefEnter.java @@ -64,7 +64,7 @@ private RefEnter(Operation operation) { ) public static RefEnter create(Scope scope, Operand data, String frameName, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RefEnter", scope.makeOpName("RefEnter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefEnter")); opBuilder.addInput(data.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("frame_name", frameName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java index 82e201ae0d9..10f17674b87 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefExit.java @@ -58,7 +58,7 @@ private RefExit(Operation operation) { describeByClass = true ) public static RefExit create(Scope scope, Operand data) { - OperationBuilder opBuilder = scope.env().opBuilder("RefExit", scope.makeOpName("RefExit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefExit")); opBuilder.addInput(data.asOutput()); opBuilder = scope.apply(opBuilder); return new RefExit<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java index 35360fe8d89..b5c66e12811 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefIdentity.java @@ -57,7 +57,7 @@ private RefIdentity(Operation operation) { describeByClass = true ) public static RefIdentity create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("RefIdentity", scope.makeOpName("RefIdentity")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefIdentity")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new RefIdentity<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java index 5e671132995..6fb364c6d6f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefMerge.java @@ -66,7 +66,7 @@ private RefMerge(Operation operation) { describeByClass = true ) public static RefMerge create(Scope scope, Iterable> inputs) { - OperationBuilder opBuilder = scope.env().opBuilder("RefMerge", scope.makeOpName("RefMerge")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefMerge")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); return new RefMerge<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java index 76bb5185e08..3276aa0be6b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefNextIteration.java @@ -59,7 +59,7 @@ private RefNextIteration(Operation operation) { describeByClass = true ) public static RefNextIteration create(Scope scope, Operand data) { - OperationBuilder opBuilder = scope.env().opBuilder("RefNextIteration", scope.makeOpName("RefNextIteration")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefNextIteration")); opBuilder.addInput(data.asOutput()); opBuilder = scope.apply(opBuilder); return new RefNextIteration<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java index a030084acaa..67bdc1e2644 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSelect.java @@ -63,7 +63,7 @@ private RefSelect(Operation operation) { ) public static RefSelect create(Scope scope, Operand index, Iterable> inputs) { - OperationBuilder opBuilder = scope.env().opBuilder("RefSelect", scope.makeOpName("RefSelect")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefSelect")); opBuilder.addInput(index.asOutput()); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java index a94d172fdd6..1ed139d0ae6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RefSwitch.java @@ -68,7 +68,7 @@ private RefSwitch(Operation operation) { ) public static RefSwitch create(Scope scope, Operand data, Operand pred) { - OperationBuilder opBuilder = scope.env().opBuilder("RefSwitch", scope.makeOpName("RefSwitch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RefSwitch")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(pred.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java index f59c0efb442..9d2348c8426 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reshape.java @@ -116,7 +116,7 @@ private Reshape(Operation operation) { ) public static Reshape create(Scope scope, Operand tensor, Operand shape) { - OperationBuilder opBuilder = scope.env().opBuilder("Reshape", scope.makeOpName("Reshape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reshape")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java index 4da07c2c8f5..7453e07c77e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceCountUpTo.java @@ -65,7 +65,7 @@ private ResourceCountUpTo(Operation operation) { ) public static ResourceCountUpTo create(Scope scope, Operand resource, Long limit, Class T) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceCountUpTo", scope.makeOpName("ResourceCountUpTo")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceCountUpTo")); opBuilder.addInput(resource.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("limit", limit); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java index 274b8c0216b..683b025e2ac 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGather.java @@ -78,7 +78,7 @@ private ResourceGather(Operation operation) { public static ResourceGather create(Scope scope, Operand resource, Operand indices, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceGather", scope.makeOpName("ResourceGather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceGather")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java index 1669af384fa..679b7d18472 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceGatherNd.java @@ -64,7 +64,7 @@ private ResourceGatherNd(Operation operation) { ) public static ResourceGatherNd create(Scope scope, Operand resource, Operand indices, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceGatherNd", scope.makeOpName("ResourceGatherNd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceGatherNd")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java index 5b2c431bc55..255192d11c7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterAdd.java @@ -72,7 +72,7 @@ private ResourceScatterAdd(Operation operation) { ) public static ResourceScatterAdd create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterAdd", scope.makeOpName("ResourceScatterAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterAdd")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java index 9d6115a34d0..b804e2dea4a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterDiv.java @@ -72,7 +72,7 @@ private ResourceScatterDiv(Operation operation) { ) public static ResourceScatterDiv create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterDiv", scope.makeOpName("ResourceScatterDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterDiv")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java index 8b1912ee994..fe4b43b8d21 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMax.java @@ -72,7 +72,7 @@ private ResourceScatterMax(Operation operation) { ) public static ResourceScatterMax create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMax", scope.makeOpName("ResourceScatterMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterMax")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java index 6e51c6fa2a5..57c888412a4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMin.java @@ -72,7 +72,7 @@ private ResourceScatterMin(Operation operation) { ) public static ResourceScatterMin create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMin", scope.makeOpName("ResourceScatterMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterMin")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java index 8891aaf555a..8bb5007d450 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterMul.java @@ -72,7 +72,7 @@ private ResourceScatterMul(Operation operation) { ) public static ResourceScatterMul create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMul", scope.makeOpName("ResourceScatterMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterMul")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java index f846f0105df..b53c3fc4adb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdAdd.java @@ -84,7 +84,7 @@ private ResourceScatterNdAdd(Operation operation) { ) public static ResourceScatterNdAdd create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdAdd", scope.makeOpName("ResourceScatterNdAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdAdd")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java index 60604e40901..d15a9286cba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMax.java @@ -58,7 +58,7 @@ private ResourceScatterNdMax(Operation operation) { ) public static ResourceScatterNdMax create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdMax", scope.makeOpName("ResourceScatterNdMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdMax")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java index 3f227154962..1c5f45b9a18 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdMin.java @@ -58,7 +58,7 @@ private ResourceScatterNdMin(Operation operation) { ) public static ResourceScatterNdMin create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdMin", scope.makeOpName("ResourceScatterNdMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdMin")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java index 0b8b305105f..c7ee744bc80 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdSub.java @@ -84,7 +84,7 @@ private ResourceScatterNdSub(Operation operation) { ) public static ResourceScatterNdSub create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdSub", scope.makeOpName("ResourceScatterNdSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdSub")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java index 73bad12a3d4..036b760d68f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterNdUpdate.java @@ -85,7 +85,7 @@ private ResourceScatterNdUpdate(Operation operation) { ) public static ResourceScatterNdUpdate create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdUpdate", scope.makeOpName("ResourceScatterNdUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterNdUpdate")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java index 58bffab6d01..f747d5d01a0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterSub.java @@ -72,7 +72,7 @@ private ResourceScatterSub(Operation operation) { ) public static ResourceScatterSub create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterSub", scope.makeOpName("ResourceScatterSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterSub")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java index fe524c62ed3..46c6911cb82 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceScatterUpdate.java @@ -66,7 +66,7 @@ private ResourceScatterUpdate(Operation operation) { ) public static ResourceScatterUpdate create(Scope scope, Operand resource, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterUpdate", scope.makeOpName("ResourceScatterUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceScatterUpdate")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java index 3751916d6e3..8b7842cd447 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ResourceStridedSliceAssign.java @@ -65,7 +65,7 @@ private ResourceStridedSliceAssign(Operation operation) { public static ResourceStridedSliceAssign create(Scope scope, Operand ref, Operand begin, Operand end, Operand strides, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceStridedSliceAssign", scope.makeOpName("ResourceStridedSliceAssign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceStridedSliceAssign")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(end.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java index c5227f60573..5b40a326bf0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Reverse.java @@ -105,7 +105,7 @@ private Reverse(Operation operation) { ) public static Reverse create(Scope scope, Operand tensor, Operand axis) { - OperationBuilder opBuilder = scope.env().opBuilder("ReverseV2", scope.makeOpName("Reverse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reverse")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java index f90bce00b11..e28d178d8f3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ReverseSequence.java @@ -113,7 +113,7 @@ private ReverseSequence(Operation operation) { ) public static ReverseSequence create(Scope scope, Operand input, Operand seqLengths, Long seqDim, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ReverseSequence", scope.makeOpName("ReverseSequence")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReverseSequence")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(seqLengths.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java index 46c1105525b..f278c3544e5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Roll.java @@ -87,7 +87,7 @@ private Roll(Operation operation) { ) public static Roll create(Scope scope, Operand input, Operand shift, Operand axis) { - OperationBuilder opBuilder = scope.env().opBuilder("Roll", scope.makeOpName("Roll")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Roll")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(shift.asOutput()); opBuilder.addInput(axis.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java index fb99ba72e15..0f5b6446f10 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterAdd.java @@ -83,7 +83,7 @@ private ScatterAdd(Operation operation) { ) public static ScatterAdd create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterAdd", scope.makeOpName("ScatterAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterAdd")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java index e4a2aee18e3..a4ce6cb7081 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterDiv.java @@ -80,7 +80,7 @@ private ScatterDiv(Operation operation) { ) public static ScatterDiv create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterDiv", scope.makeOpName("ScatterDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterDiv")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java index 0151d58d5e4..d2c7d88e595 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMax.java @@ -82,7 +82,7 @@ private ScatterMax(Operation operation) { ) public static ScatterMax create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterMax", scope.makeOpName("ScatterMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterMax")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java index f8de1ab981f..573c22dd90b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMin.java @@ -82,7 +82,7 @@ private ScatterMin(Operation operation) { ) public static ScatterMin create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterMin", scope.makeOpName("ScatterMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterMin")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java index e3c60debba5..db7eb4911aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterMul.java @@ -80,7 +80,7 @@ private ScatterMul(Operation operation) { ) public static ScatterMul create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterMul", scope.makeOpName("ScatterMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterMul")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java index 0590363853f..f56f759952b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNd.java @@ -132,7 +132,7 @@ private ScatterNd(Operation operation) { ) public static ScatterNd create(Scope scope, Operand indices, Operand updates, Operand shape) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNd", scope.makeOpName("ScatterNd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNd")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java index c84b4db7ed3..dffda533284 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdAdd.java @@ -92,7 +92,7 @@ private ScatterNdAdd(Operation operation) { ) public static ScatterNdAdd create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdAdd", scope.makeOpName("ScatterNdAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdAdd")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java index bfe7e8470db..09ee60144cc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMax.java @@ -64,7 +64,7 @@ private ScatterNdMax(Operation operation) { ) public static ScatterNdMax create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdMax", scope.makeOpName("ScatterNdMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdMax")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java index 98663edd311..149b18ce7d8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdMin.java @@ -64,7 +64,7 @@ private ScatterNdMin(Operation operation) { ) public static ScatterNdMin create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdMin", scope.makeOpName("ScatterNdMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdMin")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java index e9d2f0586e0..5e1c718bd6a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdNonAliasingAdd.java @@ -92,7 +92,7 @@ private ScatterNdNonAliasingAdd(Operation operation) { ) public static ScatterNdNonAliasingAdd create(Scope scope, Operand input, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdNonAliasingAdd", scope.makeOpName("ScatterNdNonAliasingAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdNonAliasingAdd")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java index 23e1d53e85d..cd5edc87ba1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdSub.java @@ -93,7 +93,7 @@ private ScatterNdSub(Operation operation) { ) public static ScatterNdSub create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdSub", scope.makeOpName("ScatterNdSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdSub")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java index 1d93219a76d..b40a4240311 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterNdUpdate.java @@ -92,7 +92,7 @@ private ScatterNdUpdate(Operation operation) { ) public static ScatterNdUpdate create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdUpdate", scope.makeOpName("ScatterNdUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterNdUpdate")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java index 8dcec648560..af59a6d916c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterSub.java @@ -82,7 +82,7 @@ private ScatterSub(Operation operation) { ) public static ScatterSub create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterSub", scope.makeOpName("ScatterSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterSub")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java index 9e6e6fa106b..0ab648a0619 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ScatterUpdate.java @@ -85,7 +85,7 @@ private ScatterUpdate(Operation operation) { ) public static ScatterUpdate create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScatterUpdate", scope.makeOpName("ScatterUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScatterUpdate")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java index 20e13a1131b..51697076712 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Select.java @@ -63,7 +63,7 @@ private Select(Operation operation) { ) public static Select create(Scope scope, Operand condition, Operand t, Operand e) { - OperationBuilder opBuilder = scope.env().opBuilder("SelectV2", scope.makeOpName("Select")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Select")); opBuilder.addInput(condition.asOutput()); opBuilder.addInput(t.asOutput()); opBuilder.addInput(e.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java index 2a666ce3f1c..6898ac5d212 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Send.java @@ -55,7 +55,7 @@ private Send(Operation operation) { ) public static Send create(Scope scope, Operand tensor, String tensorName, String sendDevice, Long sendDeviceIncarnation, String recvDevice, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Send", scope.makeOpName("Send")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Send")); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("tensor_name", tensorName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java index cfd64e9f8f5..e5279c5d733 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetDiff1d.java @@ -87,7 +87,7 @@ private SetDiff1d(Operation operation) { ) public static SetDiff1d create(Scope scope, Operand x, Operand y, Class outIdx) { - OperationBuilder opBuilder = scope.env().opBuilder("ListDiff", scope.makeOpName("SetDiff1d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetDiff1d")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java index 26a705b8d1f..28bc5ffaf95 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SetSize.java @@ -67,7 +67,7 @@ private SetSize(Operation operation) { ) public static SetSize create(Scope scope, Operand setIndices, Operand setValues, Operand setShape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SetSize", scope.makeOpName("SetSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetSize")); opBuilder.addInput(setIndices.asOutput()); opBuilder.addInput(setValues.asOutput()); opBuilder.addInput(setShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java index 1b111b8643e..90b5b640701 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Shape.java @@ -70,7 +70,7 @@ private Shape(Operation operation) { ) public static Shape create(Scope scope, Operand input, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("Shape", scope.makeOpName("Shape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Shape")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java index ac06776f9fa..ec88a0524eb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ShapeN.java @@ -71,7 +71,7 @@ private ShapeN(Operation operation) { ) public static ShapeN create(Scope scope, Iterable> input, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("ShapeN", scope.makeOpName("ShapeN")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShapeN")); opBuilder.addInputList(Operands.asOutputs(input)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java index d8c5d3fcc88..843ef45b612 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Size.java @@ -71,7 +71,7 @@ private Size(Operation operation) { ) public static Size create(Scope scope, Operand input, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("Size", scope.makeOpName("Size")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Size")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java index 51127563a5b..9798383eac7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Skipgram.java @@ -77,7 +77,7 @@ private Skipgram(Operation operation) { describeByClass = true ) public static Skipgram create(Scope scope, String filename, Long batchSize, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Skipgram", scope.makeOpName("Skipgram")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Skipgram")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("filename", filename); opBuilder.setAttr("batch_size", batchSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java index ec2adda3e4b..7e3167430b7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Slice.java @@ -73,7 +73,7 @@ private Slice(Operation operation) { ) public static Slice create(Scope scope, Operand input, Operand begin, Operand sizeOutput) { - OperationBuilder opBuilder = scope.env().opBuilder("Slice", scope.makeOpName("Slice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Slice")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java index 25c8106b0ac..bf7c137713d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Snapshot.java @@ -59,7 +59,7 @@ private Snapshot(Operation operation) { describeByClass = true ) public static Snapshot create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("Snapshot", scope.makeOpName("Snapshot")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Snapshot")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Snapshot<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java index cc66b8943ee..3e2058a0f29 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SpaceToBatchNd.java @@ -163,7 +163,7 @@ private SpaceToBatchNd(Operation operation) { ) public static SpaceToBatchNd create(Scope scope, Operand input, Operand blockShape, Operand paddings) { - OperationBuilder opBuilder = scope.env().opBuilder("SpaceToBatchND", scope.makeOpName("SpaceToBatchNd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpaceToBatchNd")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(blockShape.asOutput()); opBuilder.addInput(paddings.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java index 98476c4a960..4162d54ea94 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Split.java @@ -71,7 +71,7 @@ private Split(Operation operation) { ) public static Split create(Scope scope, Operand axis, Operand value, Long numSplit) { - OperationBuilder opBuilder = scope.env().opBuilder("Split", scope.makeOpName("Split")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Split")); opBuilder.addInput(axis.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java index b62cb587fa7..78a4d9eeab4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SplitV.java @@ -74,7 +74,7 @@ private SplitV(Operation operation) { ) public static SplitV create(Scope scope, Operand value, Operand sizeSplits, Operand axis, Long numSplit) { - OperationBuilder opBuilder = scope.env().opBuilder("SplitV", scope.makeOpName("SplitV")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SplitV")); opBuilder.addInput(value.asOutput()); opBuilder.addInput(sizeSplits.asOutput()); opBuilder.addInput(axis.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java index 49fe614adec..21b26dccd20 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Squeeze.java @@ -77,7 +77,7 @@ private Squeeze(Operation operation) { ) public static Squeeze create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Squeeze", scope.makeOpName("Squeeze")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Squeeze")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java index 31ff857d014..6e5b987d0bd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stack.java @@ -77,7 +77,7 @@ private Stack(Operation operation) { ) public static Stack create(Scope scope, Iterable> values, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Pack", scope.makeOpName("Stack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Stack")); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java index 527fd5f3c53..ce4d35c9563 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Stage.java @@ -55,7 +55,7 @@ private Stage(Operation operation) { describeByClass = true ) public static Stage create(Scope scope, Iterable> values, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Stage", scope.makeOpName("Stage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Stage")); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java index ba08b758785..76a4c785f31 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageClear.java @@ -54,7 +54,7 @@ private StageClear(Operation operation) { ) public static StageClear create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StageClear", scope.makeOpName("StageClear")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StageClear")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java index b431723eb47..dce04d53f5b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StagePeek.java @@ -70,7 +70,7 @@ private StagePeek(Operation operation) { ) public static StagePeek create(Scope scope, Operand index, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StagePeek", scope.makeOpName("StagePeek")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StagePeek")); opBuilder.addInput(index.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java index 15c77f0f49b..107d54d890e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StageSize.java @@ -61,7 +61,7 @@ private StageSize(Operation operation) { ) public static StageSize create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StageSize", scope.makeOpName("StageSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StageSize")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java index 2ae5a7b5431..ca4fc6a1bf0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StopGradient.java @@ -109,7 +109,7 @@ private StopGradient(Operation operation) { describeByClass = true ) public static StopGradient create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("StopGradient", scope.makeOpName("StopGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StopGradient")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new StopGradient<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java index ea85e807597..7edb1753b86 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSlice.java @@ -172,7 +172,7 @@ private StridedSlice(Operation operation) { ) public static StridedSlice create(Scope scope, Operand input, Operand begin, Operand end, Operand strides, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StridedSlice", scope.makeOpName("StridedSlice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StridedSlice")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(end.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java index b53f429f456..c866bc5bd86 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceAssign.java @@ -73,7 +73,7 @@ private StridedSliceAssign(Operation operation) { public static StridedSliceAssign create(Scope scope, Operand ref, Operand begin, Operand end, Operand strides, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StridedSliceAssign", scope.makeOpName("StridedSliceAssign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StridedSliceAssign")); opBuilder.addInput(ref.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(end.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java index 125b88fb75e..1ad183e57b1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/StridedSliceGrad.java @@ -75,7 +75,7 @@ private StridedSliceGrad(Operation operation) { public static StridedSliceGrad create(Scope scope, Operand shape, Operand begin, Operand end, Operand strides, Operand dy, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StridedSliceGrad", scope.makeOpName("StridedSliceGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StridedSliceGrad")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(end.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java index a0b4d10e4c3..99da35103ef 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Sum.java @@ -68,7 +68,7 @@ private Sum(Operation operation) { ) public static Sum create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Sum", scope.makeOpName("Sum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sum")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java index 38a7ed866d0..10c505712cb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/SwitchCond.java @@ -68,7 +68,7 @@ private SwitchCond(Operation operation) { ) public static SwitchCond create(Scope scope, Operand data, Operand pred) { - OperationBuilder opBuilder = scope.env().opBuilder("Switch", scope.makeOpName("SwitchCond")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SwitchCond")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(pred.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java index 3b87b135172..831d802c12b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TemporaryVariable.java @@ -75,7 +75,7 @@ private TemporaryVariable(Operation operation) { ) public static TemporaryVariable create(Scope scope, Shape shape, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TemporaryVariable", scope.makeOpName("TemporaryVariable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TemporaryVariable")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java index 28fe76db26b..b8b5569c61f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArray.java @@ -69,7 +69,7 @@ private TensorArray(Operation operation) { ) public static TensorArray create(Scope scope, Operand sizeOutput, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayV3", scope.makeOpName("TensorArray")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArray")); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java index 73d7e827b1a..fee13859bc3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayClose.java @@ -53,7 +53,7 @@ private TensorArrayClose(Operation operation) { describeByClass = true ) public static TensorArrayClose create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayCloseV3", scope.makeOpName("TensorArrayClose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayClose")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new TensorArrayClose(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java index e280753d74a..cff4355cd2b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayConcat.java @@ -78,7 +78,7 @@ private TensorArrayConcat(Operation operation) { public static TensorArrayConcat create(Scope scope, Operand handle, Operand flowIn, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayConcatV3", scope.makeOpName("TensorArrayConcat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayConcat")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(flowIn.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java index 31a93247809..a4e2e66c65d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGather.java @@ -70,7 +70,7 @@ private TensorArrayGather(Operation operation) { public static TensorArrayGather create(Scope scope, Operand handle, Operand indices, Operand flowIn, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayGatherV3", scope.makeOpName("TensorArrayGather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayGather")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(flowIn.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java index 5b6984b2ebe..a3c1b3922bb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGrad.java @@ -93,7 +93,7 @@ private TensorArrayGrad(Operation operation) { ) public static TensorArrayGrad create(Scope scope, Operand handle, Operand flowIn, String source) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayGradV3", scope.makeOpName("TensorArrayGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayGrad")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(flowIn.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java index 4c685c48f45..284787874da 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayGradWithShape.java @@ -73,7 +73,7 @@ private TensorArrayGradWithShape(Operation operation) { ) public static TensorArrayGradWithShape create(Scope scope, Operand handle, Operand flowIn, Operand shapeToPrepend, String source) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayGradWithShape", scope.makeOpName("TensorArrayGradWithShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayGradWithShape")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(flowIn.asOutput()); opBuilder.addInput(shapeToPrepend.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java index ee1f21e1d26..fd714faff19 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayPack.java @@ -67,7 +67,7 @@ private TensorArrayPack(Operation operation) { ) public static TensorArrayPack create(Scope scope, Operand handle, Operand flowIn, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayPack", scope.makeOpName("TensorArrayPack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayPack")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(flowIn.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java index 60b34119d6b..bc532f9dfba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayRead.java @@ -67,7 +67,7 @@ private TensorArrayRead(Operation operation) { public static TensorArrayRead create(Scope scope, Operand handle, Operand index, Operand flowIn, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayReadV3", scope.makeOpName("TensorArrayRead")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayRead")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(index.asOutput()); opBuilder.addInput(flowIn.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java index be7ed94d09c..2f0fb588481 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayScatter.java @@ -63,7 +63,7 @@ private TensorArrayScatter(Operation operation) { ) public static TensorArrayScatter create(Scope scope, Operand handle, Operand indices, Operand value, Operand flowIn) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayScatterV3", scope.makeOpName("TensorArrayScatter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayScatter")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(value.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java index 45a377703a5..45eabcee0d5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySize.java @@ -60,7 +60,7 @@ private TensorArraySize(Operation operation) { ) public static TensorArraySize create(Scope scope, Operand handle, Operand flowIn) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArraySizeV3", scope.makeOpName("TensorArraySize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArraySize")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(flowIn.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java index c23f1a1ee13..f361bc23add 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArraySplit.java @@ -72,7 +72,7 @@ private TensorArraySplit(Operation operation) { ) public static TensorArraySplit create(Scope scope, Operand handle, Operand value, Operand lengths, Operand flowIn) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArraySplitV3", scope.makeOpName("TensorArraySplit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArraySplit")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder.addInput(lengths.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java index 8dc2dc2e0f9..d7136201b13 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayUnpack.java @@ -61,7 +61,7 @@ private TensorArrayUnpack(Operation operation) { ) public static TensorArrayUnpack create(Scope scope, Operand handle, Operand value, Operand flowIn) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayUnpack", scope.makeOpName("TensorArrayUnpack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayUnpack")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(value.asOutput()); opBuilder.addInput(flowIn.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java index df16154064f..9e3ffca2eb1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorArrayWrite.java @@ -62,7 +62,7 @@ private TensorArrayWrite(Operation operation) { ) public static TensorArrayWrite create(Scope scope, Operand handle, Operand index, Operand value, Operand flowIn) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayWriteV3", scope.makeOpName("TensorArrayWrite")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorArrayWrite")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(index.asOutput()); opBuilder.addInput(value.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java index 146c951c0df..e1626dedff5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcat.java @@ -80,7 +80,7 @@ private TensorListConcat(Operation operation) { public static TensorListConcat create(Scope scope, Operand inputHandle, Operand elementShape, Operand leadingDims, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListConcatV2", scope.makeOpName("TensorListConcat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListConcat")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(elementShape.asOutput()); opBuilder.addInput(leadingDims.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java index e574d05f613..65a4178818f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListConcatLists.java @@ -62,7 +62,7 @@ private TensorListConcatLists(Operation operation) { ) public static TensorListConcatLists create(Scope scope, Operand inputA, Operand inputB, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListConcatLists", scope.makeOpName("TensorListConcatLists")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListConcatLists")); opBuilder.addInput(inputA.asOutput()); opBuilder.addInput(inputB.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java index dd5910d8d2e..f11f7ba92b8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListElementShape.java @@ -65,7 +65,7 @@ private TensorListElementShape(Operation operation) { ) public static TensorListElementShape create(Scope scope, Operand inputHandle, Class shapeType) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListElementShape", scope.makeOpName("TensorListElementShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListElementShape")); opBuilder.addInput(inputHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape_type", Operands.toDataType(shapeType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java index 12ae7a9ed70..e648b9e7925 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListFromTensor.java @@ -63,7 +63,7 @@ private TensorListFromTensor(Operation operation) { ) public static TensorListFromTensor create(Scope scope, Operand tensor, Operand elementShape) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListFromTensor", scope.makeOpName("TensorListFromTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListFromTensor")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(elementShape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java index bae8f1b33da..b621bc1b849 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGather.java @@ -71,7 +71,7 @@ private TensorListGather(Operation operation) { public static TensorListGather create(Scope scope, Operand inputHandle, Operand indices, Operand elementShape, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListGather", scope.makeOpName("TensorListGather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListGather")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(elementShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java index 4d7eba7bbfa..8e60428450d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListGetItem.java @@ -66,7 +66,7 @@ private TensorListGetItem(Operation operation) { public static TensorListGetItem create(Scope scope, Operand inputHandle, Operand index, Operand elementShape, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListGetItem", scope.makeOpName("TensorListGetItem")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListGetItem")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(index.asOutput()); opBuilder.addInput(elementShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java index 5614497942b..b1ffcaf318b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListLength.java @@ -59,7 +59,7 @@ private TensorListLength(Operation operation) { describeByClass = true ) public static TensorListLength create(Scope scope, Operand inputHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListLength", scope.makeOpName("TensorListLength")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListLength")); opBuilder.addInput(inputHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new TensorListLength(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java index 6926cbf92da..26803f6c969 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPopBack.java @@ -73,7 +73,7 @@ private TensorListPopBack(Operation operation) { ) public static TensorListPopBack create(Scope scope, Operand inputHandle, Operand elementShape, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListPopBack", scope.makeOpName("TensorListPopBack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListPopBack")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(elementShape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java index 6df4b4e1ff4..f8430d78de1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBack.java @@ -64,7 +64,7 @@ private TensorListPushBack(Operation operation) { ) public static TensorListPushBack create(Scope scope, Operand inputHandle, Operand tensor) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListPushBack", scope.makeOpName("TensorListPushBack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListPushBack")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java index 4191773ce8f..a2422a7eb8a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListPushBackBatch.java @@ -59,7 +59,7 @@ private TensorListPushBackBatch(Operation operation) { ) public static TensorListPushBackBatch create(Scope scope, Operand inputHandles, Operand tensor) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListPushBackBatch", scope.makeOpName("TensorListPushBackBatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListPushBackBatch")); opBuilder.addInput(inputHandles.asOutput()); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java index 9ab261d5b39..003cf6a7398 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListReserve.java @@ -68,7 +68,7 @@ private TensorListReserve(Operation operation) { ) public static TensorListReserve create(Scope scope, Operand elementShape, Operand numElements, Class elementDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListReserve", scope.makeOpName("TensorListReserve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListReserve")); opBuilder.addInput(elementShape.asOutput()); opBuilder.addInput(numElements.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java index ba395731c15..f22b6c53912 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListResize.java @@ -62,7 +62,7 @@ private TensorListResize(Operation operation) { ) public static TensorListResize create(Scope scope, Operand inputHandle, Operand sizeOutput) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListResize", scope.makeOpName("TensorListResize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListResize")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java index 8bd16951d66..84f160b19a0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatter.java @@ -74,7 +74,7 @@ private TensorListScatter(Operation operation) { public static TensorListScatter create(Scope scope, Operand tensor, Operand indices, Operand elementShape, Operand numElements) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListScatterV2", scope.makeOpName("TensorListScatter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListScatter")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(elementShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java index 68dba6e4b53..507d14a13b5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListScatterIntoExistingList.java @@ -68,7 +68,7 @@ private TensorListScatterIntoExistingList(Operation operation) { public static TensorListScatterIntoExistingList create(Scope scope, Operand inputHandle, Operand tensor, Operand indices) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListScatterIntoExistingList", scope.makeOpName("TensorListScatterIntoExistingList")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListScatterIntoExistingList")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java index ba7ef3ae22a..02a21f13825 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSetItem.java @@ -61,7 +61,7 @@ private TensorListSetItem(Operation operation) { ) public static TensorListSetItem create(Scope scope, Operand inputHandle, Operand index, Operand item) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListSetItem", scope.makeOpName("TensorListSetItem")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListSetItem")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(index.asOutput()); opBuilder.addInput(item.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java index 2ca49751954..d25f9951ad7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListSplit.java @@ -68,7 +68,7 @@ private TensorListSplit(Operation operation) { ) public static TensorListSplit create(Scope scope, Operand tensor, Operand elementShape, Operand lengths) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListSplit", scope.makeOpName("TensorListSplit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListSplit")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(elementShape.asOutput()); opBuilder.addInput(lengths.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java index 9d6b475d625..7c52d4a45b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorListStack.java @@ -70,7 +70,7 @@ private TensorListStack(Operation operation) { public static TensorListStack create(Scope scope, Operand inputHandle, Operand elementShape, Class elementDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorListStack", scope.makeOpName("TensorListStack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorListStack")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(elementShape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java index 6a5eac721ef..83fa8e612f5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapErase.java @@ -65,7 +65,7 @@ private TensorMapErase(Operation operation) { ) public static TensorMapErase create(Scope scope, Operand inputHandle, Operand key, Class valueDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorMapErase", scope.makeOpName("TensorMapErase")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapErase")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java index c02b3f84543..ce03b661d5f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapHasKey.java @@ -62,7 +62,7 @@ private TensorMapHasKey(Operation operation) { ) public static TensorMapHasKey create(Scope scope, Operand inputHandle, Operand key) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorMapHasKey", scope.makeOpName("TensorMapHasKey")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapHasKey")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java index 5b08049cf5f..903d39736c7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapInsert.java @@ -64,7 +64,7 @@ private TensorMapInsert(Operation operation) { ) public static TensorMapInsert create(Scope scope, Operand inputHandle, Operand key, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorMapInsert", scope.makeOpName("TensorMapInsert")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapInsert")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder.addInput(value.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java index 69ebb676047..be0682edec5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapLookup.java @@ -66,7 +66,7 @@ private TensorMapLookup(Operation operation) { ) public static TensorMapLookup create(Scope scope, Operand inputHandle, Operand key, Class valueDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorMapLookup", scope.makeOpName("TensorMapLookup")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapLookup")); opBuilder.addInput(inputHandle.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java index 6aa230ce27c..31d7d712ac6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapSize.java @@ -59,7 +59,7 @@ private TensorMapSize(Operation operation) { describeByClass = true ) public static TensorMapSize create(Scope scope, Operand inputHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorMapSize", scope.makeOpName("TensorMapSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapSize")); opBuilder.addInput(inputHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new TensorMapSize(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java index 5d7ca8458f1..eb57059c093 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorMapStackKeys.java @@ -64,7 +64,7 @@ private TensorMapStackKeys(Operation operation) { ) public static TensorMapStackKeys create(Scope scope, Operand inputHandle, Class keyDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorMapStackKeys", scope.makeOpName("TensorMapStackKeys")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorMapStackKeys")); opBuilder.addInput(inputHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("key_dtype", Operands.toDataType(keyDtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java index 7059f28795a..8e105625cb7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdAdd.java @@ -119,7 +119,7 @@ private TensorScatterNdAdd(Operation operation) { ) public static TensorScatterNdAdd create(Scope scope, Operand tensor, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterAdd", scope.makeOpName("TensorScatterNdAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdAdd")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java index 5c0b720df48..3bf063821f3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMax.java @@ -63,7 +63,7 @@ private TensorScatterNdMax(Operation operation) { ) public static TensorScatterNdMax create(Scope scope, Operand tensor, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterMax", scope.makeOpName("TensorScatterNdMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdMax")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java index 68ca6569d4a..4f81fbdb4c4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdMin.java @@ -63,7 +63,7 @@ private TensorScatterNdMin(Operation operation) { ) public static TensorScatterNdMin create(Scope scope, Operand tensor, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterMin", scope.makeOpName("TensorScatterNdMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdMin")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java index b5748556821..8a0c995c50e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdSub.java @@ -118,7 +118,7 @@ private TensorScatterNdSub(Operation operation) { ) public static TensorScatterNdSub create(Scope scope, Operand tensor, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterSub", scope.makeOpName("TensorScatterNdSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdSub")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java index dd6a9c5b775..d62c4ccf4f1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorScatterNdUpdate.java @@ -92,7 +92,7 @@ private TensorScatterNdUpdate(Operation operation) { ) public static TensorScatterNdUpdate create(Scope scope, Operand tensor, Operand indices, Operand updates) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterUpdate", scope.makeOpName("TensorScatterNdUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorScatterNdUpdate")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java index 00fcc69e613..5fab7af8134 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorStridedSliceUpdate.java @@ -73,7 +73,7 @@ private TensorStridedSliceUpdate(Operation operation) { public static TensorStridedSliceUpdate create(Scope scope, Operand input, Operand begin, Operand end, Operand strides, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorStridedSliceUpdate", scope.makeOpName("TensorStridedSliceUpdate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorStridedSliceUpdate")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(end.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java index c2c290787a4..b675f1e3375 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Tile.java @@ -93,7 +93,7 @@ private Tile(Operation operation) { ) public static Tile create(Scope scope, Operand input, Operand multiples) { - OperationBuilder opBuilder = scope.env().opBuilder("Tile", scope.makeOpName("Tile")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Tile")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(multiples.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java index 200a3627235..cae24f7dee1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Timestamp.java @@ -58,7 +58,7 @@ private Timestamp(Operation operation) { describeByClass = true ) public static Timestamp create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("Timestamp", scope.makeOpName("Timestamp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Timestamp")); opBuilder = scope.apply(opBuilder); return new Timestamp(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java index 0e74b1a7745..ed6c6344bff 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKUnique.java @@ -73,7 +73,7 @@ private TopKUnique(Operation operation) { describeByClass = true ) public static TopKUnique create(Scope scope, Operand input, Long k) { - OperationBuilder opBuilder = scope.env().opBuilder("TopKUnique", scope.makeOpName("TopKUnique")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TopKUnique")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("k", k); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java index 89b0c4ea5dc..571faba5d2e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TopKWithUnique.java @@ -66,7 +66,7 @@ private TopKWithUnique(Operation operation) { describeByClass = true ) public static TopKWithUnique create(Scope scope, Operand input, Long k) { - OperationBuilder opBuilder = scope.env().opBuilder("TopKWithUnique", scope.makeOpName("TopKWithUnique")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TopKWithUnique")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("k", k); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java index cc4c9cbcfba..ec0ea5bacb7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unbatch.java @@ -82,7 +82,7 @@ private Unbatch(Operation operation) { ) public static Unbatch create(Scope scope, Operand batchedTensor, Operand batchIndex, Operand id, Long timeoutMicros, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Unbatch", scope.makeOpName("Unbatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unbatch")); opBuilder.addInput(batchedTensor.asOutput()); opBuilder.addInput(batchIndex.asOutput()); opBuilder.addInput(id.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java index 910bc87c3fc..7f91db16730 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnbatchGrad.java @@ -78,7 +78,7 @@ private UnbatchGrad(Operation operation) { ) public static UnbatchGrad create(Scope scope, Operand originalInput, Operand batchIndex, Operand grad, Operand id, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UnbatchGrad", scope.makeOpName("UnbatchGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnbatchGrad")); opBuilder.addInput(originalInput.asOutput()); opBuilder.addInput(batchIndex.asOutput()); opBuilder.addInput(grad.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java index 59bce512c2a..c7defd3c68e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unique.java @@ -108,7 +108,7 @@ private Unique(Operation operation) { ) public static Unique create(Scope scope, Operand x, Operand axis, Class outIdx) { - OperationBuilder opBuilder = scope.env().opBuilder("UniqueV2", scope.makeOpName("Unique")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unique")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java index 54a7e8b4e54..d13f73f2434 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UniqueWithCounts.java @@ -115,7 +115,7 @@ private UniqueWithCounts(Operation operation) { ) public static UniqueWithCounts create(Scope scope, Operand x, Operand axis, Class outIdx) { - OperationBuilder opBuilder = scope.env().opBuilder("UniqueWithCountsV2", scope.makeOpName("UniqueWithCounts")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniqueWithCounts")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java index 23a2f0b3f5f..e2529c9468f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UnravelIndex.java @@ -80,7 +80,7 @@ private UnravelIndex(Operation operation) { ) public static UnravelIndex create(Scope scope, Operand indices, Operand dims) { - OperationBuilder opBuilder = scope.env().opBuilder("UnravelIndex", scope.makeOpName("UnravelIndex")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnravelIndex")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(dims.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java index 64940b36cee..7d2ac838859 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstack.java @@ -77,7 +77,7 @@ private Unstack(Operation operation) { ) public static Unstack create(Scope scope, Operand value, Long num, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Unpack", scope.makeOpName("Unstack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unstack")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num", num); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java index 6daf9ee8b21..36a6a6eedc3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Unstage.java @@ -67,7 +67,7 @@ private Unstage(Operation operation) { ) public static Unstage create(Scope scope, List> dtypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Unstage", scope.makeOpName("Unstage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Unstage")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java index 7764cc2220b..8e03195ee42 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/UpperBound.java @@ -78,7 +78,7 @@ private UpperBound(Operation operation) { ) public static UpperBound create(Scope scope, Operand sortedInputs, Operand values, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("UpperBound", scope.makeOpName("UpperBound")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UpperBound")); opBuilder.addInput(sortedInputs.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java index a5bef8a017d..8aaf4953410 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarHandleOp.java @@ -66,7 +66,7 @@ private VarHandleOp(Operation operation) { ) public static VarHandleOp create(Scope scope, Class dtype, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("VarHandleOp", scope.makeOpName("VarHandleOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("VarHandleOp")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java index 708a550be11..2dacf759b88 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VarIsInitializedOp.java @@ -57,7 +57,7 @@ private VarIsInitializedOp(Operation operation) { describeByClass = true ) public static VarIsInitializedOp create(Scope scope, Operand resource) { - OperationBuilder opBuilder = scope.env().opBuilder("VarIsInitializedOp", scope.makeOpName("VarIsInitializedOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("VarIsInitializedOp")); opBuilder.addInput(resource.asOutput()); opBuilder = scope.apply(opBuilder); return new VarIsInitializedOp(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java index 8fd5c10363e..ac2d7bb369a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Variable.java @@ -67,7 +67,7 @@ private Variable(Operation operation) { ) public static Variable create(Scope scope, Shape shape, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("VariableV2", scope.makeOpName("Variable")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Variable")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java index 57d31b78299..b2c21f4238a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/VariableShape.java @@ -70,7 +70,7 @@ private VariableShape(Operation operation) { ) public static VariableShape create(Scope scope, Operand input, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("VariableShape", scope.makeOpName("VariableShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("VariableShape")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java index 0a7dd998332..a3323a8d5d5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Where.java @@ -114,7 +114,7 @@ private Where(Operation operation) { describeByClass = true ) public static Where create(Scope scope, Operand condition) { - OperationBuilder opBuilder = scope.env().opBuilder("Where", scope.makeOpName("Where")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Where")); opBuilder.addInput(condition.asOutput()); opBuilder = scope.apply(opBuilder); return new Where(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaConvV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaConvV2.java index 529a0d092c6..fe95ace9832 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaConvV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaConvV2.java @@ -77,7 +77,7 @@ public static XlaConvV2 create(Scope sco Operand padding, Operand lhsDilation, Operand rhsDilation, Operand featureGroupCount, String dimensionNumbers, String precisionConfig, Class preferredElementType) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaConvV2", scope.makeOpName("XlaConvV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaConvV2")); opBuilder.addInput(lhs.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder.addInput(windowStrides.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaDotV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaDotV2.java index de90ac10d8e..6d94739df68 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaDotV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaDotV2.java @@ -68,7 +68,7 @@ private XlaDotV2(Operation operation) { public static XlaDotV2 create(Scope scope, Operand lhs, Operand rhs, String dimensionNumbers, String precisionConfig, Class preferredElementType) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaDotV2", scope.makeOpName("XlaDotV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaDotV2")); opBuilder.addInput(lhs.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSetDynamicDimensionSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSetDynamicDimensionSize.java index 0fcb7229afa..2ab7f6605ab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSetDynamicDimensionSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSetDynamicDimensionSize.java @@ -67,7 +67,7 @@ private XlaSetDynamicDimensionSize(Operation operation) { ) public static XlaSetDynamicDimensionSize create(Scope scope, Operand input, Operand dimIndex, Operand sizeOutput) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSetDynamicDimensionSize", scope.makeOpName("XlaSetDynamicDimensionSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSetDynamicDimensionSize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(dimIndex.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdFullToShardShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdFullToShardShape.java index cbb7a734ee0..cedee394b63 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdFullToShardShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdFullToShardShape.java @@ -65,7 +65,7 @@ private XlaSpmdFullToShardShape(Operation operation) { ) public static XlaSpmdFullToShardShape create(Scope scope, Operand input, String manualSharding) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSpmdFullToShardShape", scope.makeOpName("XlaSpmdFullToShardShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSpmdFullToShardShape")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("manual_sharding", manualSharding); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdShardToFullShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdShardToFullShape.java index d2c177cb22e..dc5e3de5834 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdShardToFullShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/XlaSpmdShardToFullShape.java @@ -66,7 +66,7 @@ private XlaSpmdShardToFullShape(Operation operation) { ) public static XlaSpmdShardToFullShape create(Scope scope, Operand input, String manualSharding, Shape fullShape) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSpmdShardToFullShape", scope.makeOpName("XlaSpmdShardToFullShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSpmdShardToFullShape")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("manual_sharding", manualSharding); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java index 2b95580be17..3a0da9958cc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/ZerosLike.java @@ -59,7 +59,7 @@ private ZerosLike(Operation operation) { describeByClass = true ) public static ZerosLike create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("ZerosLike", scope.makeOpName("ZerosLike")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ZerosLike")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new ZerosLike<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java index d9ea90b5f0a..fc728c1439c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousIterator.java @@ -66,7 +66,7 @@ private AnonymousIterator(Operation operation) { ) public static AnonymousIterator create(Scope scope, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("AnonymousIteratorV2", scope.makeOpName("AnonymousIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousIterator")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); Shape[] outputShapesArray = new Shape[outputShapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java index 6f1bf3d4e27..438e8eb4374 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMemoryCache.java @@ -56,7 +56,7 @@ private AnonymousMemoryCache(Operation operation) { describeByClass = true ) public static AnonymousMemoryCache create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("AnonymousMemoryCache", scope.makeOpName("AnonymousMemoryCache")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousMemoryCache")); opBuilder = scope.apply(opBuilder); return new AnonymousMemoryCache(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java index b398bba3165..ccccad32cf8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AnonymousMultiDeviceIterator.java @@ -63,7 +63,7 @@ private AnonymousMultiDeviceIterator(Operation operation) { ) public static AnonymousMultiDeviceIterator create(Scope scope, List devices, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("AnonymousMultiDeviceIterator", scope.makeOpName("AnonymousMultiDeviceIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousMultiDeviceIterator")); opBuilder = scope.apply(opBuilder); String[] devicesArray = new String[devices.size()]; for (int i = 0 ; i < devicesArray.length ; i++) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java index 683782d9c29..55d04a508aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AssertNextDataset.java @@ -73,7 +73,7 @@ private AssertNextDataset(Operation operation) { public static AssertNextDataset create(Scope scope, Operand inputDataset, Operand transformations, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("AssertNextDataset", scope.makeOpName("AssertNextDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertNextDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(transformations.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java index a635d219ea0..901aa906739 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/AutoShardDataset.java @@ -72,7 +72,7 @@ private AutoShardDataset(Operation operation) { public static AutoShardDataset create(Scope scope, Operand inputDataset, Operand numWorkers, Operand index, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AutoShardDataset", scope.makeOpName("AutoShardDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AutoShardDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numWorkers.asOutput()); opBuilder.addInput(index.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java index 5e04312b18c..b58045697f4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BatchDataset.java @@ -72,7 +72,7 @@ private BatchDataset(Operation operation) { public static BatchDataset create(Scope scope, Operand inputDataset, Operand batchSize, Operand dropRemainder, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchDatasetV2", scope.makeOpName("BatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(batchSize.asOutput()); opBuilder.addInput(dropRemainder.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java index 8bf3d9de786..d2965b028d7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/BytesProducedStatsDataset.java @@ -63,7 +63,7 @@ private BytesProducedStatsDataset(Operation operation) { ) public static BytesProducedStatsDataset create(Scope scope, Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("BytesProducedStatsDataset", scope.makeOpName("BytesProducedStatsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BytesProducedStatsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(tag.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java index 2a04eeb6acd..6eaaf8f621c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDataset.java @@ -73,7 +73,7 @@ public static CSVDataset create(Scope scope, Operand filenames, Operand compressionType, Operand bufferSize, Operand header, Operand fieldDelim, Operand useQuoteDelim, Operand naValue, Operand selectCols, Iterable> recordDefaults, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("CSVDataset", scope.makeOpName("CSVDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSVDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder.addInput(compressionType.asOutput()); opBuilder.addInput(bufferSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDatasetV2.java index 871994f4416..47db26f6dd6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDatasetV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CSVDatasetV2.java @@ -75,7 +75,7 @@ public static CSVDatasetV2 create(Scope scope, Operand filenames, Operand fieldDelim, Operand useQuoteDelim, Operand naValue, Operand selectCols, Iterable> recordDefaults, Operand excludeCols, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("CSVDatasetV2", scope.makeOpName("CSVDatasetV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSVDatasetV2")); opBuilder.addInput(filenames.asOutput()); opBuilder.addInput(compressionType.asOutput()); opBuilder.addInput(bufferSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java index 3552ddc829f..b610b7af19a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDataset.java @@ -69,7 +69,7 @@ private CacheDataset(Operation operation) { public static CacheDataset create(Scope scope, Operand inputDataset, Operand filename, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("CacheDataset", scope.makeOpName("CacheDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CacheDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(filename.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDatasetV2.java index 0d9a3da0312..60b371e0f4c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDatasetV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/CacheDatasetV2.java @@ -65,7 +65,7 @@ private CacheDatasetV2(Operation operation) { public static CacheDatasetV2 create(Scope scope, Operand inputDataset, Operand filename, Operand cache, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("CacheDatasetV2", scope.makeOpName("CacheDatasetV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CacheDatasetV2")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(filename.asOutput()); opBuilder.addInput(cache.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java index b6ed6fa0598..d91ed316fe5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ChooseFastestDataset.java @@ -63,7 +63,7 @@ private ChooseFastestDataset(Operation operation) { public static ChooseFastestDataset create(Scope scope, Iterable> inputDatasets, Long numExperiments, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ChooseFastestDataset", scope.makeOpName("ChooseFastestDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ChooseFastestDataset")); opBuilder.addInputList(Operands.asOutputs(inputDatasets)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_experiments", numExperiments); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java index c5193836610..5e692b0fbc8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ConcatenateDataset.java @@ -67,7 +67,7 @@ private ConcatenateDataset(Operation operation) { public static ConcatenateDataset create(Scope scope, Operand inputDataset, Operand anotherDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ConcatenateDataset", scope.makeOpName("ConcatenateDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConcatenateDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(anotherDataset.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java index 69fa37fb80e..2d1b8a24ba5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetCardinality.java @@ -56,7 +56,7 @@ private DatasetCardinality(Operation operation) { describeByClass = true ) public static DatasetCardinality create(Scope scope, Operand inputDataset) { - OperationBuilder opBuilder = scope.env().opBuilder("DatasetCardinality", scope.makeOpName("DatasetCardinality")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetCardinality")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); return new DatasetCardinality(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java index 3961ea15eab..0064b4a1efa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetFromGraph.java @@ -57,7 +57,7 @@ private DatasetFromGraph(Operation operation) { describeByClass = true ) public static DatasetFromGraph create(Scope scope, Operand graphDef) { - OperationBuilder opBuilder = scope.env().opBuilder("DatasetFromGraph", scope.makeOpName("DatasetFromGraph")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetFromGraph")); opBuilder.addInput(graphDef.asOutput()); opBuilder = scope.apply(opBuilder); return new DatasetFromGraph(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java index 1d0681e31e4..1f550abaf7d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToGraph.java @@ -58,7 +58,7 @@ private DatasetToGraph(Operation operation) { ) public static DatasetToGraph create(Scope scope, Operand inputDataset, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DatasetToGraphV2", scope.makeOpName("DatasetToGraph")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToGraph")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java index c3ebfccb906..dffd7bebf02 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToSingleElement.java @@ -65,7 +65,7 @@ private DatasetToSingleElement(Operation operation) { ) public static DatasetToSingleElement create(Scope scope, Operand dataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("DatasetToSingleElement", scope.makeOpName("DatasetToSingleElement")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToSingleElement")); opBuilder.addInput(dataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java index d3cd2a4d8a0..4ccdc21bafa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DatasetToTfRecord.java @@ -54,7 +54,7 @@ private DatasetToTfRecord(Operation operation) { ) public static DatasetToTfRecord create(Scope scope, Operand inputDataset, Operand filename, Operand compressionType) { - OperationBuilder opBuilder = scope.env().opBuilder("DatasetToTFRecord", scope.makeOpName("DatasetToTfRecord")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToTfRecord")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(filename.asOutput()); opBuilder.addInput(compressionType.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java index a57a205c616..ce6cc297f2f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteIterator.java @@ -55,7 +55,7 @@ private DeleteIterator(Operation operation) { ) public static DeleteIterator create(Scope scope, Operand handle, Operand deleter) { - OperationBuilder opBuilder = scope.env().opBuilder("DeleteIterator", scope.makeOpName("DeleteIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteIterator")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(deleter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java index 3fd27f09429..80dab58ffca 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMemoryCache.java @@ -51,7 +51,7 @@ private DeleteMemoryCache(Operation operation) { ) public static DeleteMemoryCache create(Scope scope, Operand handle, Operand deleter) { - OperationBuilder opBuilder = scope.env().opBuilder("DeleteMemoryCache", scope.makeOpName("DeleteMemoryCache")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteMemoryCache")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(deleter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java index a8dcedb5ecb..9dc5f5aef82 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeleteMultiDeviceIterator.java @@ -54,7 +54,7 @@ private DeleteMultiDeviceIterator(Operation operation) { public static DeleteMultiDeviceIterator create(Scope scope, Operand multiDeviceIterator, Iterable> iterators, Operand deleter) { - OperationBuilder opBuilder = scope.env().opBuilder("DeleteMultiDeviceIterator", scope.makeOpName("DeleteMultiDeviceIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteMultiDeviceIterator")); opBuilder.addInput(multiDeviceIterator.asOutput()); opBuilder.addInputList(Operands.asOutputs(iterators)); opBuilder.addInput(deleter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java index 6389138e683..07d490b1008 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DenseToSparseBatchDataset.java @@ -68,7 +68,7 @@ private DenseToSparseBatchDataset(Operation operation) { public static DenseToSparseBatchDataset create(Scope scope, Operand inputDataset, Operand batchSize, Operand rowShape, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("DenseToSparseBatchDataset", scope.makeOpName("DenseToSparseBatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToSparseBatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(batchSize.asOutput()); opBuilder.addInput(rowShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java index ccd8e16d9df..0a408b40593 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DeserializeIterator.java @@ -56,7 +56,7 @@ private DeserializeIterator(Operation operation) { ) public static DeserializeIterator create(Scope scope, Operand resourceHandle, Operand serialized) { - OperationBuilder opBuilder = scope.env().opBuilder("DeserializeIterator", scope.makeOpName("DeserializeIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeserializeIterator")); opBuilder.addInput(resourceHandle.asOutput()); opBuilder.addInput(serialized.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java index cd1cef1a070..5f4f262a18c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/DirectedInterleaveDataset.java @@ -66,7 +66,7 @@ public static DirectedInterleaveDataset create(Scope scope, Operand selectorInputDataset, Iterable> dataInputDatasets, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("DirectedInterleaveDataset", scope.makeOpName("DirectedInterleaveDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DirectedInterleaveDataset")); opBuilder.addInput(selectorInputDataset.asOutput()); opBuilder.addInputList(Operands.asOutputs(dataInputDatasets)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java index 44b4b08a329..22ef6836c25 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FilterByLastComponentDataset.java @@ -62,7 +62,7 @@ private FilterByLastComponentDataset(Operation operation) { public static FilterByLastComponentDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("FilterByLastComponentDataset", scope.makeOpName("FilterByLastComponentDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FilterByLastComponentDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java index 8d1f567c391..6c5f4ec9fec 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/FixedLengthRecordDataset.java @@ -64,7 +64,7 @@ private FixedLengthRecordDataset(Operation operation) { public static FixedLengthRecordDataset create(Scope scope, Operand filenames, Operand headerBytes, Operand recordBytes, Operand footerBytes, Operand bufferSize, Operand compressionType) { - OperationBuilder opBuilder = scope.env().opBuilder("FixedLengthRecordDatasetV2", scope.makeOpName("FixedLengthRecordDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FixedLengthRecordDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder.addInput(headerBytes.asOutput()); opBuilder.addInput(recordBytes.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java index 334d2d7ad11..152d5696a91 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IgnoreErrorsDataset.java @@ -62,7 +62,7 @@ private IgnoreErrorsDataset(Operation operation) { ) public static IgnoreErrorsDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("IgnoreErrorsDataset", scope.makeOpName("IgnoreErrorsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IgnoreErrorsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java index 79f20eff235..b57533279cd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/InitializeTableFromDataset.java @@ -51,7 +51,7 @@ private InitializeTableFromDataset(Operation operation) { ) public static InitializeTableFromDataset create(Scope scope, Operand tableHandle, Operand dataset) { - OperationBuilder opBuilder = scope.env().opBuilder("InitializeTableFromDataset", scope.makeOpName("InitializeTableFromDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InitializeTableFromDataset")); opBuilder.addInput(tableHandle.asOutput()); opBuilder.addInput(dataset.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java index 3b3b3a04f6b..8bd9e126fc0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/Iterator.java @@ -66,7 +66,7 @@ private Iterator(Operation operation) { ) public static Iterator create(Scope scope, String sharedName, String container, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorV2", scope.makeOpName("Iterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Iterator")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shared_name", sharedName); opBuilder.setAttr("container", container); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java index c218c81909d..cc39d3cf4ab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorFromStringHandle.java @@ -63,7 +63,7 @@ private IteratorFromStringHandle(Operation operation) { ) public static IteratorFromStringHandle create(Scope scope, Operand stringHandle, List> outputTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorFromStringHandleV2", scope.makeOpName("IteratorFromStringHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorFromStringHandle")); opBuilder.addInput(stringHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java index 7a7c2bf2652..361ea83a46f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetDevice.java @@ -55,7 +55,7 @@ private IteratorGetDevice(Operation operation) { describeByClass = true ) public static IteratorGetDevice create(Scope scope, Operand resource) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetDevice", scope.makeOpName("IteratorGetDevice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetDevice")); opBuilder.addInput(resource.asOutput()); opBuilder = scope.apply(opBuilder); return new IteratorGetDevice(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java index e40b54a0426..03a19599760 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNext.java @@ -69,7 +69,7 @@ private IteratorGetNext(Operation operation) { ) public static IteratorGetNext create(Scope scope, Operand iterator, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetNext", scope.makeOpName("IteratorGetNext")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetNext")); opBuilder.addInput(iterator.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java index 1507334e561..250b712fec8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextAsOptional.java @@ -65,7 +65,7 @@ private IteratorGetNextAsOptional(Operation operation) { ) public static IteratorGetNextAsOptional create(Scope scope, Operand iterator, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetNextAsOptional", scope.makeOpName("IteratorGetNextAsOptional")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetNextAsOptional")); opBuilder.addInput(iterator.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java index 5fa4809cc6d..0d011980d25 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorGetNextSync.java @@ -73,7 +73,7 @@ private IteratorGetNextSync(Operation operation) { ) public static IteratorGetNextSync create(Scope scope, Operand iterator, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetNextSync", scope.makeOpName("IteratorGetNextSync")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetNextSync")); opBuilder.addInput(iterator.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java index ad1d7422cc4..418f2f385a8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/IteratorToStringHandle.java @@ -60,7 +60,7 @@ private IteratorToStringHandle(Operation operation) { ) public static IteratorToStringHandle create(Scope scope, Operand resourceHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("IteratorToStringHandle", scope.makeOpName("IteratorToStringHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorToStringHandle")); opBuilder.addInput(resourceHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new IteratorToStringHandle(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java index 0ed1d8ddf75..77d37448de1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LMDBDataset.java @@ -71,7 +71,7 @@ private LMDBDataset(Operation operation) { ) public static LMDBDataset create(Scope scope, Operand filenames, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("LMDBDataset", scope.makeOpName("LMDBDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LMDBDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java index 7e890e8429b..29256f43c80 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LatencyStatsDataset.java @@ -63,7 +63,7 @@ private LatencyStatsDataset(Operation operation) { ) public static LatencyStatsDataset create(Scope scope, Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("LatencyStatsDataset", scope.makeOpName("LatencyStatsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LatencyStatsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(tag.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java index 032522050f3..1377b71eefd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/LeakyReluGrad.java @@ -61,7 +61,7 @@ private LeakyReluGrad(Operation operation) { ) public static LeakyReluGrad create(Scope scope, Operand gradients, Operand features, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LeakyReluGrad", scope.makeOpName("LeakyReluGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LeakyReluGrad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java index 446caa5aca2..755c99bc39d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MakeIterator.java @@ -57,7 +57,7 @@ private MakeIterator(Operation operation) { ) public static MakeIterator create(Scope scope, Operand dataset, Operand iterator) { - OperationBuilder opBuilder = scope.env().opBuilder("MakeIterator", scope.makeOpName("MakeIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MakeIterator")); opBuilder.addInput(dataset.asOutput()); opBuilder.addInput(iterator.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java index b8926e6bbb2..a4fefc83572 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MatchingFilesDataset.java @@ -56,7 +56,7 @@ private MatchingFilesDataset(Operation operation) { describeByClass = true ) public static MatchingFilesDataset create(Scope scope, Operand patterns) { - OperationBuilder opBuilder = scope.env().opBuilder("MatchingFilesDataset", scope.makeOpName("MatchingFilesDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatchingFilesDataset")); opBuilder.addInput(patterns.asOutput()); opBuilder = scope.apply(opBuilder); return new MatchingFilesDataset(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java index d99b31adb6a..b63d4d577e3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MaxIntraOpParallelismDataset.java @@ -64,7 +64,7 @@ private MaxIntraOpParallelismDataset(Operation operation) { public static MaxIntraOpParallelismDataset create(Scope scope, Operand inputDataset, Operand maxIntraOpParallelism, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxIntraOpParallelismDataset", scope.makeOpName("MaxIntraOpParallelismDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxIntraOpParallelismDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(maxIntraOpParallelism.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java index 4bbafbc1e02..4133f57bddf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ModelDataset.java @@ -63,7 +63,7 @@ private ModelDataset(Operation operation) { ) public static ModelDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ModelDataset", scope.makeOpName("ModelDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ModelDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java index 89552a58475..082aaea89c8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIterator.java @@ -65,7 +65,7 @@ private MultiDeviceIterator(Operation operation) { ) public static MultiDeviceIterator create(Scope scope, List devices, String sharedName, String container, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIterator", scope.makeOpName("MultiDeviceIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIterator")); opBuilder = scope.apply(opBuilder); String[] devicesArray = new String[devices.size()]; for (int i = 0 ; i < devicesArray.length ; i++) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java index 58cf8dd6a46..d9594a04d06 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorFromStringHandle.java @@ -63,7 +63,7 @@ private MultiDeviceIteratorFromStringHandle(Operation operation) { ) public static MultiDeviceIteratorFromStringHandle create(Scope scope, Operand stringHandle, List> outputTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorFromStringHandle", scope.makeOpName("MultiDeviceIteratorFromStringHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorFromStringHandle")); opBuilder.addInput(stringHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java index bd70cf3d33c..2c422c4872b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorGetNextFromShard.java @@ -71,7 +71,7 @@ public static MultiDeviceIteratorGetNextFromShard create(Scope scope, Operand multiDeviceIterator, Operand shardNum, Operand incarnationId, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorGetNextFromShard", scope.makeOpName("MultiDeviceIteratorGetNextFromShard")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorGetNextFromShard")); opBuilder.addInput(multiDeviceIterator.asOutput()); opBuilder.addInput(shardNum.asOutput()); opBuilder.addInput(incarnationId.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java index e6f41f1c6e3..6b9db31cb82 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorInit.java @@ -58,7 +58,7 @@ private MultiDeviceIteratorInit(Operation operation) { ) public static MultiDeviceIteratorInit create(Scope scope, Operand dataset, Operand multiDeviceIterator, Operand maxBufferSize) { - OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorInit", scope.makeOpName("MultiDeviceIteratorInit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorInit")); opBuilder.addInput(dataset.asOutput()); opBuilder.addInput(multiDeviceIterator.asOutput()); opBuilder.addInput(maxBufferSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java index 623530eb4f4..bf50da290f4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/MultiDeviceIteratorToStringHandle.java @@ -56,7 +56,7 @@ private MultiDeviceIteratorToStringHandle(Operation operation) { ) public static MultiDeviceIteratorToStringHandle create(Scope scope, Operand multiDeviceIterator) { - OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorToStringHandle", scope.makeOpName("MultiDeviceIteratorToStringHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MultiDeviceIteratorToStringHandle")); opBuilder.addInput(multiDeviceIterator.asOutput()); opBuilder = scope.apply(opBuilder); return new MultiDeviceIteratorToStringHandle(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java index d6b6b043cf5..8acb8a1a9c7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/NonSerializableDataset.java @@ -61,7 +61,7 @@ private NonSerializableDataset(Operation operation) { ) public static NonSerializableDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("NonSerializableDataset", scope.makeOpName("NonSerializableDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonSerializableDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java index 3ee2024af63..e4c68e1585b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDataset.java @@ -67,7 +67,7 @@ private OptimizeDataset(Operation operation) { public static OptimizeDataset create(Scope scope, Operand inputDataset, Operand optimizations, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OptimizeDataset", scope.makeOpName("OptimizeDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptimizeDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(optimizations.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDatasetV2.java index b0e1d15badf..f2a7659cd76 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDatasetV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptimizeDatasetV2.java @@ -70,7 +70,7 @@ public static OptimizeDatasetV2 create(Scope scope, Operand inp Operand optimizationsEnabled, Operand optimizationsDisabled, Operand optimizationsDefault, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OptimizeDatasetV2", scope.makeOpName("OptimizeDatasetV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptimizeDatasetV2")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(optimizationsEnabled.asOutput()); opBuilder.addInput(optimizationsDisabled.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java index 5182e8292cb..741e5532640 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalFromValue.java @@ -60,7 +60,7 @@ private OptionalFromValue(Operation operation) { describeByClass = true ) public static OptionalFromValue create(Scope scope, Iterable> components) { - OperationBuilder opBuilder = scope.env().opBuilder("OptionalFromValue", scope.makeOpName("OptionalFromValue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalFromValue")); opBuilder.addInputList(Operands.asOutputs(components)); opBuilder = scope.apply(opBuilder); return new OptionalFromValue(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java index f97316aef5a..d255fc381fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalGetValue.java @@ -69,7 +69,7 @@ private OptionalGetValue(Operation operation) { ) public static OptionalGetValue create(Scope scope, Operand optional, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("OptionalGetValue", scope.makeOpName("OptionalGetValue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalGetValue")); opBuilder.addInput(optional.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java index 1e178947fb9..5de50ea6bd9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalHasValue.java @@ -59,7 +59,7 @@ private OptionalHasValue(Operation operation) { describeByClass = true ) public static OptionalHasValue create(Scope scope, Operand optional) { - OperationBuilder opBuilder = scope.env().opBuilder("OptionalHasValue", scope.makeOpName("OptionalHasValue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalHasValue")); opBuilder.addInput(optional.asOutput()); opBuilder = scope.apply(opBuilder); return new OptionalHasValue(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java index 964867da2d8..062a2a9808f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/OptionalNone.java @@ -58,7 +58,7 @@ private OptionalNone(Operation operation) { describeByClass = true ) public static OptionalNone create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("OptionalNone", scope.makeOpName("OptionalNone")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionalNone")); opBuilder = scope.apply(opBuilder); return new OptionalNone(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java index 34fb0f94ae4..5e74c59c2dc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PaddedBatchDataset.java @@ -75,7 +75,7 @@ public static PaddedBatchDataset create(Scope scope, Operand in Operand batchSize, Iterable> paddedShapes, Iterable> paddingValues, Operand dropRemainder, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PaddedBatchDatasetV2", scope.makeOpName("PaddedBatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PaddedBatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(batchSize.asOutput()); opBuilder.addInputList(Operands.asOutputs(paddedShapes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java index 9d3c49b4111..8ef26922652 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrefetchDataset.java @@ -66,7 +66,7 @@ private PrefetchDataset(Operation operation) { public static PrefetchDataset create(Scope scope, Operand inputDataset, Operand bufferSize, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PrefetchDataset", scope.makeOpName("PrefetchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrefetchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(bufferSize.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java index ded8a1b216e..3290840da75 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/PrivateThreadPoolDataset.java @@ -64,7 +64,7 @@ private PrivateThreadPoolDataset(Operation operation) { public static PrivateThreadPoolDataset create(Scope scope, Operand inputDataset, Operand numThreads, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("PrivateThreadPoolDataset", scope.makeOpName("PrivateThreadPoolDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrivateThreadPoolDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numThreads.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java index 71002f903e2..788ff579222 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RandomDataset.java @@ -73,7 +73,7 @@ private RandomDataset(Operation operation) { ) public static RandomDataset create(Scope scope, Operand seed, Operand seed2, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomDataset", scope.makeOpName("RandomDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomDataset")); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(seed2.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java index 083200e4bfb..bca448ecda1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RangeDataset.java @@ -68,7 +68,7 @@ private RangeDataset(Operation operation) { ) public static RangeDataset create(Scope scope, Operand start, Operand stop, Operand step, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("RangeDataset", scope.makeOpName("RangeDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RangeDataset")); opBuilder.addInput(start.asOutput()); opBuilder.addInput(stop.asOutput()); opBuilder.addInput(step.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDataset.java index 982bd16b905..874587c68e7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDataset.java @@ -69,7 +69,7 @@ private RebatchDataset(Operation operation) { public static RebatchDataset create(Scope scope, Operand inputDataset, Operand numReplicas, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RebatchDataset", scope.makeOpName("RebatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RebatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numReplicas.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java index d3a6158133c..b98013d55bc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RebatchDatasetV2.java @@ -69,7 +69,7 @@ private RebatchDatasetV2(Operation operation) { public static RebatchDatasetV2 create(Scope scope, Operand inputDataset, Operand batchSizes, Operand dropRemainder, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("RebatchDatasetV2", scope.makeOpName("RebatchDatasetV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RebatchDatasetV2")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(batchSizes.asOutput()); opBuilder.addInput(dropRemainder.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java index 73fccce5c3e..5809a919ebd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RegisterDataset.java @@ -60,7 +60,7 @@ private RegisterDataset(Operation operation) { ) public static RegisterDataset create(Scope scope, Operand dataset, Operand address, Operand protocol, Long externalStatePolicy) { - OperationBuilder opBuilder = scope.env().opBuilder("RegisterDataset", scope.makeOpName("RegisterDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RegisterDataset")); opBuilder.addInput(dataset.asOutput()); opBuilder.addInput(address.asOutput()); opBuilder.addInput(protocol.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java index cc208dd626d..d569bdd267d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/RepeatDataset.java @@ -68,7 +68,7 @@ private RepeatDataset(Operation operation) { ) public static RepeatDataset create(Scope scope, Operand inputDataset, Operand count, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("RepeatDataset", scope.makeOpName("RepeatDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RepeatDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(count.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java index 0f602e6c528..27778a1dd49 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SamplingDataset.java @@ -73,7 +73,7 @@ private SamplingDataset(Operation operation) { public static SamplingDataset create(Scope scope, Operand inputDataset, Operand rate, Operand seed, Operand seed2, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("SamplingDataset", scope.makeOpName("SamplingDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SamplingDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(rate.asOutput()); opBuilder.addInput(seed.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java index 8f70a020ed1..4d850e18e3a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SerializeIterator.java @@ -61,7 +61,7 @@ private SerializeIterator(Operation operation) { ) public static SerializeIterator create(Scope scope, Operand resourceHandle, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SerializeIterator", scope.makeOpName("SerializeIterator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeIterator")); opBuilder.addInput(resourceHandle.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java index e72e914bdbc..63bce56359c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SetStatsAggregatorDataset.java @@ -67,7 +67,7 @@ public static SetStatsAggregatorDataset create(Scope scope, Operand statsAggregator, Operand tag, Operand counterPrefix, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("SetStatsAggregatorDataset", scope.makeOpName("SetStatsAggregatorDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetStatsAggregatorDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(statsAggregator.asOutput()); opBuilder.addInput(tag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java index 95509b8fede..ea9b7059eea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShardDataset.java @@ -66,7 +66,7 @@ private ShardDataset(Operation operation) { public static ShardDataset create(Scope scope, Operand inputDataset, Operand numShards, Operand index, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ShardDataset", scope.makeOpName("ShardDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShardDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numShards.asOutput()); opBuilder.addInput(index.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java index 634a2aec7d2..1a7d3667632 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleAndRepeatDataset.java @@ -70,7 +70,7 @@ public static ShuffleAndRepeatDataset create(Scope scope, Operand bufferSize, Operand seed, Operand seed2, Operand count, Operand seedGenerator, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ShuffleAndRepeatDatasetV2", scope.makeOpName("ShuffleAndRepeatDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShuffleAndRepeatDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(bufferSize.asOutput()); opBuilder.addInput(seed.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java index ee99e969798..4ae9f5a57cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ShuffleDataset.java @@ -69,7 +69,7 @@ public static ShuffleDataset create(Scope scope, Operand inputD Operand bufferSize, Operand seed, Operand seed2, Operand seedGenerator, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ShuffleDatasetV3", scope.makeOpName("ShuffleDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShuffleDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(bufferSize.asOutput()); opBuilder.addInput(seed.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java index ab8e7433809..799fd924e15 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SkipDataset.java @@ -68,7 +68,7 @@ private SkipDataset(Operation operation) { ) public static SkipDataset create(Scope scope, Operand inputDataset, Operand count, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("SkipDataset", scope.makeOpName("SkipDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SkipDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(count.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java index a34a262886a..bc3b16e01a2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SleepDataset.java @@ -64,7 +64,7 @@ private SleepDataset(Operation operation) { public static SleepDataset create(Scope scope, Operand inputDataset, Operand sleepMicroseconds, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("SleepDataset", scope.makeOpName("SleepDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SleepDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(sleepMicroseconds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java index ec77f306bb8..123a5780271 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SlidingWindowDataset.java @@ -69,7 +69,7 @@ private SlidingWindowDataset(Operation operation) { public static SlidingWindowDataset create(Scope scope, Operand inputDataset, Operand windowSize, Operand windowShift, Operand windowStride, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("SlidingWindowDataset", scope.makeOpName("SlidingWindowDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SlidingWindowDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(windowSize.asOutput()); opBuilder.addInput(windowShift.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java index ab51a3fe1da..188bf6f6a8b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SparseTensorSliceDataset.java @@ -59,7 +59,7 @@ private SparseTensorSliceDataset(Operation operation) { ) public static SparseTensorSliceDataset create(Scope scope, Operand indices, Operand values, Operand denseShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorSliceDataset", scope.makeOpName("SparseTensorSliceDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorSliceDataset")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(denseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java index f4f38e09b8f..7240a21d3b4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SqlDataset.java @@ -65,7 +65,7 @@ private SqlDataset(Operation operation) { public static SqlDataset create(Scope scope, Operand driverName, Operand dataSourceName, Operand query, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("SqlDataset", scope.makeOpName("SqlDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SqlDataset")); opBuilder.addInput(driverName.asOutput()); opBuilder.addInput(dataSourceName.asOutput()); opBuilder.addInput(query.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java index 5dca7232d89..a4cd180c217 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/StatsAggregatorHandle.java @@ -55,7 +55,7 @@ private StatsAggregatorHandle(Operation operation) { describeByClass = true ) public static StatsAggregatorHandle create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StatsAggregatorHandle", scope.makeOpName("StatsAggregatorHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorHandle")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java index a266eb15319..c5fe31e28d9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TakeDataset.java @@ -69,7 +69,7 @@ private TakeDataset(Operation operation) { ) public static TakeDataset create(Scope scope, Operand inputDataset, Operand count, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("TakeDataset", scope.makeOpName("TakeDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TakeDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(count.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java index 163886415ca..1c93d86e475 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorDataset.java @@ -60,7 +60,7 @@ private TensorDataset(Operation operation) { ) public static TensorDataset create(Scope scope, Iterable> components, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorDataset", scope.makeOpName("TensorDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorDataset")); opBuilder.addInputList(Operands.asOutputs(components)); opBuilder = scope.apply(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java index 47a755e5fd2..ea02e5d6918 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TensorSliceDataset.java @@ -64,7 +64,7 @@ private TensorSliceDataset(Operation operation) { ) public static TensorSliceDataset create(Scope scope, Iterable> components, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorSliceDataset", scope.makeOpName("TensorSliceDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorSliceDataset")); opBuilder.addInputList(Operands.asOutputs(components)); opBuilder = scope.apply(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java index 61ece6c9b65..45892e72242 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TextLineDataset.java @@ -66,7 +66,7 @@ private TextLineDataset(Operation operation) { ) public static TextLineDataset create(Scope scope, Operand filenames, Operand compressionType, Operand bufferSize) { - OperationBuilder opBuilder = scope.env().opBuilder("TextLineDataset", scope.makeOpName("TextLineDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TextLineDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder.addInput(compressionType.asOutput()); opBuilder.addInput(bufferSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java index d79e936fb32..3ee07058682 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/TfRecordDataset.java @@ -67,7 +67,7 @@ private TfRecordDataset(Operation operation) { ) public static TfRecordDataset create(Scope scope, Operand filenames, Operand compressionType, Operand bufferSize) { - OperationBuilder opBuilder = scope.env().opBuilder("TFRecordDataset", scope.makeOpName("TfRecordDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TfRecordDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder.addInput(compressionType.asOutput()); opBuilder.addInput(bufferSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java index ea90a856b7f..9f67fdf0a66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolDataset.java @@ -63,7 +63,7 @@ private ThreadPoolDataset(Operation operation) { public static ThreadPoolDataset create(Scope scope, Operand inputDataset, Operand threadPool, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ThreadPoolDataset", scope.makeOpName("ThreadPoolDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(threadPool.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java index 669aa031783..5c12acd811a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ThreadPoolHandle.java @@ -60,7 +60,7 @@ private ThreadPoolHandle(Operation operation) { ) public static ThreadPoolHandle create(Scope scope, Long numThreads, String displayName, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ThreadPoolHandle", scope.makeOpName("ThreadPoolHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolHandle")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_threads", numThreads); opBuilder.setAttr("display_name", displayName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java index 257705cc485..a827341e997 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnbatchDataset.java @@ -61,7 +61,7 @@ private UnbatchDataset(Operation operation) { ) public static UnbatchDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("UnbatchDataset", scope.makeOpName("UnbatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnbatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java index 790f2c1da5e..79e21583277 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UniqueDataset.java @@ -61,7 +61,7 @@ private UniqueDataset(Operation operation) { ) public static UniqueDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("UniqueDataset", scope.makeOpName("UniqueDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniqueDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java index 98a0399ba8d..df30e1749d9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/UnwrapDatasetVariant.java @@ -55,7 +55,7 @@ private UnwrapDatasetVariant(Operation operation) { describeByClass = true ) public static UnwrapDatasetVariant create(Scope scope, Operand inputHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("UnwrapDatasetVariant", scope.makeOpName("UnwrapDatasetVariant")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnwrapDatasetVariant")); opBuilder.addInput(inputHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new UnwrapDatasetVariant(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java index f6ed2ea62a9..3e2069a2a93 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WindowDataset.java @@ -110,7 +110,7 @@ public static WindowDataset create(Scope scope, Operand inputDa Operand sizeOutput, Operand shift, Operand stride, Operand dropRemainder, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("WindowDataset", scope.makeOpName("WindowDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WindowDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(shift.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java index 06916439033..8f6de33fda7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/WrapDatasetVariant.java @@ -55,7 +55,7 @@ private WrapDatasetVariant(Operation operation) { describeByClass = true ) public static WrapDatasetVariant create(Scope scope, Operand inputHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("WrapDatasetVariant", scope.makeOpName("WrapDatasetVariant")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WrapDatasetVariant")); opBuilder.addInput(inputHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new WrapDatasetVariant(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java index 265b3f64dee..a07a8a14ede 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/ZipDataset.java @@ -69,7 +69,7 @@ private ZipDataset(Operation operation) { ) public static ZipDataset create(Scope scope, Iterable> inputDatasets, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ZipDataset", scope.makeOpName("ZipDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ZipDataset")); opBuilder.addInputList(Operands.asOutputs(inputDatasets)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertCardinalityDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertCardinalityDataset.java index d067a8da8ec..90ff976d9e5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertCardinalityDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertCardinalityDataset.java @@ -64,7 +64,7 @@ private AssertCardinalityDataset(Operation operation) { public static AssertCardinalityDataset create(Scope scope, Operand inputDataset, Operand cardinality, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("AssertCardinalityDataset", scope.makeOpName("AssertCardinalityDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertCardinalityDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(cardinality.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java index 4cb95fbccd2..56513038149 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AssertNextDataset.java @@ -64,7 +64,7 @@ private AssertNextDataset(Operation operation) { public static AssertNextDataset create(Scope scope, Operand inputDataset, Operand transformations, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalAssertNextDataset", scope.makeOpName("AssertNextDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AssertNextDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(transformations.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java index 931e2db4ba1..4375aeda74d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/AutoShardDataset.java @@ -72,7 +72,7 @@ private AutoShardDataset(Operation operation) { public static AutoShardDataset create(Scope scope, Operand inputDataset, Operand numWorkers, Operand index, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalAutoShardDataset", scope.makeOpName("AutoShardDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AutoShardDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numWorkers.asOutput()); opBuilder.addInput(index.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java index 524df6ddd0f..5f6a0ace7c6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/BytesProducedStatsDataset.java @@ -63,7 +63,7 @@ private BytesProducedStatsDataset(Operation operation) { ) public static BytesProducedStatsDataset create(Scope scope, Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalBytesProducedStatsDataset", scope.makeOpName("BytesProducedStatsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BytesProducedStatsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(tag.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java index 0c26e1c263f..9a3ee0dfa20 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CSVDataset.java @@ -73,7 +73,7 @@ public static CSVDataset create(Scope scope, Operand filenames, Operand compressionType, Operand bufferSize, Operand header, Operand fieldDelim, Operand useQuoteDelim, Operand naValue, Operand selectCols, Iterable> recordDefaults, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalCSVDataset", scope.makeOpName("CSVDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSVDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder.addInput(compressionType.asOutput()); opBuilder.addInput(bufferSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java index 093eccc41a3..0b2f583aab2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ChooseFastestDataset.java @@ -63,7 +63,7 @@ private ChooseFastestDataset(Operation operation) { public static ChooseFastestDataset create(Scope scope, Iterable> inputDatasets, Long numExperiments, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalChooseFastestDataset", scope.makeOpName("ChooseFastestDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ChooseFastestDataset")); opBuilder.addInputList(Operands.asOutputs(inputDatasets)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_experiments", numExperiments); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CompressElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CompressElement.java index 093e7e6e5cc..30caf1434f3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CompressElement.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/CompressElement.java @@ -56,7 +56,7 @@ private CompressElement(Operation operation) { describeByClass = true ) public static CompressElement create(Scope scope, Iterable> components) { - OperationBuilder opBuilder = scope.env().opBuilder("CompressElement", scope.makeOpName("CompressElement")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompressElement")); opBuilder.addInputList(Operands.asOutputs(components)); opBuilder = scope.apply(opBuilder); return new CompressElement(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DataServiceDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DataServiceDataset.java index eec5392bda5..dd4a3e3f6d9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DataServiceDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DataServiceDataset.java @@ -73,7 +73,7 @@ public static DataServiceDataset create(Scope scope, Operand datasetId, Operand jobName, Operand maxOutstandingRequests, Operand iterationCounter, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DataServiceDataset", scope.makeOpName("DataServiceDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataServiceDataset")); opBuilder.addInput(datasetId.asOutput()); opBuilder.addInput(processingMode.asOutput()); opBuilder.addInput(address.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java index dd3be793b80..4d179b451bf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetCardinality.java @@ -56,7 +56,7 @@ private DatasetCardinality(Operation operation) { describeByClass = true ) public static DatasetCardinality create(Scope scope, Operand inputDataset) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDatasetCardinality", scope.makeOpName("DatasetCardinality")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetCardinality")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); return new DatasetCardinality(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java index ad01668fe45..cf25191b693 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DatasetToTFRecord.java @@ -54,7 +54,7 @@ private DatasetToTFRecord(Operation operation) { ) public static DatasetToTFRecord create(Scope scope, Operand inputDataset, Operand filename, Operand compressionType) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDatasetToTFRecord", scope.makeOpName("DatasetToTFRecord")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DatasetToTFRecord")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(filename.asOutput()); opBuilder.addInput(compressionType.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java index 7ed96b92c8f..dcffd82c925 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DenseToSparseBatchDataset.java @@ -68,7 +68,7 @@ private DenseToSparseBatchDataset(Operation operation) { public static DenseToSparseBatchDataset create(Scope scope, Operand inputDataset, Operand batchSize, Operand rowShape, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDenseToSparseBatchDataset", scope.makeOpName("DenseToSparseBatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToSparseBatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(batchSize.asOutput()); opBuilder.addInput(rowShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java index 7c5f70770d0..cf572d6c552 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DirectedInterleaveDataset.java @@ -66,7 +66,7 @@ public static DirectedInterleaveDataset create(Scope scope, Operand selectorInputDataset, Iterable> dataInputDatasets, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDirectedInterleaveDataset", scope.makeOpName("DirectedInterleaveDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DirectedInterleaveDataset")); opBuilder.addInput(selectorInputDataset.asOutput()); opBuilder.addInputList(Operands.asOutputs(dataInputDatasets)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DummyIterationCounter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DummyIterationCounter.java index 2da650712fb..d7e6e4ce05e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DummyIterationCounter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/DummyIterationCounter.java @@ -54,7 +54,7 @@ private DummyIterationCounter(Operation operation) { describeByClass = true ) public static DummyIterationCounter create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("DummyIterationCounter", scope.makeOpName("DummyIterationCounter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DummyIterationCounter")); opBuilder = scope.apply(opBuilder); return new DummyIterationCounter(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java index 893974e4fa3..0804fea6bc7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IgnoreErrorsDataset.java @@ -62,7 +62,7 @@ private IgnoreErrorsDataset(Operation operation) { ) public static IgnoreErrorsDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalIgnoreErrorsDataset", scope.makeOpName("IgnoreErrorsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IgnoreErrorsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java index b2e0126d321..b05b4a59b08 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/IteratorGetDevice.java @@ -55,7 +55,7 @@ private IteratorGetDevice(Operation operation) { describeByClass = true ) public static IteratorGetDevice create(Scope scope, Operand resource) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalIteratorGetDevice", scope.makeOpName("IteratorGetDevice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IteratorGetDevice")); opBuilder.addInput(resource.asOutput()); opBuilder = scope.apply(opBuilder); return new IteratorGetDevice(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java index 0b4756f3241..8fd36731572 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LatencyStatsDataset.java @@ -63,7 +63,7 @@ private LatencyStatsDataset(Operation operation) { ) public static LatencyStatsDataset create(Scope scope, Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalLatencyStatsDataset", scope.makeOpName("LatencyStatsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LatencyStatsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(tag.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java index e7bab3a43b3..e53ab9a5387 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/LmdbDataset.java @@ -62,7 +62,7 @@ private LmdbDataset(Operation operation) { ) public static LmdbDataset create(Scope scope, Operand filenames, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalLMDBDataset", scope.makeOpName("LmdbDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LmdbDataset")); opBuilder.addInput(filenames.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java index 615ee0bfa0b..ce807c2f225 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MatchingFilesDataset.java @@ -56,7 +56,7 @@ private MatchingFilesDataset(Operation operation) { describeByClass = true ) public static MatchingFilesDataset create(Scope scope, Operand patterns) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalMatchingFilesDataset", scope.makeOpName("MatchingFilesDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatchingFilesDataset")); opBuilder.addInput(patterns.asOutput()); opBuilder = scope.apply(opBuilder); return new MatchingFilesDataset(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java index ceaf099584e..1cbbb19b216 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/MaxIntraOpParallelismDataset.java @@ -64,7 +64,7 @@ private MaxIntraOpParallelismDataset(Operation operation) { public static MaxIntraOpParallelismDataset create(Scope scope, Operand inputDataset, Operand maxIntraOpParallelism, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalMaxIntraOpParallelismDataset", scope.makeOpName("MaxIntraOpParallelismDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxIntraOpParallelismDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(maxIntraOpParallelism.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java index f74a0207ae2..50d17ad20e6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/NonSerializableDataset.java @@ -61,7 +61,7 @@ private NonSerializableDataset(Operation operation) { ) public static NonSerializableDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalNonSerializableDataset", scope.makeOpName("NonSerializableDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonSerializableDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java index 38a6aeda19d..c3e179c29db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ParseExampleDataset.java @@ -90,7 +90,7 @@ public static ParseExampleDataset create(Scope scope, Operand i List> outputTypes, List outputShapes, List> raggedValueTypes, List> raggedSplitTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ParseExampleDatasetV2", scope.makeOpName("ParseExampleDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseExampleDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numParallelCalls.asOutput()); opBuilder.addInputList(Operands.asOutputs(denseDefaults)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java index 4a590bdd205..8ac3d4955e2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/PrivateThreadPoolDataset.java @@ -64,7 +64,7 @@ private PrivateThreadPoolDataset(Operation operation) { public static PrivateThreadPoolDataset create(Scope scope, Operand inputDataset, Operand numThreads, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalPrivateThreadPoolDataset", scope.makeOpName("PrivateThreadPoolDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrivateThreadPoolDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numThreads.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java index e7b815f7374..c2c9cf73c4d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RandomDataset.java @@ -65,7 +65,7 @@ private RandomDataset(Operation operation) { ) public static RandomDataset create(Scope scope, Operand seed, Operand seed2, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalRandomDataset", scope.makeOpName("RandomDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomDataset")); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(seed2.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java index ec1c8db1ffe..73856b0d475 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/RebatchDataset.java @@ -69,7 +69,7 @@ private RebatchDataset(Operation operation) { public static RebatchDataset create(Scope scope, Operand inputDataset, Operand numReplicas, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalRebatchDataset", scope.makeOpName("RebatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RebatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(numReplicas.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java index 2e2ad4dc8f3..ff9bad603f6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SetStatsAggregatorDataset.java @@ -67,7 +67,7 @@ public static SetStatsAggregatorDataset create(Scope scope, Operand statsAggregator, Operand tag, Operand counterPrefix, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalSetStatsAggregatorDataset", scope.makeOpName("SetStatsAggregatorDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SetStatsAggregatorDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(statsAggregator.asOutput()); opBuilder.addInput(tag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java index 8ba7e87d492..8e96f63923f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SleepDataset.java @@ -64,7 +64,7 @@ private SleepDataset(Operation operation) { public static SleepDataset create(Scope scope, Operand inputDataset, Operand sleepMicroseconds, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalSleepDataset", scope.makeOpName("SleepDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SleepDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(sleepMicroseconds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java index 9632b88e997..b81ae5016df 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SlidingWindowDataset.java @@ -69,7 +69,7 @@ private SlidingWindowDataset(Operation operation) { public static SlidingWindowDataset create(Scope scope, Operand inputDataset, Operand windowSize, Operand windowShift, Operand windowStride, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalSlidingWindowDataset", scope.makeOpName("SlidingWindowDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SlidingWindowDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(windowSize.asOutput()); opBuilder.addInput(windowShift.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java index 01b026f7321..fd566c63733 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/SqlDataset.java @@ -65,7 +65,7 @@ private SqlDataset(Operation operation) { public static SqlDataset create(Scope scope, Operand driverName, Operand dataSourceName, Operand query, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalSqlDataset", scope.makeOpName("SqlDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SqlDataset")); opBuilder.addInput(driverName.asOutput()); opBuilder.addInput(dataSourceName.asOutput()); opBuilder.addInput(query.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java index 792b01701f6..e4183305b0f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorHandle.java @@ -55,7 +55,7 @@ private StatsAggregatorHandle(Operation operation) { describeByClass = true ) public static StatsAggregatorHandle create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StatsAggregatorHandleV2", scope.makeOpName("StatsAggregatorHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorHandle")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSetSummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSetSummaryWriter.java index bdbc08f505a..a0630991efe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSetSummaryWriter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSetSummaryWriter.java @@ -51,7 +51,7 @@ private StatsAggregatorSetSummaryWriter(Operation operation) { ) public static StatsAggregatorSetSummaryWriter create(Scope scope, Operand statsAggregator, Operand summary) { - OperationBuilder opBuilder = scope.env().opBuilder("StatsAggregatorSetSummaryWriter", scope.makeOpName("StatsAggregatorSetSummaryWriter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorSetSummaryWriter")); opBuilder.addInput(statsAggregator.asOutput()); opBuilder.addInput(summary.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java index 84ab19fd114..bf7250b438b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/StatsAggregatorSummary.java @@ -55,7 +55,7 @@ private StatsAggregatorSummary(Operation operation) { describeByClass = true ) public static StatsAggregatorSummary create(Scope scope, Operand iterator) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalStatsAggregatorSummary", scope.makeOpName("StatsAggregatorSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorSummary")); opBuilder.addInput(iterator.asOutput()); opBuilder = scope.apply(opBuilder); return new StatsAggregatorSummary(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java index 6dc3e5057ae..6fa3410940d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolDataset.java @@ -63,7 +63,7 @@ private ThreadPoolDataset(Operation operation) { public static ThreadPoolDataset create(Scope scope, Operand inputDataset, Operand threadPool, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalThreadPoolDataset", scope.makeOpName("ThreadPoolDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(threadPool.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java index 67806fe8b9b..e117ad8e4f1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/ThreadPoolHandle.java @@ -60,7 +60,7 @@ private ThreadPoolHandle(Operation operation) { ) public static ThreadPoolHandle create(Scope scope, Long numThreads, String displayName, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalThreadPoolHandle", scope.makeOpName("ThreadPoolHandle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ThreadPoolHandle")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_threads", numThreads); opBuilder.setAttr("display_name", displayName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java index 19a3eaf10cd..d557cc5184e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UnbatchDataset.java @@ -61,7 +61,7 @@ private UnbatchDataset(Operation operation) { ) public static UnbatchDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalUnbatchDataset", scope.makeOpName("UnbatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnbatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UncompressElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UncompressElement.java index af2519a6111..0f498626609 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UncompressElement.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UncompressElement.java @@ -65,7 +65,7 @@ private UncompressElement(Operation operation) { ) public static UncompressElement create(Scope scope, Operand compressed, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("UncompressElement", scope.makeOpName("UncompressElement")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UncompressElement")); opBuilder.addInput(compressed.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java index a4e373cf734..a722cbf820d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/experimental/UniqueDataset.java @@ -61,7 +61,7 @@ private UniqueDataset(Operation operation) { ) public static UniqueDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalUniqueDataset", scope.makeOpName("UniqueDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniqueDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java index 068892293e4..72fe63038f2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/CheckNumerics.java @@ -63,7 +63,7 @@ private CheckNumerics(Operation operation) { ) public static CheckNumerics create(Scope scope, Operand tensor, String message) { - OperationBuilder opBuilder = scope.env().opBuilder("CheckNumericsV2", scope.makeOpName("CheckNumerics")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CheckNumerics")); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("message", message); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java index 3de60d9b847..43f60d63d72 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientIdentity.java @@ -60,7 +60,7 @@ private DebugGradientIdentity(Operation operation) { describeByClass = true ) public static DebugGradientIdentity create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("DebugGradientIdentity", scope.makeOpName("DebugGradientIdentity")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugGradientIdentity")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new DebugGradientIdentity<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java index caab8f1eef7..7ebca44b76e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugGradientRefIdentity.java @@ -61,7 +61,7 @@ private DebugGradientRefIdentity(Operation operation) { ) public static DebugGradientRefIdentity create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("DebugGradientRefIdentity", scope.makeOpName("DebugGradientRefIdentity")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugGradientRefIdentity")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new DebugGradientRefIdentity<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java index 2f563306c0b..cdba78a556c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugIdentity.java @@ -69,7 +69,7 @@ private DebugIdentity(Operation operation) { ) public static DebugIdentity create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DebugIdentityV2", scope.makeOpName("DebugIdentity")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugIdentity")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java index fc1c74982e6..a087e1fc778 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNanCount.java @@ -60,7 +60,7 @@ private DebugNanCount(Operation operation) { ) public static DebugNanCount create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DebugNanCount", scope.makeOpName("DebugNanCount")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugNanCount")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java index d06285ff947..3a3fed5025f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/debugging/DebugNumericsSummary.java @@ -66,7 +66,7 @@ private DebugNumericsSummary(Operation operation) { ) public static DebugNumericsSummary create(Scope scope, Operand input, Class outputDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DebugNumericSummaryV2", scope.makeOpName("DebugNumericsSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DebugNumericsSummary")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_dtype", Operands.toDataType(outputDtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java index 9fca1e2f8f9..430784dfd45 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclAllReduce.java @@ -71,7 +71,7 @@ private NcclAllReduce(Operation operation) { ) public static NcclAllReduce create(Scope scope, Operand input, String reduction, Long numDevices, String sharedName) { - OperationBuilder opBuilder = scope.env().opBuilder("NcclAllReduce", scope.makeOpName("NcclAllReduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclAllReduce")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("reduction", reduction); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java index 3ec4061857d..da831716e48 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclBroadcast.java @@ -66,7 +66,7 @@ private NcclBroadcast(Operation operation) { ) public static NcclBroadcast create(Scope scope, Operand input, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("NcclBroadcast", scope.makeOpName("NcclBroadcast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclBroadcast")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java index 67a947860b0..a5b71f6c4dc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/distribute/NcclReduce.java @@ -66,7 +66,7 @@ private NcclReduce(Operation operation) { ) public static NcclReduce create(Scope scope, Iterable> input, String reduction) { - OperationBuilder opBuilder = scope.env().opBuilder("NcclReduce", scope.makeOpName("NcclReduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NcclReduce")); opBuilder.addInputList(Operands.asOutputs(input)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("reduction", reduction); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java index e1bfd6c3e28..7b0ef02045b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/AsString.java @@ -75,7 +75,7 @@ private AsString(Operation operation) { describeByClass = true ) public static AsString create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AsString", scope.makeOpName("AsString")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AsString")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java index 925e2fdf87a..9106b875824 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Cast.java @@ -65,7 +65,7 @@ private Cast(Operation operation) { ) public static Cast create(Scope scope, Operand x, Class DstT, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Cast", scope.makeOpName("Cast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cast")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("DstT", Operands.toDataType(DstT)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java index 2e9208f57a7..b56b0226d48 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/Complex.java @@ -78,7 +78,7 @@ private Complex(Operation operation) { ) public static Complex create(Scope scope, Operand real, Operand imag, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("Complex", scope.makeOpName("Complex")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Complex")); opBuilder.addInput(real.asOutput()); opBuilder.addInput(imag.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java index bd8e87f20ab..d4f622e57df 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/dtypes/ToBool.java @@ -70,7 +70,7 @@ private ToBool(Operation operation) { describeByClass = true ) public static ToBool create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("ToBool", scope.makeOpName("ToBool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToBool")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new ToBool(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java index 39ed87bb4a6..82d322bafbf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesAggregateStats.java @@ -63,7 +63,7 @@ private BoostedTreesAggregateStats(Operation operation) { public static BoostedTreesAggregateStats create(Scope scope, Operand nodeIds, Operand gradients, Operand hessians, Operand feature, Long maxSplits, Long numBuckets) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesAggregateStats", scope.makeOpName("BoostedTreesAggregateStats")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesAggregateStats")); opBuilder.addInput(nodeIds.asOutput()); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(hessians.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java index c6dbe81ae67..1cf6f719ebb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesBucketize.java @@ -67,7 +67,7 @@ private BoostedTreesBucketize(Operation operation) { ) public static BoostedTreesBucketize create(Scope scope, Iterable> floatValues, Iterable> bucketBoundaries) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesBucketize", scope.makeOpName("BoostedTreesBucketize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesBucketize")); opBuilder.addInputList(Operands.asOutputs(floatValues)); opBuilder.addInputList(Operands.asOutputs(bucketBoundaries)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java index 478abad9db1..f9b89d70e74 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplit.java @@ -89,7 +89,7 @@ public static BoostedTreesCalculateBestFeatureSplit create(Scope scope, Operand nodeIdRange, Operand statsSummary, Operand l1, Operand l2, Operand treeComplexity, Operand minNodeWeight, Long logitsDimension, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCalculateBestFeatureSplit", scope.makeOpName("BoostedTreesCalculateBestFeatureSplit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCalculateBestFeatureSplit")); opBuilder.addInput(nodeIdRange.asOutput()); opBuilder.addInput(statsSummary.asOutput()); opBuilder.addInput(l1.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java index 76d9c8142bd..7dd9b267651 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestFeatureSplitV2.java @@ -95,7 +95,7 @@ public static BoostedTreesCalculateBestFeatureSplitV2 create(Scope scope, Operand splitTypes, Operand candidateFeatureIds, Operand l1, Operand l2, Operand treeComplexity, Operand minNodeWeight, Long logitsDimension) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCalculateBestFeatureSplitV2", scope.makeOpName("BoostedTreesCalculateBestFeatureSplitV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCalculateBestFeatureSplitV2")); opBuilder.addInput(nodeIdRange.asOutput()); opBuilder.addInputList(Operands.asOutputs(statsSummariesList)); opBuilder.addInput(splitTypes.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java index 9566a717e1b..d09a1859ca5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCalculateBestGainsPerFeature.java @@ -95,7 +95,7 @@ public static BoostedTreesCalculateBestGainsPerFeature create(Scope scope, Operand nodeIdRange, Iterable> statsSummaryList, Operand l1, Operand l2, Operand treeComplexity, Operand minNodeWeight, Long maxSplits) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCalculateBestGainsPerFeature", scope.makeOpName("BoostedTreesCalculateBestGainsPerFeature")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCalculateBestGainsPerFeature")); opBuilder.addInput(nodeIdRange.asOutput()); opBuilder.addInputList(Operands.asOutputs(statsSummaryList)); opBuilder.addInput(l1.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java index d6c86fa7030..06732ac99e8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCenterBias.java @@ -62,7 +62,7 @@ private BoostedTreesCenterBias(Operation operation) { public static BoostedTreesCenterBias create(Scope scope, Operand treeEnsembleHandle, Operand meanGradients, Operand meanHessians, Operand l1, Operand l2) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCenterBias", scope.makeOpName("BoostedTreesCenterBias")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCenterBias")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInput(meanGradients.asOutput()); opBuilder.addInput(meanHessians.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java index cf0705baa52..3e7eca3a7cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateEnsemble.java @@ -55,7 +55,7 @@ private BoostedTreesCreateEnsemble(Operation operation) { public static BoostedTreesCreateEnsemble create(Scope scope, Operand treeEnsembleHandle, Operand stampToken, Operand treeEnsembleSerialized) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCreateEnsemble", scope.makeOpName("BoostedTreesCreateEnsemble")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCreateEnsemble")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInput(stampToken.asOutput()); opBuilder.addInput(treeEnsembleSerialized.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java index 524620026f2..871f250c0ad 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesCreateQuantileStreamResource.java @@ -56,7 +56,7 @@ private BoostedTreesCreateQuantileStreamResource(Operation operation) { public static BoostedTreesCreateQuantileStreamResource create(Scope scope, Operand quantileStreamResourceHandle, Operand epsilon, Operand numStreams, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCreateQuantileStreamResource", scope.makeOpName("BoostedTreesCreateQuantileStreamResource")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesCreateQuantileStreamResource")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder.addInput(epsilon.asOutput()); opBuilder.addInput(numStreams.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java index dbd0fa5fde3..d24acd613a6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesDeserializeEnsemble.java @@ -56,7 +56,7 @@ private BoostedTreesDeserializeEnsemble(Operation operation) { public static BoostedTreesDeserializeEnsemble create(Scope scope, Operand treeEnsembleHandle, Operand stampToken, Operand treeEnsembleSerialized) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesDeserializeEnsemble", scope.makeOpName("BoostedTreesDeserializeEnsemble")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesDeserializeEnsemble")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInput(stampToken.asOutput()); opBuilder.addInput(treeEnsembleSerialized.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java index 5498299dd35..821bf890f39 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesEnsembleResourceHandleOp.java @@ -55,7 +55,7 @@ private BoostedTreesEnsembleResourceHandleOp(Operation operation) { describeByClass = true ) public static BoostedTreesEnsembleResourceHandleOp create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesEnsembleResourceHandleOp", scope.makeOpName("BoostedTreesEnsembleResourceHandleOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesEnsembleResourceHandleOp")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java index 3fbe45ce51a..8115000d538 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesExampleDebugOutputs.java @@ -66,7 +66,7 @@ private BoostedTreesExampleDebugOutputs(Operation operation) { public static BoostedTreesExampleDebugOutputs create(Scope scope, Operand treeEnsembleHandle, Iterable> bucketizedFeatures, Long logitsDimension) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesExampleDebugOutputs", scope.makeOpName("BoostedTreesExampleDebugOutputs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesExampleDebugOutputs")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java index 3bcdfd6f5d4..cb028d06e56 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesFlushQuantileSummaries.java @@ -66,7 +66,7 @@ private BoostedTreesFlushQuantileSummaries(Operation operation) { ) public static BoostedTreesFlushQuantileSummaries create(Scope scope, Operand quantileStreamResourceHandle, Long numFeatures) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesFlushQuantileSummaries", scope.makeOpName("BoostedTreesFlushQuantileSummaries")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesFlushQuantileSummaries")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_features", numFeatures); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java index 91283cb4e91..3e87ddfda80 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesGetEnsembleStates.java @@ -69,7 +69,7 @@ private BoostedTreesGetEnsembleStates(Operation operation) { ) public static BoostedTreesGetEnsembleStates create(Scope scope, Operand treeEnsembleHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesGetEnsembleStates", scope.makeOpName("BoostedTreesGetEnsembleStates")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesGetEnsembleStates")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new BoostedTreesGetEnsembleStates(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java index 9178217dba0..69975228820 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeQuantileSummaries.java @@ -67,7 +67,7 @@ private BoostedTreesMakeQuantileSummaries(Operation operation) { public static BoostedTreesMakeQuantileSummaries create(Scope scope, Iterable> floatValues, Operand exampleWeights, Operand epsilon) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesMakeQuantileSummaries", scope.makeOpName("BoostedTreesMakeQuantileSummaries")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesMakeQuantileSummaries")); opBuilder.addInputList(Operands.asOutputs(floatValues)); opBuilder.addInput(exampleWeights.asOutput()); opBuilder.addInput(epsilon.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java index 3552cb6e986..ea1744361ce 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesMakeStatsSummary.java @@ -64,7 +64,7 @@ private BoostedTreesMakeStatsSummary(Operation operation) { public static BoostedTreesMakeStatsSummary create(Scope scope, Operand nodeIds, Operand gradients, Operand hessians, Iterable> bucketizedFeaturesList, Long maxSplits, Long numBuckets) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesMakeStatsSummary", scope.makeOpName("BoostedTreesMakeStatsSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesMakeStatsSummary")); opBuilder.addInput(nodeIds.asOutput()); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(hessians.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java index 98807d14ad3..e3b23e355e9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesPredict.java @@ -64,7 +64,7 @@ private BoostedTreesPredict(Operation operation) { ) public static BoostedTreesPredict create(Scope scope, Operand treeEnsembleHandle, Iterable> bucketizedFeatures, Long logitsDimension) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesPredict", scope.makeOpName("BoostedTreesPredict")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesPredict")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java index b0e678c8b69..f7db36bf019 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceAddSummaries.java @@ -57,7 +57,7 @@ private BoostedTreesQuantileStreamResourceAddSummaries(Operation operation) { public static BoostedTreesQuantileStreamResourceAddSummaries create(Scope scope, Operand quantileStreamResourceHandle, Iterable> summaries) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceAddSummaries", scope.makeOpName("BoostedTreesQuantileStreamResourceAddSummaries")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceAddSummaries")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder.addInputList(Operands.asOutputs(summaries)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java index e7f43f229b5..616d5b5bb58 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceDeserialize.java @@ -55,7 +55,7 @@ private BoostedTreesQuantileStreamResourceDeserialize(Operation operation) { public static BoostedTreesQuantileStreamResourceDeserialize create(Scope scope, Operand quantileStreamResourceHandle, Iterable> bucketBoundaries) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceDeserialize", scope.makeOpName("BoostedTreesQuantileStreamResourceDeserialize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceDeserialize")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder.addInputList(Operands.asOutputs(bucketBoundaries)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java index 63e96f628ce..ce36cb3e366 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceFlush.java @@ -55,7 +55,7 @@ private BoostedTreesQuantileStreamResourceFlush(Operation operation) { public static BoostedTreesQuantileStreamResourceFlush create(Scope scope, Operand quantileStreamResourceHandle, Operand numBuckets, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceFlush", scope.makeOpName("BoostedTreesQuantileStreamResourceFlush")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceFlush")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder.addInput(numBuckets.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java index 68eb24ee4e1..a44db108e17 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceGetBucketBoundaries.java @@ -65,7 +65,7 @@ private BoostedTreesQuantileStreamResourceGetBucketBoundaries(Operation operatio ) public static BoostedTreesQuantileStreamResourceGetBucketBoundaries create(Scope scope, Operand quantileStreamResourceHandle, Long numFeatures) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceGetBucketBoundaries", scope.makeOpName("BoostedTreesQuantileStreamResourceGetBucketBoundaries")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceGetBucketBoundaries")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_features", numFeatures); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java index 0e0dcd74f2b..114ac3741ec 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesQuantileStreamResourceHandleOp.java @@ -55,7 +55,7 @@ private BoostedTreesQuantileStreamResourceHandleOp(Operation operation) { describeByClass = true ) public static BoostedTreesQuantileStreamResourceHandleOp create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceHandleOp", scope.makeOpName("BoostedTreesQuantileStreamResourceHandleOp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesQuantileStreamResourceHandleOp")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java index 6ee4ee2ebce..eb2f5193659 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSerializeEnsemble.java @@ -60,7 +60,7 @@ private BoostedTreesSerializeEnsemble(Operation operation) { ) public static BoostedTreesSerializeEnsemble create(Scope scope, Operand treeEnsembleHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesSerializeEnsemble", scope.makeOpName("BoostedTreesSerializeEnsemble")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesSerializeEnsemble")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new BoostedTreesSerializeEnsemble(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java index 7497e933574..7eb7971260f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseAggregateStats.java @@ -78,7 +78,7 @@ public static BoostedTreesSparseAggregateStats create(Scope scope, Operand gradients, Operand hessians, Operand featureIndices, Operand featureValues, Operand featureShape, Long maxSplits, Long numBuckets) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesSparseAggregateStats", scope.makeOpName("BoostedTreesSparseAggregateStats")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesSparseAggregateStats")); opBuilder.addInput(nodeIds.asOutput()); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(hessians.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java index 6e0bff134c2..d8541a15d9b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesSparseCalculateBestFeatureSplit.java @@ -92,7 +92,7 @@ public static BoostedTreesSparseCalculateBestFeatureSplit create(Scope scope, Operand statsSummaryValues, Operand statsSummaryShape, Operand l1, Operand l2, Operand treeComplexity, Operand minNodeWeight, Long logitsDimension, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesSparseCalculateBestFeatureSplit", scope.makeOpName("BoostedTreesSparseCalculateBestFeatureSplit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesSparseCalculateBestFeatureSplit")); opBuilder.addInput(nodeIdRange.asOutput()); opBuilder.addInput(statsSummaryIndices.asOutput()); opBuilder.addInput(statsSummaryValues.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java index 7c762ab8092..55d400c9c0f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesTrainingPredict.java @@ -77,7 +77,7 @@ public static BoostedTreesTrainingPredict create(Scope scope, Operand treeEnsembleHandle, Operand cachedTreeIds, Operand cachedNodeIds, Iterable> bucketizedFeatures, Long logitsDimension) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesTrainingPredict", scope.makeOpName("BoostedTreesTrainingPredict")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesTrainingPredict")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInput(cachedTreeIds.asOutput()); opBuilder.addInput(cachedNodeIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java index 1a5cf40a62d..93310fd7e96 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsemble.java @@ -75,7 +75,7 @@ public static BoostedTreesUpdateEnsemble create(Scope scope, Iterable> thresholds, Iterable> leftNodeContribs, Iterable> rightNodeContribs, Operand maxDepth, Operand learningRate, Long pruningMode) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesUpdateEnsemble", scope.makeOpName("BoostedTreesUpdateEnsemble")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesUpdateEnsemble")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInput(featureIds.asOutput()); opBuilder.addInputList(Operands.asOutputs(nodeIds)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java index 971af4f268c..ce10bb48d3c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/BoostedTreesUpdateEnsembleV2.java @@ -80,7 +80,7 @@ public static BoostedTreesUpdateEnsembleV2 create(Scope scope, Iterable> leftNodeContribs, Iterable> rightNodeContribs, Iterable> splitTypes, Operand maxDepth, Operand learningRate, Operand pruningMode, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesUpdateEnsembleV2", scope.makeOpName("BoostedTreesUpdateEnsembleV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BoostedTreesUpdateEnsembleV2")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder.addInputList(Operands.asOutputs(featureIds)); opBuilder.addInputList(Operands.asOutputs(dimensionIds)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java index df85bcd5ddb..b4a4bf79800 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesEnsembleInitialized.java @@ -56,7 +56,7 @@ private IsBoostedTreesEnsembleInitialized(Operation operation) { ) public static IsBoostedTreesEnsembleInitialized create(Scope scope, Operand treeEnsembleHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("IsBoostedTreesEnsembleInitialized", scope.makeOpName("IsBoostedTreesEnsembleInitialized")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsBoostedTreesEnsembleInitialized")); opBuilder.addInput(treeEnsembleHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new IsBoostedTreesEnsembleInitialized(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java index 3358263f345..12f6d5240db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/estimator/IsBoostedTreesQuantileStreamResourceInitialized.java @@ -57,7 +57,7 @@ private IsBoostedTreesQuantileStreamResourceInitialized(Operation operation) { ) public static IsBoostedTreesQuantileStreamResourceInitialized create(Scope scope, Operand quantileStreamResourceHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("IsBoostedTreesQuantileStreamResourceInitialized", scope.makeOpName("IsBoostedTreesQuantileStreamResourceInitialized")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsBoostedTreesQuantileStreamResourceInitialized")); opBuilder.addInput(quantileStreamResourceHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new IsBoostedTreesQuantileStreamResourceInitialized(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java index 86bbca9334a..6f928151576 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustContrast.java @@ -71,7 +71,7 @@ private AdjustContrast(Operation operation) { ) public static AdjustContrast create(Scope scope, Operand images, Operand contrastFactor) { - OperationBuilder opBuilder = scope.env().opBuilder("AdjustContrastv2", scope.makeOpName("AdjustContrast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AdjustContrast")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(contrastFactor.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java index 64b03a7600f..744bcdbfbf1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustHue.java @@ -69,7 +69,7 @@ private AdjustHue(Operation operation) { ) public static AdjustHue create(Scope scope, Operand images, Operand delta) { - OperationBuilder opBuilder = scope.env().opBuilder("AdjustHue", scope.makeOpName("AdjustHue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AdjustHue")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(delta.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java index a87a80aef4c..5656c0748cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/AdjustSaturation.java @@ -69,7 +69,7 @@ private AdjustSaturation(Operation operation) { ) public static AdjustSaturation create(Scope scope, Operand images, Operand scale) { - OperationBuilder opBuilder = scope.env().opBuilder("AdjustSaturation", scope.makeOpName("AdjustSaturation")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AdjustSaturation")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(scale.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java index acf5dadb78e..9f33ea0c760 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CombinedNonMaxSuppression.java @@ -97,7 +97,7 @@ private CombinedNonMaxSuppression(Operation operation) { public static CombinedNonMaxSuppression create(Scope scope, Operand boxes, Operand scores, Operand maxOutputSizePerClass, Operand maxTotalSize, Operand iouThreshold, Operand scoreThreshold, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CombinedNonMaxSuppression", scope.makeOpName("CombinedNonMaxSuppression")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CombinedNonMaxSuppression")); opBuilder.addInput(boxes.asOutput()); opBuilder.addInput(scores.asOutput()); opBuilder.addInput(maxOutputSizePerClass.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java index 85bca3e2d4e..5477322a6c8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResize.java @@ -94,7 +94,7 @@ private CropAndResize(Operation operation) { public static CropAndResize create(Scope scope, Operand image, Operand boxes, Operand boxInd, Operand cropSize, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CropAndResize", scope.makeOpName("CropAndResize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CropAndResize")); opBuilder.addInput(image.asOutput()); opBuilder.addInput(boxes.asOutput()); opBuilder.addInput(boxInd.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java index 9eaddcb47ee..64eb73d46b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradBoxes.java @@ -73,7 +73,7 @@ private CropAndResizeGradBoxes(Operation operation) { public static CropAndResizeGradBoxes create(Scope scope, Operand grads, Operand image, Operand boxes, Operand boxInd, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CropAndResizeGradBoxes", scope.makeOpName("CropAndResizeGradBoxes")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CropAndResizeGradBoxes")); opBuilder.addInput(grads.asOutput()); opBuilder.addInput(image.asOutput()); opBuilder.addInput(boxes.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java index 8091f63b647..971cfe70dc5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/CropAndResizeGradImage.java @@ -79,7 +79,7 @@ private CropAndResizeGradImage(Operation operation) { public static CropAndResizeGradImage create(Scope scope, Operand grads, Operand boxes, Operand boxInd, Operand imageSize, Class T, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CropAndResizeGradImage", scope.makeOpName("CropAndResizeGradImage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CropAndResizeGradImage")); opBuilder.addInput(grads.asOutput()); opBuilder.addInput(boxes.asOutput()); opBuilder.addInput(boxInd.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java index ca839df34f5..550219265be 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeAndCropJpeg.java @@ -78,7 +78,7 @@ private DecodeAndCropJpeg(Operation operation) { ) public static DecodeAndCropJpeg create(Scope scope, Operand contents, Operand cropWindow, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeAndCropJpeg", scope.makeOpName("DecodeAndCropJpeg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeAndCropJpeg")); opBuilder.addInput(contents.asOutput()); opBuilder.addInput(cropWindow.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java index e2f57633dc5..f2cfe2c86f7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeBmp.java @@ -68,7 +68,7 @@ private DecodeBmp(Operation operation) { describeByClass = true ) public static DecodeBmp create(Scope scope, Operand contents, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeBmp", scope.makeOpName("DecodeBmp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeBmp")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java index f1aac55bf5d..85b936f7818 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeGif.java @@ -67,7 +67,7 @@ private DecodeGif(Operation operation) { describeByClass = true ) public static DecodeGif create(Scope scope, Operand contents) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeGif", scope.makeOpName("DecodeGif")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeGif")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); return new DecodeGif(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java index 4b372bec4a6..8b6951f2da7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeImage.java @@ -82,7 +82,7 @@ private DecodeImage(Operation operation) { ) public static DecodeImage create(Scope scope, Operand contents, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeImage", scope.makeOpName("DecodeImage")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeImage")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java index 8cdbda731b5..5e11fe84aa0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodeJpeg.java @@ -75,7 +75,7 @@ private DecodeJpeg(Operation operation) { describeByClass = true ) public static DecodeJpeg create(Scope scope, Operand contents, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeJpeg", scope.makeOpName("DecodeJpeg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeJpeg")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java index edefdf308f7..2b3591fafcb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DecodePng.java @@ -80,7 +80,7 @@ private DecodePng(Operation operation) { ) public static DecodePng create(Scope scope, Operand contents, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodePng", scope.makeOpName("DecodePng")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodePng")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java index 660dad4034f..980487d0c3b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/DrawBoundingBoxes.java @@ -75,7 +75,7 @@ private DrawBoundingBoxes(Operation operation) { ) public static DrawBoundingBoxes create(Scope scope, Operand images, Operand boxes, Operand colors) { - OperationBuilder opBuilder = scope.env().opBuilder("DrawBoundingBoxesV2", scope.makeOpName("DrawBoundingBoxes")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DrawBoundingBoxes")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(boxes.asOutput()); opBuilder.addInput(colors.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java index b03e10d8025..81ad610f790 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpeg.java @@ -76,7 +76,7 @@ private EncodeJpeg(Operation operation) { describeByClass = true ) public static EncodeJpeg create(Scope scope, Operand image, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EncodeJpeg", scope.makeOpName("EncodeJpeg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeJpeg")); opBuilder.addInput(image.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java index 5128843c1e1..732ca7bf7a7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodeJpegVariableQuality.java @@ -64,7 +64,7 @@ private EncodeJpegVariableQuality(Operation operation) { ) public static EncodeJpegVariableQuality create(Scope scope, Operand images, Operand quality) { - OperationBuilder opBuilder = scope.env().opBuilder("EncodeJpegVariableQuality", scope.makeOpName("EncodeJpegVariableQuality")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeJpegVariableQuality")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(quality.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java index 09f0b5b8b44..e9994f0dad6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/EncodePng.java @@ -72,7 +72,7 @@ private EncodePng(Operation operation) { ) public static EncodePng create(Scope scope, Operand image, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EncodePng", scope.makeOpName("EncodePng")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodePng")); opBuilder.addInput(image.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java index 82b134b39d5..ac4a33f2e01 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractGlimpse.java @@ -81,7 +81,7 @@ private ExtractGlimpse(Operation operation) { ) public static ExtractGlimpse create(Scope scope, Operand input, Operand sizeOutput, Operand offsets, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ExtractGlimpseV2", scope.makeOpName("ExtractGlimpse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractGlimpse")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(offsets.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java index 89a2979726b..7843008dbeb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractImagePatches.java @@ -73,7 +73,7 @@ private ExtractImagePatches(Operation operation) { ) public static ExtractImagePatches create(Scope scope, Operand images, List ksizes, List strides, List rates, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("ExtractImagePatches", scope.makeOpName("ExtractImagePatches")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractImagePatches")); opBuilder.addInput(images.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizesArray = new long[ksizes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java index 5b1a97ac1dc..23a922277ad 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ExtractJpegShape.java @@ -68,7 +68,7 @@ private ExtractJpegShape(Operation operation) { ) public static ExtractJpegShape create(Scope scope, Operand contents, Class outputType) { - OperationBuilder opBuilder = scope.env().opBuilder("ExtractJpegShape", scope.makeOpName("ExtractJpegShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExtractJpegShape")); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_type", Operands.toDataType(outputType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java index 895afd33b3b..54dd35813f7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/GenerateBoundingBoxProposals.java @@ -82,7 +82,7 @@ public static GenerateBoundingBoxProposals create(Scope scope, Operand Operand bboxDeltas, Operand imageInfo, Operand anchors, Operand nmsThreshold, Operand preNmsTopn, Operand minSize, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("GenerateBoundingBoxProposals", scope.makeOpName("GenerateBoundingBoxProposals")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GenerateBoundingBoxProposals")); opBuilder.addInput(scores.asOutput()); opBuilder.addInput(bboxDeltas.asOutput()); opBuilder.addInput(imageInfo.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java index f87b0d696ad..0fdfc5daac0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/HsvToRgb.java @@ -65,7 +65,7 @@ private HsvToRgb(Operation operation) { describeByClass = true ) public static HsvToRgb create(Scope scope, Operand images) { - OperationBuilder opBuilder = scope.env().opBuilder("HSVToRGB", scope.makeOpName("HsvToRgb")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HsvToRgb")); opBuilder.addInput(images.asOutput()); opBuilder = scope.apply(opBuilder); return new HsvToRgb<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java index cfd556a54d8..97d3244bd27 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV2.java @@ -72,7 +72,7 @@ private ImageProjectiveTransformV2(Operation operation) { public static ImageProjectiveTransformV2 create(Scope scope, Operand images, Operand transforms, Operand outputShape, String interpolation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ImageProjectiveTransformV2", scope.makeOpName("ImageProjectiveTransformV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImageProjectiveTransformV2")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(transforms.asOutput()); opBuilder.addInput(outputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java index 143c787038e..434260d117c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ImageProjectiveTransformV3.java @@ -73,7 +73,7 @@ private ImageProjectiveTransformV3(Operation operation) { public static ImageProjectiveTransformV3 create(Scope scope, Operand images, Operand transforms, Operand outputShape, Operand fillValue, String interpolation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ImageProjectiveTransformV3", scope.makeOpName("ImageProjectiveTransformV3")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImageProjectiveTransformV3")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(transforms.asOutput()); opBuilder.addInput(outputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java index 4583d0b0f53..085e8e7ae05 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NearestNeighbors.java @@ -65,7 +65,7 @@ private NearestNeighbors(Operation operation) { ) public static NearestNeighbors create(Scope scope, Operand points, Operand centers, Operand k) { - OperationBuilder opBuilder = scope.env().opBuilder("NearestNeighbors", scope.makeOpName("NearestNeighbors")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NearestNeighbors")); opBuilder.addInput(points.asOutput()); opBuilder.addInput(centers.asOutput()); opBuilder.addInput(k.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java index 53126904212..82082ac8d74 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppression.java @@ -104,7 +104,7 @@ private NonMaxSuppression(Operation operation) { public static NonMaxSuppression create(Scope scope, Operand boxes, Operand scores, Operand maxOutputSize, Operand iouThreshold, Operand scoreThreshold, Operand softNmsSigma, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("NonMaxSuppressionV5", scope.makeOpName("NonMaxSuppression")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonMaxSuppression")); opBuilder.addInput(boxes.asOutput()); opBuilder.addInput(scores.asOutput()); opBuilder.addInput(maxOutputSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java index 79518d3ea12..4c7fd59444c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/NonMaxSuppressionWithOverlaps.java @@ -82,7 +82,7 @@ private NonMaxSuppressionWithOverlaps(Operation operation) { public static NonMaxSuppressionWithOverlaps create(Scope scope, Operand overlaps, Operand scores, Operand maxOutputSize, Operand overlapThreshold, Operand scoreThreshold) { - OperationBuilder opBuilder = scope.env().opBuilder("NonMaxSuppressionWithOverlaps", scope.makeOpName("NonMaxSuppressionWithOverlaps")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonMaxSuppressionWithOverlaps")); opBuilder.addInput(overlaps.asOutput()); opBuilder.addInput(scores.asOutput()); opBuilder.addInput(maxOutputSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java index b22bae33b1d..1a08a0835d0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/QuantizedResizeBilinear.java @@ -77,7 +77,7 @@ private QuantizedResizeBilinear(Operation operation) { public static QuantizedResizeBilinear create(Scope scope, Operand images, Operand sizeOutput, Operand min, Operand max, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedResizeBilinear", scope.makeOpName("QuantizedResizeBilinear")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedResizeBilinear")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(min.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java index 6e3ea00d657..c8b3afda622 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RandomCrop.java @@ -70,7 +70,7 @@ private RandomCrop(Operation operation) { ) public static RandomCrop create(Scope scope, Operand image, Operand sizeOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomCrop", scope.makeOpName("RandomCrop")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomCrop")); opBuilder.addInput(image.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java index 45f3428ac25..5358048f92c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeArea.java @@ -73,7 +73,7 @@ private ResizeArea(Operation operation) { ) public static ResizeArea create(Scope scope, Operand images, Operand sizeOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeArea", scope.makeOpName("ResizeArea")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeArea")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java index 2d40c5ddb2c..a4814622c6e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubic.java @@ -65,7 +65,7 @@ private ResizeBicubic(Operation operation) { ) public static ResizeBicubic create(Scope scope, Operand images, Operand sizeOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeBicubic", scope.makeOpName("ResizeBicubic")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBicubic")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java index 9d4e3bb5eb8..9c5c786215f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBicubicGrad.java @@ -62,7 +62,7 @@ private ResizeBicubicGrad(Operation operation) { ) public static ResizeBicubicGrad create(Scope scope, Operand grads, Operand originalImage, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeBicubicGrad", scope.makeOpName("ResizeBicubicGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBicubicGrad")); opBuilder.addInput(grads.asOutput()); opBuilder.addInput(originalImage.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java index 77d6d1660e1..ab625f8fa43 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinear.java @@ -65,7 +65,7 @@ private ResizeBilinear(Operation operation) { ) public static ResizeBilinear create(Scope scope, Operand images, Operand sizeOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeBilinear", scope.makeOpName("ResizeBilinear")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBilinear")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java index 79e15102d2e..3f1324421d0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeBilinearGrad.java @@ -62,7 +62,7 @@ private ResizeBilinearGrad(Operation operation) { ) public static ResizeBilinearGrad create(Scope scope, Operand grads, Operand originalImage, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeBilinearGrad", scope.makeOpName("ResizeBilinearGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeBilinearGrad")); opBuilder.addInput(grads.asOutput()); opBuilder.addInput(originalImage.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java index 48ea170bfa3..2f3e188c9f0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighbor.java @@ -66,7 +66,7 @@ private ResizeNearestNeighbor(Operation operation) { ) public static ResizeNearestNeighbor create(Scope scope, Operand images, Operand sizeOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeNearestNeighbor", scope.makeOpName("ResizeNearestNeighbor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeNearestNeighbor")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java index 3e25989b8d9..ea78ad2422c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ResizeNearestNeighborGrad.java @@ -62,7 +62,7 @@ private ResizeNearestNeighborGrad(Operation operation) { ) public static ResizeNearestNeighborGrad create(Scope scope, Operand grads, Operand sizeOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResizeNearestNeighborGrad", scope.makeOpName("ResizeNearestNeighborGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResizeNearestNeighborGrad")); opBuilder.addInput(grads.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java index 3c3b3bd0dcf..2a1a81c7543 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/RgbToHsv.java @@ -82,7 +82,7 @@ private RgbToHsv(Operation operation) { describeByClass = true ) public static RgbToHsv create(Scope scope, Operand images) { - OperationBuilder opBuilder = scope.env().opBuilder("RGBToHSV", scope.makeOpName("RgbToHsv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RgbToHsv")); opBuilder.addInput(images.asOutput()); opBuilder = scope.apply(opBuilder); return new RgbToHsv<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java index 6f8756492dd..0148cf27973 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/SampleDistortedBoundingBox.java @@ -112,7 +112,7 @@ private SampleDistortedBoundingBox(Operation operation) { public static SampleDistortedBoundingBox create(Scope scope, Operand imageSize, Operand boundingBoxes, Operand minObjectCovered, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SampleDistortedBoundingBoxV2", scope.makeOpName("SampleDistortedBoundingBox")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SampleDistortedBoundingBox")); opBuilder.addInput(imageSize.asOutput()); opBuilder.addInput(boundingBoxes.asOutput()); opBuilder.addInput(minObjectCovered.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java index 2e221c62035..5569ff2873e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslate.java @@ -66,7 +66,7 @@ private ScaleAndTranslate(Operation operation) { public static ScaleAndTranslate create(Scope scope, Operand images, Operand sizeOutput, Operand scale, Operand translation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScaleAndTranslate", scope.makeOpName("ScaleAndTranslate")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScaleAndTranslate")); opBuilder.addInput(images.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(scale.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java index 7ab3f62e791..4afc53b6144 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/ScaleAndTranslateGrad.java @@ -64,7 +64,7 @@ private ScaleAndTranslateGrad(Operation operation) { public static ScaleAndTranslateGrad create(Scope scope, Operand grads, Operand originalImage, Operand scale, Operand translation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ScaleAndTranslateGrad", scope.makeOpName("ScaleAndTranslateGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScaleAndTranslateGrad")); opBuilder.addInput(grads.asOutput()); opBuilder.addInput(originalImage.asOutput()); opBuilder.addInput(scale.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java index cf5fd9ed0c7..cf52a0dd9ce 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/image/StatelessSampleDistortedBoundingBox.java @@ -139,7 +139,7 @@ private StatelessSampleDistortedBoundingBox(Operation operation) { public static StatelessSampleDistortedBoundingBox create(Scope scope, Operand imageSize, Operand boundingBoxes, Operand minObjectCovered, Operand seed, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessSampleDistortedBoundingBox", scope.makeOpName("StatelessSampleDistortedBoundingBox")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessSampleDistortedBoundingBox")); opBuilder.addInput(imageSize.asOutput()); opBuilder.addInput(boundingBoxes.asOutput()); opBuilder.addInput(minObjectCovered.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java index 38c7a2c1b29..c8a01988603 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeBase64.java @@ -60,7 +60,7 @@ private DecodeBase64(Operation operation) { describeByClass = true ) public static DecodeBase64 create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeBase64", scope.makeOpName("DecodeBase64")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeBase64")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new DecodeBase64(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java index 314c1f74b43..d90bac56d9c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCompressed.java @@ -64,7 +64,7 @@ private DecodeCompressed(Operation operation) { describeByClass = true ) public static DecodeCompressed create(Scope scope, Operand bytes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeCompressed", scope.makeOpName("DecodeCompressed")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeCompressed")); opBuilder.addInput(bytes.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java index bed943c4f66..f490599bb3b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeCsv.java @@ -75,7 +75,7 @@ private DecodeCsv(Operation operation) { ) public static DecodeCsv create(Scope scope, Operand records, Iterable> recordDefaults, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeCSV", scope.makeOpName("DecodeCsv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeCsv")); opBuilder.addInput(records.asOutput()); opBuilder.addInputList(Operands.asOutputs(recordDefaults)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java index 3781c269b84..a139beb6e2d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeJsonExample.java @@ -66,7 +66,7 @@ private DecodeJsonExample(Operation operation) { describeByClass = true ) public static DecodeJsonExample create(Scope scope, Operand jsonExamples) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeJSONExample", scope.makeOpName("DecodeJsonExample")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeJsonExample")); opBuilder.addInput(jsonExamples.asOutput()); opBuilder = scope.apply(opBuilder); return new DecodeJsonExample(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java index 8a50ac7beec..469742d7626 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodePaddedRaw.java @@ -70,7 +70,7 @@ private DecodePaddedRaw(Operation operation) { public static DecodePaddedRaw create(Scope scope, Operand inputBytes, Operand fixedLength, Class outType, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodePaddedRaw", scope.makeOpName("DecodePaddedRaw")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodePaddedRaw")); opBuilder.addInput(inputBytes.asOutput()); opBuilder.addInput(fixedLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java index 654693bfe82..791c3e61b8a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DecodeRaw.java @@ -66,7 +66,7 @@ private DecodeRaw(Operation operation) { ) public static DecodeRaw create(Scope scope, Operand bytes, Class outType, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DecodeRaw", scope.makeOpName("DecodeRaw")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DecodeRaw")); opBuilder.addInput(bytes.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java index 7effe9d1e06..a3780bff1c2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/DeserializeManySparse.java @@ -112,7 +112,7 @@ private DeserializeManySparse(Operation operation) { ) public static DeserializeManySparse create(Scope scope, Operand serializedSparse, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("DeserializeManySparse", scope.makeOpName("DeserializeManySparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeserializeManySparse")); opBuilder.addInput(serializedSparse.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java index 5fcdb5ee0ff..b3f42819398 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/EncodeBase64.java @@ -64,7 +64,7 @@ private EncodeBase64(Operation operation) { describeByClass = true ) public static EncodeBase64 create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EncodeBase64", scope.makeOpName("EncodeBase64")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EncodeBase64")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java index ebe738189de..b83dffd8223 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FifoQueue.java @@ -65,7 +65,7 @@ private FifoQueue(Operation operation) { ) public static FifoQueue create(Scope scope, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FIFOQueueV2", scope.makeOpName("FifoQueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FifoQueue")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java index f36890bc20c..7236821a724 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/FixedLengthRecordReader.java @@ -60,7 +60,7 @@ private FixedLengthRecordReader(Operation operation) { describeByClass = true ) public static FixedLengthRecordReader create(Scope scope, Long recordBytes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FixedLengthRecordReaderV2", scope.makeOpName("FixedLengthRecordReader")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FixedLengthRecordReader")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("record_bytes", recordBytes); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java index 5e486af8d8c..9e319c77bb2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/IdentityReader.java @@ -61,7 +61,7 @@ private IdentityReader(Operation operation) { describeByClass = true ) public static IdentityReader create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("IdentityReaderV2", scope.makeOpName("IdentityReader")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IdentityReader")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java index 809fa21ef06..cc136db7e30 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/LmdbReader.java @@ -58,7 +58,7 @@ private LmdbReader(Operation operation) { describeByClass = true ) public static LmdbReader create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LMDBReader", scope.makeOpName("LmdbReader")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LmdbReader")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java index 43d1a16b193..79db5b7b67c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/MatchingFiles.java @@ -61,7 +61,7 @@ private MatchingFiles(Operation operation) { describeByClass = true ) public static MatchingFiles create(Scope scope, Operand pattern) { - OperationBuilder opBuilder = scope.env().opBuilder("MatchingFiles", scope.makeOpName("MatchingFiles")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatchingFiles")); opBuilder.addInput(pattern.asOutput()); opBuilder = scope.apply(opBuilder); return new MatchingFiles(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java index 932a54aa542..c12c95bf0e4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PaddingFifoQueue.java @@ -68,7 +68,7 @@ private PaddingFifoQueue(Operation operation) { ) public static PaddingFifoQueue create(Scope scope, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PaddingFIFOQueueV2", scope.makeOpName("PaddingFifoQueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PaddingFifoQueue")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java index bd9226c2007..6013eb885d3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseExample.java @@ -146,7 +146,7 @@ public static ParseExample create(Scope scope, Operand serialized, Operand raggedKeys, Iterable> denseDefaults, Long numSparse, List> sparseTypes, List> raggedValueTypes, List> raggedSplitTypes, List denseShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ParseExampleV2", scope.makeOpName("ParseExample")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseExample")); opBuilder.addInput(serialized.asOutput()); opBuilder.addInput(names.asOutput()); opBuilder.addInput(sparseKeys.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java index 7dba9d90ce1..a56a0e66fae 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSequenceExample.java @@ -186,7 +186,7 @@ public static ParseSequenceExample create(Scope scope, Operand serializ List> featureListSparseTypes, List> featureListRaggedValueTypes, List> featureListRaggedSplitTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ParseSequenceExampleV2", scope.makeOpName("ParseSequenceExample")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseSequenceExample")); opBuilder.addInput(serialized.asOutput()); opBuilder.addInput(debugName.asOutput()); opBuilder.addInput(contextSparseKeys.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java index ecb09fca4a4..d4bb50938a5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleExample.java @@ -113,7 +113,7 @@ private ParseSingleExample(Operation operation) { public static ParseSingleExample create(Scope scope, Operand serialized, Iterable> denseDefaults, Long numSparse, List sparseKeys, List denseKeys, List> sparseTypes, List denseShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("ParseSingleExample", scope.makeOpName("ParseSingleExample")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseSingleExample")); opBuilder.addInput(serialized.asOutput()); opBuilder.addInputList(Operands.asOutputs(denseDefaults)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java index 34347ecaf9d..e251c7dcdac 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseSingleSequenceExample.java @@ -148,7 +148,7 @@ public static ParseSingleSequenceExample create(Scope scope, Operand se Operand debugName, List> contextSparseTypes, List> featureListDenseTypes, List> featureListSparseTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ParseSingleSequenceExample", scope.makeOpName("ParseSingleSequenceExample")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseSingleSequenceExample")); opBuilder.addInput(serialized.asOutput()); opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput()); opBuilder.addInputList(Operands.asOutputs(contextSparseKeys)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java index 52a94630841..ecabdeedd1d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ParseTensor.java @@ -66,7 +66,7 @@ private ParseTensor(Operation operation) { ) public static ParseTensor create(Scope scope, Operand serialized, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("ParseTensor", scope.makeOpName("ParseTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParseTensor")); opBuilder.addInput(serialized.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java index 50f19104033..40494e12bbb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/PriorityQueue.java @@ -73,7 +73,7 @@ private PriorityQueue(Operation operation) { ) public static PriorityQueue create(Scope scope, List> componentTypes, List shapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PriorityQueueV2", scope.makeOpName("PriorityQueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PriorityQueue")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes)); Shape[] shapesArray = new Shape[shapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java index 6b8f52aa55f..6be7248ac76 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueClose.java @@ -60,7 +60,7 @@ private QueueClose(Operation operation) { ) public static QueueClose create(Scope scope, Operand handle, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueCloseV2", scope.makeOpName("QueueClose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueClose")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java index 58d59e2cd83..b5e34e4b502 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeue.java @@ -73,7 +73,7 @@ private QueueDequeue(Operation operation) { ) public static QueueDequeue create(Scope scope, Operand handle, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueDequeueV2", scope.makeOpName("QueueDequeue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueDequeue")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java index 1e9f70e4cbf..0974a0a1123 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueMany.java @@ -80,7 +80,7 @@ private QueueDequeueMany(Operation operation) { ) public static QueueDequeueMany create(Scope scope, Operand handle, Operand n, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueDequeueManyV2", scope.makeOpName("QueueDequeueMany")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueDequeueMany")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(n.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java index 55481610ae9..4a48ab57803 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueDequeueUpTo.java @@ -84,7 +84,7 @@ private QueueDequeueUpTo(Operation operation) { ) public static QueueDequeueUpTo create(Scope scope, Operand handle, Operand n, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueDequeueUpToV2", scope.makeOpName("QueueDequeueUpTo")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueDequeueUpTo")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(n.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java index 69d45c14e4d..35dd60dbdcf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueue.java @@ -61,7 +61,7 @@ private QueueEnqueue(Operation operation) { ) public static QueueEnqueue create(Scope scope, Operand handle, Iterable> components, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueEnqueueV2", scope.makeOpName("QueueEnqueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueEnqueue")); opBuilder.addInput(handle.asOutput()); opBuilder.addInputList(Operands.asOutputs(components)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java index bb94e9135e2..e6cf9c9926e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueEnqueueMany.java @@ -65,7 +65,7 @@ private QueueEnqueueMany(Operation operation) { ) public static QueueEnqueueMany create(Scope scope, Operand handle, Iterable> components, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueEnqueueManyV2", scope.makeOpName("QueueEnqueueMany")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueEnqueueMany")); opBuilder.addInput(handle.asOutput()); opBuilder.addInputList(Operands.asOutputs(components)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java index dc421adf0cb..9df0cef815e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueIsClosed.java @@ -61,7 +61,7 @@ private QueueIsClosed(Operation operation) { describeByClass = true ) public static QueueIsClosed create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueIsClosedV2", scope.makeOpName("QueueIsClosed")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueIsClosed")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new QueueIsClosed(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java index 660f30af385..ff803a50843 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/QueueSize.java @@ -59,7 +59,7 @@ private QueueSize(Operation operation) { describeByClass = true ) public static QueueSize create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("QueueSizeV2", scope.makeOpName("QueueSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QueueSize")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new QueueSize(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java index 0cfb155868a..7a3cbd62c62 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/RandomShuffleQueue.java @@ -65,7 +65,7 @@ private RandomShuffleQueue(Operation operation) { ) public static RandomShuffleQueue create(Scope scope, List> componentTypes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomShuffleQueueV2", scope.makeOpName("RandomShuffleQueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomShuffleQueue")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("component_types", Operands.toDataTypes(componentTypes)); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java index 15ea7421431..5eafc6682ea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReadFile.java @@ -58,7 +58,7 @@ private ReadFile(Operation operation) { describeByClass = true ) public static ReadFile create(Scope scope, Operand filename) { - OperationBuilder opBuilder = scope.env().opBuilder("ReadFile", scope.makeOpName("ReadFile")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReadFile")); opBuilder.addInput(filename.asOutput()); opBuilder = scope.apply(opBuilder); return new ReadFile(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java index 6f59aa79e82..31952d11fcd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumRecordsProduced.java @@ -62,7 +62,7 @@ private ReaderNumRecordsProduced(Operation operation) { ) public static ReaderNumRecordsProduced create(Scope scope, Operand readerHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderNumRecordsProducedV2", scope.makeOpName("ReaderNumRecordsProduced")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderNumRecordsProduced")); opBuilder.addInput(readerHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new ReaderNumRecordsProduced(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java index e2a9d63cf6f..7e2de97fd90 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderNumWorkUnitsCompleted.java @@ -60,7 +60,7 @@ private ReaderNumWorkUnitsCompleted(Operation operation) { ) public static ReaderNumWorkUnitsCompleted create(Scope scope, Operand readerHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderNumWorkUnitsCompletedV2", scope.makeOpName("ReaderNumWorkUnitsCompleted")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderNumWorkUnitsCompleted")); opBuilder.addInput(readerHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new ReaderNumWorkUnitsCompleted(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java index 4d93e58b2af..d205d033ed2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRead.java @@ -67,7 +67,7 @@ private ReaderRead(Operation operation) { ) public static ReaderRead create(Scope scope, Operand readerHandle, Operand queueHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderReadV2", scope.makeOpName("ReaderRead")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderRead")); opBuilder.addInput(readerHandle.asOutput()); opBuilder.addInput(queueHandle.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java index 6ad36598c35..3e5b3100870 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReadUpTo.java @@ -70,7 +70,7 @@ private ReaderReadUpTo(Operation operation) { ) public static ReaderReadUpTo create(Scope scope, Operand readerHandle, Operand queueHandle, Operand numRecords) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderReadUpToV2", scope.makeOpName("ReaderReadUpTo")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderReadUpTo")); opBuilder.addInput(readerHandle.asOutput()); opBuilder.addInput(queueHandle.asOutput()); opBuilder.addInput(numRecords.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java index fb4760c29c3..a96b6a75468 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderReset.java @@ -53,7 +53,7 @@ private ReaderReset(Operation operation) { describeByClass = true ) public static ReaderReset create(Scope scope, Operand readerHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderResetV2", scope.makeOpName("ReaderReset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderReset")); opBuilder.addInput(readerHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new ReaderReset(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java index 3bd856a0ea9..23f64953497 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderRestoreState.java @@ -59,7 +59,7 @@ private ReaderRestoreState(Operation operation) { ) public static ReaderRestoreState create(Scope scope, Operand readerHandle, Operand state) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderRestoreStateV2", scope.makeOpName("ReaderRestoreState")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderRestoreState")); opBuilder.addInput(readerHandle.asOutput()); opBuilder.addInput(state.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java index 9f430108cee..c996d0d7d8d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ReaderSerializeState.java @@ -61,7 +61,7 @@ private ReaderSerializeState(Operation operation) { describeByClass = true ) public static ReaderSerializeState create(Scope scope, Operand readerHandle) { - OperationBuilder opBuilder = scope.env().opBuilder("ReaderSerializeStateV2", scope.makeOpName("ReaderSerializeState")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReaderSerializeState")); opBuilder.addInput(readerHandle.asOutput()); opBuilder = scope.apply(opBuilder); return new ReaderSerializeState(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java index e0c0e3224e6..a47ed876db2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeManySparse.java @@ -76,7 +76,7 @@ private SerializeManySparse(Operation operation) { public static SerializeManySparse create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("SerializeManySparse", scope.makeOpName("SerializeManySparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeManySparse")); opBuilder.addInput(sparseIndices.asOutput()); opBuilder.addInput(sparseValues.asOutput()); opBuilder.addInput(sparseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java index a69add77a64..dec5fd1eeb9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeSparse.java @@ -70,7 +70,7 @@ private SerializeSparse(Operation operation) { public static SerializeSparse create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("SerializeSparse", scope.makeOpName("SerializeSparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeSparse")); opBuilder.addInput(sparseIndices.asOutput()); opBuilder.addInput(sparseValues.asOutput()); opBuilder.addInput(sparseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java index 85f7452f213..2d7dbecabee 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/SerializeTensor.java @@ -59,7 +59,7 @@ private SerializeTensor(Operation operation) { describeByClass = true ) public static SerializeTensor create(Scope scope, Operand tensor) { - OperationBuilder opBuilder = scope.env().opBuilder("SerializeTensor", scope.makeOpName("SerializeTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SerializeTensor")); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); return new SerializeTensor(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java index 912f27b7bc3..744a34b1329 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilename.java @@ -63,7 +63,7 @@ private ShardedFilename(Operation operation) { ) public static ShardedFilename create(Scope scope, Operand basename, Operand shard, Operand numShards) { - OperationBuilder opBuilder = scope.env().opBuilder("ShardedFilename", scope.makeOpName("ShardedFilename")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShardedFilename")); opBuilder.addInput(basename.asOutput()); opBuilder.addInput(shard.asOutput()); opBuilder.addInput(numShards.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java index e164304a889..8b369b037c0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/ShardedFilespec.java @@ -61,7 +61,7 @@ private ShardedFilespec(Operation operation) { ) public static ShardedFilespec create(Scope scope, Operand basename, Operand numShards) { - OperationBuilder opBuilder = scope.env().opBuilder("ShardedFilespec", scope.makeOpName("ShardedFilespec")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShardedFilespec")); opBuilder.addInput(basename.asOutput()); opBuilder.addInput(numShards.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java index 61d2afa4869..136a4b7364d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TextLineReader.java @@ -59,7 +59,7 @@ private TextLineReader(Operation operation) { describeByClass = true ) public static TextLineReader create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TextLineReaderV2", scope.makeOpName("TextLineReader")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TextLineReader")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java index 8d2c43efb03..8e8ca9daf9e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/TfRecordReader.java @@ -59,7 +59,7 @@ private TfRecordReader(Operation operation) { describeByClass = true ) public static TfRecordReader create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TFRecordReaderV2", scope.makeOpName("TfRecordReader")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TfRecordReader")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java index d40b25906dd..8c14d1b103b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WholeFileReader.java @@ -61,7 +61,7 @@ private WholeFileReader(Operation operation) { describeByClass = true ) public static WholeFileReader create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("WholeFileReaderV2", scope.makeOpName("WholeFileReader")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WholeFileReader")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java index 4397e567d90..28c66faab20 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/io/WriteFile.java @@ -56,7 +56,7 @@ private WriteFile(Operation operation) { ) public static WriteFile create(Scope scope, Operand filename, Operand contents) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteFile", scope.makeOpName("WriteFile")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteFile")); opBuilder.addInput(filename.asOutput()); opBuilder.addInput(contents.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java index 4205f873deb..77f4ac33b9b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandPart.java @@ -97,7 +97,7 @@ private BandPart(Operation operation) { ) public static BandPart create(Scope scope, Operand input, Operand numLower, Operand numUpper) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixBandPart", scope.makeOpName("BandPart")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BandPart")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(numLower.asOutput()); opBuilder.addInput(numUpper.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java index cc7df0281c9..144660c2053 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BandedTriangularSolve.java @@ -60,7 +60,7 @@ private BandedTriangularSolve(Operation operation) { ) public static BandedTriangularSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BandedTriangularSolve", scope.makeOpName("BandedTriangularSolve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BandedTriangularSolve")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java index af22fb9c574..9be5326dbf3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholesky.java @@ -61,7 +61,7 @@ private BatchCholesky(Operation operation) { describeByClass = true ) public static BatchCholesky create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchCholesky", scope.makeOpName("BatchCholesky")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchCholesky")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchCholesky<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java index 50ad2bae38a..52f1bef7273 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchCholeskyGrad.java @@ -63,7 +63,7 @@ private BatchCholeskyGrad(Operation operation) { ) public static BatchCholeskyGrad create(Scope scope, Operand l, Operand grad) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchCholeskyGrad", scope.makeOpName("BatchCholeskyGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchCholeskyGrad")); opBuilder.addInput(l.asOutput()); opBuilder.addInput(grad.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java index 4fc2f6f262a..bd756ae0cd9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixBandPart.java @@ -65,7 +65,7 @@ private BatchMatrixBandPart(Operation operation) { ) public static BatchMatrixBandPart create(Scope scope, Operand input, Operand numLower, Operand numUpper) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixBandPart", scope.makeOpName("BatchMatrixBandPart")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixBandPart")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(numLower.asOutput()); opBuilder.addInput(numUpper.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java index 72ff4326b11..f5f06c0557e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDeterminant.java @@ -61,7 +61,7 @@ private BatchMatrixDeterminant(Operation operation) { describeByClass = true ) public static BatchMatrixDeterminant create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixDeterminant", scope.makeOpName("BatchMatrixDeterminant")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixDeterminant")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchMatrixDeterminant<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java index 09395a2925a..e79c4e6359a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiag.java @@ -61,7 +61,7 @@ private BatchMatrixDiag(Operation operation) { describeByClass = true ) public static BatchMatrixDiag create(Scope scope, Operand diagonal) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixDiag", scope.makeOpName("BatchMatrixDiag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixDiag")); opBuilder.addInput(diagonal.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchMatrixDiag<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java index f438faf728e..068e42fc02d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixDiagPart.java @@ -61,7 +61,7 @@ private BatchMatrixDiagPart(Operation operation) { describeByClass = true ) public static BatchMatrixDiagPart create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixDiagPart", scope.makeOpName("BatchMatrixDiagPart")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixDiagPart")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchMatrixDiagPart<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java index 6e99d4a575b..d50d411971a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixInverse.java @@ -63,7 +63,7 @@ private BatchMatrixInverse(Operation operation) { ) public static BatchMatrixInverse create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixInverse", scope.makeOpName("BatchMatrixInverse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixInverse")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java index 87a80dddc78..dc02831a296 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSetDiag.java @@ -63,7 +63,7 @@ private BatchMatrixSetDiag(Operation operation) { ) public static BatchMatrixSetDiag create(Scope scope, Operand input, Operand diagonal) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixSetDiag", scope.makeOpName("BatchMatrixSetDiag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixSetDiag")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(diagonal.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java index fc9ea69fc10..9170246b78f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolve.java @@ -64,7 +64,7 @@ private BatchMatrixSolve(Operation operation) { ) public static BatchMatrixSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixSolve", scope.makeOpName("BatchMatrixSolve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixSolve")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java index a88d9999dd6..cd8011f1d83 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixSolveLs.java @@ -66,7 +66,7 @@ private BatchMatrixSolveLs(Operation operation) { ) public static BatchMatrixSolveLs create(Scope scope, Operand matrix, Operand rhs, Operand l2Regularizer, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixSolveLs", scope.makeOpName("BatchMatrixSolveLs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixSolveLs")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder.addInput(l2Regularizer.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java index beca75fc48c..ae3023e22a3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchMatrixTriangularSolve.java @@ -64,7 +64,7 @@ private BatchMatrixTriangularSolve(Operation operation) { ) public static BatchMatrixTriangularSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixTriangularSolve", scope.makeOpName("BatchMatrixTriangularSolve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatrixTriangularSolve")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java index 16b2f162576..bf624b3668e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSelfAdjointEig.java @@ -66,7 +66,7 @@ private BatchSelfAdjointEig(Operation operation) { ) public static BatchSelfAdjointEig create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchSelfAdjointEigV2", scope.makeOpName("BatchSelfAdjointEig")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchSelfAdjointEig")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java index 95600f6f7e1..3ef2cb277df 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/BatchSvd.java @@ -69,7 +69,7 @@ private BatchSvd(Operation operation) { ) public static BatchSvd create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchSvd", scope.makeOpName("BatchSvd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchSvd")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java index 09ac253370d..ab4ee760183 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cholesky.java @@ -71,7 +71,7 @@ private Cholesky(Operation operation) { describeByClass = true ) public static Cholesky create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("Cholesky", scope.makeOpName("Cholesky")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cholesky")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Cholesky<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java index be0fcc6fe71..dcd90da3041 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/CholeskyGrad.java @@ -69,7 +69,7 @@ private CholeskyGrad(Operation operation) { ) public static CholeskyGrad create(Scope scope, Operand l, Operand grad) { - OperationBuilder opBuilder = scope.env().opBuilder("CholeskyGrad", scope.makeOpName("CholeskyGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CholeskyGrad")); opBuilder.addInput(l.asOutput()); opBuilder.addInput(grad.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java index 622f1e2469e..0bbcbbb88d3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/ConjugateTranspose.java @@ -67,7 +67,7 @@ private ConjugateTranspose(Operation operation) { ) public static ConjugateTranspose create(Scope scope, Operand x, Operand perm) { - OperationBuilder opBuilder = scope.env().opBuilder("ConjugateTranspose", scope.makeOpName("ConjugateTranspose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConjugateTranspose")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(perm.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java index 004c88358fd..3a61a137e51 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Cross.java @@ -65,7 +65,7 @@ private Cross(Operation operation) { describeByClass = true ) public static Cross create(Scope scope, Operand a, Operand b) { - OperationBuilder opBuilder = scope.env().opBuilder("Cross", scope.makeOpName("Cross")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cross")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java index 36f48f9383b..7047cb8d97f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Det.java @@ -64,7 +64,7 @@ private Det(Operation operation) { describeByClass = true ) public static Det create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixDeterminant", scope.makeOpName("Det")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Det")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Det<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java index bb7ab87c4a0..b1cce520076 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Eig.java @@ -78,7 +78,7 @@ private Eig(Operation operation) { ) public static Eig create(Scope scope, Operand input, Class Tout, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Eig", scope.makeOpName("Eig")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Eig")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java index b9b334441ec..51ff55b64a7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Einsum.java @@ -127,7 +127,7 @@ private Einsum(Operation operation) { ) public static Einsum create(Scope scope, Iterable> inputs, String equation) { - OperationBuilder opBuilder = scope.env().opBuilder("Einsum", scope.makeOpName("Einsum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Einsum")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("equation", equation); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java index befba75f3c2..911650b50ea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/EuclideanNorm.java @@ -70,7 +70,7 @@ private EuclideanNorm(Operation operation) { ) public static EuclideanNorm create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EuclideanNorm", scope.makeOpName("EuclideanNorm")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EuclideanNorm")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java index ca8f65ed27f..67f6ab7895f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Inv.java @@ -69,7 +69,7 @@ private Inv(Operation operation) { describeByClass = true ) public static Inv create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixInverse", scope.makeOpName("Inv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Inv")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java index 854ea4b2e51..f7e1d8214c4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LoadAndRemapMatrix.java @@ -106,7 +106,7 @@ private LoadAndRemapMatrix(Operation operation) { public static LoadAndRemapMatrix create(Scope scope, Operand ckptPath, Operand oldTensorName, Operand rowRemapping, Operand colRemapping, Operand initializingValues, Long numRows, Long numCols, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadAndRemapMatrix", scope.makeOpName("LoadAndRemapMatrix")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadAndRemapMatrix")); opBuilder.addInput(ckptPath.asOutput()); opBuilder.addInput(oldTensorName.asOutput()); opBuilder.addInput(rowRemapping.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java index 26efa559281..a5374bb74f7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/LogMatrixDeterminant.java @@ -72,7 +72,7 @@ private LogMatrixDeterminant(Operation operation) { describeByClass = true ) public static LogMatrixDeterminant create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("LogMatrixDeterminant", scope.makeOpName("LogMatrixDeterminant")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogMatrixDeterminant")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new LogMatrixDeterminant<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java index cc6adce3d1c..69be99d1411 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Lu.java @@ -86,7 +86,7 @@ private Lu(Operation operation) { ) public static Lu create(Scope scope, Operand input, Class outputIdxType) { - OperationBuilder opBuilder = scope.env().opBuilder("Lu", scope.makeOpName("Lu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Lu")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_idx_type", Operands.toDataType(outputIdxType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java index a82e456fa7c..5e67b7a3c4d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatMul.java @@ -70,7 +70,7 @@ private MatMul(Operation operation) { ) public static MatMul create(Scope scope, Operand a, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatMul", scope.makeOpName("MatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatMul")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java index b435a8f3ee3..cf9a8b9b4f9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiag.java @@ -156,7 +156,7 @@ private MatrixDiag(Operation operation) { public static MatrixDiag create(Scope scope, Operand diagonal, Operand k, Operand numRows, Operand numCols, Operand paddingValue) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixDiagV2", scope.makeOpName("MatrixDiag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiag")); opBuilder.addInput(diagonal.asOutput()); opBuilder.addInput(k.asOutput()); opBuilder.addInput(numRows.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java index 7b05239e769..4e61470cebd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPart.java @@ -129,7 +129,7 @@ private MatrixDiagPart(Operation operation) { ) public static MatrixDiagPart create(Scope scope, Operand input, Operand k, Operand paddingValue) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixDiagPartV2", scope.makeOpName("MatrixDiagPart")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiagPart")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(k.asOutput()); opBuilder.addInput(paddingValue.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java index fdf06598984..53c442dfb66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagPartV3.java @@ -160,7 +160,7 @@ private MatrixDiagPartV3(Operation operation) { ) public static MatrixDiagPartV3 create(Scope scope, Operand input, Operand k, Operand paddingValue, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixDiagPartV3", scope.makeOpName("MatrixDiagPartV3")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiagPartV3")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(k.asOutput()); opBuilder.addInput(paddingValue.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java index 3a118c142d4..22b39d750d9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixDiagV3.java @@ -185,7 +185,7 @@ private MatrixDiagV3(Operation operation) { public static MatrixDiagV3 create(Scope scope, Operand diagonal, Operand k, Operand numRows, Operand numCols, Operand paddingValue, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixDiagV3", scope.makeOpName("MatrixDiagV3")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixDiagV3")); opBuilder.addInput(diagonal.asOutput()); opBuilder.addInput(k.asOutput()); opBuilder.addInput(numRows.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java index bcc4f514762..7d6f981d59c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixLogarithm.java @@ -68,7 +68,7 @@ private MatrixLogarithm(Operation operation) { describeByClass = true ) public static MatrixLogarithm create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixLogarithm", scope.makeOpName("MatrixLogarithm")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixLogarithm")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new MatrixLogarithm<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java index 61142a0228a..041fc78abab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSetDiag.java @@ -166,7 +166,7 @@ private MatrixSetDiag(Operation operation) { ) public static MatrixSetDiag create(Scope scope, Operand input, Operand diagonal, Operand k, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixSetDiagV3", scope.makeOpName("MatrixSetDiag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixSetDiag")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(diagonal.asOutput()); opBuilder.addInput(k.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java index c68a78bd3ee..c838da66ca4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/MatrixSolveLs.java @@ -99,7 +99,7 @@ private MatrixSolveLs(Operation operation) { ) public static MatrixSolveLs create(Scope scope, Operand matrix, Operand rhs, Operand l2Regularizer, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixSolveLs", scope.makeOpName("MatrixSolveLs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MatrixSolveLs")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder.addInput(l2Regularizer.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java index 513f2d3baef..bb0276b4fef 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Qr.java @@ -78,7 +78,7 @@ private Qr(Operation operation) { describeByClass = true ) public static Qr create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Qr", scope.makeOpName("Qr")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Qr")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java index 30b464c48b4..87131aada14 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMul.java @@ -86,7 +86,7 @@ public static QuantizedMatMul create(S Operand a, Operand b, Operand minA, Operand maxA, Operand minB, Operand maxB, Class Toutput, Class Tactivation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMul", scope.makeOpName("QuantizedMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMul")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(minA.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java index b781b62d915..ae37f39c042 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBias.java @@ -83,7 +83,7 @@ public static QuantizedMatMulWithBias create(Scope scope, Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, Class Toutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBias", scope.makeOpName("QuantizedMatMulWithBias")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBias")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java index 8a45662ec0a..b5a9c0adb82 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndRelu.java @@ -84,7 +84,7 @@ public static QuantizedMatMulWithBiasAndRelu create(Scope Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, Class Toutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndRelu", scope.makeOpName("QuantizedMatMulWithBiasAndRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndRelu")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java index 65415fbfd3c..4d53f20eab9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/QuantizedMatMulWithBiasAndReluAndRequantize.java @@ -88,7 +88,7 @@ public static QuantizedMatMulWithBiasAndReluAndRequantize Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, Operand minFreezedOutput, Operand maxFreezedOutput, Class Toutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedMatMulWithBiasAndReluAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndReluAndRequantize")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java index d01b4f3b829..51415f87a2c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/SelfAdjointEig.java @@ -76,7 +76,7 @@ private SelfAdjointEig(Operation operation) { ) public static SelfAdjointEig create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SelfAdjointEigV2", scope.makeOpName("SelfAdjointEig")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SelfAdjointEig")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java index 2fe29966804..b6eb29e4857 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Solve.java @@ -70,7 +70,7 @@ private Solve(Operation operation) { ) public static Solve create(Scope scope, Operand matrix, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixSolve", scope.makeOpName("Solve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Solve")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java index 3b09ba5ce39..cfff7ae9494 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Sqrtm.java @@ -73,7 +73,7 @@ private Sqrtm(Operation operation) { describeByClass = true ) public static Sqrtm create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixSquareRoot", scope.makeOpName("Sqrtm")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sqrtm")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Sqrtm<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java index ed2ae52d604..5f1328bdfa7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Svd.java @@ -79,7 +79,7 @@ private Svd(Operation operation) { describeByClass = true ) public static Svd create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Svd", scope.makeOpName("Svd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Svd")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java index 29f5a142746..093c4c7e27a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiag.java @@ -74,7 +74,7 @@ private TensorDiag(Operation operation) { describeByClass = true ) public static TensorDiag create(Scope scope, Operand diagonal) { - OperationBuilder opBuilder = scope.env().opBuilder("Diag", scope.makeOpName("TensorDiag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorDiag")); opBuilder.addInput(diagonal.asOutput()); opBuilder = scope.apply(opBuilder); return new TensorDiag<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java index 0ec6ee1c92b..42dc603d1f5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TensorDiagPart.java @@ -75,7 +75,7 @@ private TensorDiagPart(Operation operation) { describeByClass = true ) public static TensorDiagPart create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("DiagPart", scope.makeOpName("TensorDiagPart")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorDiagPart")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new TensorDiagPart<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java index ecec93ee1b2..46703ae3a66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/Transpose.java @@ -66,7 +66,7 @@ private Transpose(Operation operation) { ) public static Transpose create(Scope scope, Operand x, Operand perm) { - OperationBuilder opBuilder = scope.env().opBuilder("Transpose", scope.makeOpName("Transpose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Transpose")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(perm.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java index 63d24dd8554..b2a0047efbc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TriangularSolve.java @@ -106,7 +106,7 @@ private TriangularSolve(Operation operation) { ) public static TriangularSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MatrixTriangularSolve", scope.makeOpName("TriangularSolve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TriangularSolve")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java index c7e17d347e2..d15c3c7f7fe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalMatMul.java @@ -66,7 +66,7 @@ private TridiagonalMatMul(Operation operation) { ) public static TridiagonalMatMul create(Scope scope, Operand superdiag, Operand maindiag, Operand subdiag, Operand rhs) { - OperationBuilder opBuilder = scope.env().opBuilder("TridiagonalMatMul", scope.makeOpName("TridiagonalMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TridiagonalMatMul")); opBuilder.addInput(superdiag.asOutput()); opBuilder.addInput(maindiag.asOutput()); opBuilder.addInput(subdiag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java index f2e37cd217b..04f5d95a4cb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/TridiagonalSolve.java @@ -71,7 +71,7 @@ private TridiagonalSolve(Operation operation) { ) public static TridiagonalSolve create(Scope scope, Operand diagonals, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TridiagonalSolve", scope.makeOpName("TridiagonalSolve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TridiagonalSolve")); opBuilder.addInput(diagonals.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java index ea4b548550d..cab58a5bb71 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixComponents.java @@ -70,7 +70,7 @@ private CSRSparseMatrixComponents(Operation operation) { ) public static CSRSparseMatrixComponents create(Scope scope, Operand csrSparseMatrix, Operand index, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("CSRSparseMatrixComponents", scope.makeOpName("CSRSparseMatrixComponents")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSRSparseMatrixComponents")); opBuilder.addInput(csrSparseMatrix.asOutput()); opBuilder.addInput(index.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java index cc8ac477876..cb992b01b6f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToDense.java @@ -60,7 +60,7 @@ private CSRSparseMatrixToDense(Operation operation) { ) public static CSRSparseMatrixToDense create(Scope scope, Operand sparseInput, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("CSRSparseMatrixToDense", scope.makeOpName("CSRSparseMatrixToDense")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSRSparseMatrixToDense")); opBuilder.addInput(sparseInput.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("type", Operands.toDataType(type)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java index 553480c9462..0fa5e61e95c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/CSRSparseMatrixToSparseTensor.java @@ -67,7 +67,7 @@ private CSRSparseMatrixToSparseTensor(Operation operation) { ) public static CSRSparseMatrixToSparseTensor create(Scope scope, Operand sparseMatrix, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("CSRSparseMatrixToSparseTensor", scope.makeOpName("CSRSparseMatrixToSparseTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CSRSparseMatrixToSparseTensor")); opBuilder.addInput(sparseMatrix.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("type", Operands.toDataType(type)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java index 982450f9174..85698b15126 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/DenseToCSRSparseMatrix.java @@ -58,7 +58,7 @@ private DenseToCSRSparseMatrix(Operation operation) { ) public static DenseToCSRSparseMatrix create(Scope scope, Operand denseInput, Operand indices) { - OperationBuilder opBuilder = scope.env().opBuilder("DenseToCSRSparseMatrix", scope.makeOpName("DenseToCSRSparseMatrix")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToCSRSparseMatrix")); opBuilder.addInput(denseInput.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java index 2aa740b9c1c..4a27f1c657e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixAdd.java @@ -62,7 +62,7 @@ private SparseMatrixAdd(Operation operation) { ) public static SparseMatrixAdd create(Scope scope, Operand a, Operand b, Operand alpha, Operand beta) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixAdd", scope.makeOpName("SparseMatrixAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixAdd")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(alpha.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java index 021e86bf4d1..dba8e84ea2e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMatMul.java @@ -81,7 +81,7 @@ private SparseMatrixMatMul(Operation operation) { ) public static SparseMatrixMatMul create(Scope scope, Operand a, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixMatMul", scope.makeOpName("SparseMatrixMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixMatMul")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java index 4a9591186f0..1c276673459 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixMul.java @@ -63,7 +63,7 @@ private SparseMatrixMul(Operation operation) { ) public static SparseMatrixMul create(Scope scope, Operand a, Operand b) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixMul", scope.makeOpName("SparseMatrixMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixMul")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java index 25bcb71d722..8522899df3e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixNNZ.java @@ -55,7 +55,7 @@ private SparseMatrixNNZ(Operation operation) { describeByClass = true ) public static SparseMatrixNNZ create(Scope scope, Operand sparseMatrix) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixNNZ", scope.makeOpName("SparseMatrixNNZ")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixNNZ")); opBuilder.addInput(sparseMatrix.asOutput()); opBuilder = scope.apply(opBuilder); return new SparseMatrixNNZ(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java index 2e3c95d2db8..7e267045538 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixOrderingAMD.java @@ -96,7 +96,7 @@ private SparseMatrixOrderingAMD(Operation operation) { describeByClass = true ) public static SparseMatrixOrderingAMD create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixOrderingAMD", scope.makeOpName("SparseMatrixOrderingAMD")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixOrderingAMD")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new SparseMatrixOrderingAMD(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java index c7edeac6eca..339653ff4d2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmax.java @@ -64,7 +64,7 @@ private SparseMatrixSoftmax(Operation operation) { ) public static SparseMatrixSoftmax create(Scope scope, Operand logits, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSoftmax", scope.makeOpName("SparseMatrixSoftmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSoftmax")); opBuilder.addInput(logits.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("type", Operands.toDataType(type)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java index b420c86cfa7..390e4b704f5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSoftmaxGrad.java @@ -61,7 +61,7 @@ private SparseMatrixSoftmaxGrad(Operation operation) { ) public static SparseMatrixSoftmaxGrad create(Scope scope, Operand softmax, Operand gradSoftmax, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSoftmaxGrad", scope.makeOpName("SparseMatrixSoftmaxGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSoftmaxGrad")); opBuilder.addInput(softmax.asOutput()); opBuilder.addInput(gradSoftmax.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java index bfd4c8ad6a1..edaab7eb54b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseCholesky.java @@ -125,7 +125,7 @@ private SparseMatrixSparseCholesky(Operation operation) { ) public static SparseMatrixSparseCholesky create(Scope scope, Operand input, Operand permutation, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSparseCholesky", scope.makeOpName("SparseMatrixSparseCholesky")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSparseCholesky")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(permutation.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java index 22b6bac7a83..87995a7e78e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixSparseMatMul.java @@ -127,7 +127,7 @@ private SparseMatrixSparseMatMul(Operation operation) { ) public static SparseMatrixSparseMatMul create(Scope scope, Operand a, Operand b, Class type, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSparseMatMul", scope.makeOpName("SparseMatrixSparseMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixSparseMatMul")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java index 29432e58cf0..8ad12d3289e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixTranspose.java @@ -62,7 +62,7 @@ private SparseMatrixTranspose(Operation operation) { ) public static SparseMatrixTranspose create(Scope scope, Operand input, Class type, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixTranspose", scope.makeOpName("SparseMatrixTranspose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixTranspose")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("type", Operands.toDataType(type)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java index 81651bcd0f6..e7f0a48e1aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseMatrixZeros.java @@ -60,7 +60,7 @@ private SparseMatrixZeros(Operation operation) { ) public static SparseMatrixZeros create(Scope scope, Operand denseShape, Class type) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixZeros", scope.makeOpName("SparseMatrixZeros")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatrixZeros")); opBuilder.addInput(denseShape.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("type", Operands.toDataType(type)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java index 357549e364e..12f27f6ebea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/linalg/sparse/SparseTensorToCSRSparseMatrix.java @@ -59,7 +59,7 @@ private SparseTensorToCSRSparseMatrix(Operation operation) { ) public static SparseTensorToCSRSparseMatrix create(Scope scope, Operand indices, Operand values, Operand denseShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorToCSRSparseMatrix", scope.makeOpName("SparseTensorToCSRSparseMatrix")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorToCSRSparseMatrix")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(denseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java index f29c1aedd64..249b2567578 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Abs.java @@ -64,7 +64,7 @@ private Abs(Operation operation) { describeByClass = true ) public static Abs create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Abs", scope.makeOpName("Abs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Abs")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Abs<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java index 11beca2b5a9..2e314a940b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AccumulateN.java @@ -71,7 +71,7 @@ private AccumulateN(Operation operation) { ) public static AccumulateN create(Scope scope, Iterable> inputs, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("AccumulateNV2", scope.makeOpName("AccumulateN")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulateN")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java index d25c76a840f..063b23c388a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acos.java @@ -63,7 +63,7 @@ private Acos(Operation operation) { describeByClass = true ) public static Acos create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Acos", scope.makeOpName("Acos")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Acos")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Acos<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java index a6170975930..37594adbbf2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Acosh.java @@ -67,7 +67,7 @@ private Acosh(Operation operation) { describeByClass = true ) public static Acosh create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Acosh", scope.makeOpName("Acosh")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Acosh")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Acosh<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java index a7072481217..a1269762893 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Add.java @@ -66,7 +66,7 @@ private Add(Operation operation) { describeByClass = true ) public static Add create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Add", scope.makeOpName("Add")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Add")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java index 0519af46cb5..664e648d2ab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/AddN.java @@ -67,7 +67,7 @@ private AddN(Operation operation) { describeByClass = true ) public static AddN create(Scope scope, Iterable> inputs) { - OperationBuilder opBuilder = scope.env().opBuilder("AddN", scope.makeOpName("AddN")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AddN")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); return new AddN<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java index 7a7a059538c..7f251ea8f65 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Angle.java @@ -79,7 +79,7 @@ private Angle(Operation operation) { ) public static Angle create(Scope scope, Operand input, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("Angle", scope.makeOpName("Angle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Angle")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java index 5da4254ff88..43972eefec5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ApproximateEqual.java @@ -63,7 +63,7 @@ private ApproximateEqual(Operation operation) { ) public static ApproximateEqual create(Scope scope, Operand x, Operand y, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApproximateEqual", scope.makeOpName("ApproximateEqual")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApproximateEqual")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java index 3e9308f1a06..5e66b0e5077 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMax.java @@ -79,7 +79,7 @@ private ArgMax(Operation operation) { ) public static ArgMax create(Scope scope, Operand input, Operand dimension, Class outputType) { - OperationBuilder opBuilder = scope.env().opBuilder("ArgMax", scope.makeOpName("ArgMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ArgMax")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(dimension.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java index d72605944fc..d477cc981a0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ArgMin.java @@ -79,7 +79,7 @@ private ArgMin(Operation operation) { ) public static ArgMin create(Scope scope, Operand input, Operand dimension, Class outputType) { - OperationBuilder opBuilder = scope.env().opBuilder("ArgMin", scope.makeOpName("ArgMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ArgMin")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(dimension.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java index 600d865afed..d3f30e93021 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asin.java @@ -73,7 +73,7 @@ private Asin(Operation operation) { describeByClass = true ) public static Asin create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Asin", scope.makeOpName("Asin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Asin")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Asin<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java index f8b6fd84adc..b9e925d448a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Asinh.java @@ -68,7 +68,7 @@ private Asinh(Operation operation) { describeByClass = true ) public static Asinh create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Asinh", scope.makeOpName("Asinh")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Asinh")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Asinh<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java index 85a6a0ef221..ca2794cd466 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan.java @@ -73,7 +73,7 @@ private Atan(Operation operation) { describeByClass = true ) public static Atan create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Atan", scope.makeOpName("Atan")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Atan")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Atan<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java index 822425ac47a..d89e5ab0e09 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atan2.java @@ -67,7 +67,7 @@ private Atan2(Operation operation) { describeByClass = true ) public static Atan2 create(Scope scope, Operand y, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Atan2", scope.makeOpName("Atan2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Atan2")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java index 55bb3b613b4..69467ed3e57 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Atanh.java @@ -70,7 +70,7 @@ private Atanh(Operation operation) { describeByClass = true ) public static Atanh create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Atanh", scope.makeOpName("Atanh")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Atanh")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Atanh<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java index 3c906b94eb0..455e0d56b2c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0.java @@ -57,7 +57,7 @@ private BesselI0(Operation operation) { describeByClass = true ) public static BesselI0 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselI0", scope.makeOpName("BesselI0")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI0")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselI0<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java index be97c5a5715..f5d69b5ab87 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI0e.java @@ -57,7 +57,7 @@ private BesselI0e(Operation operation) { describeByClass = true ) public static BesselI0e create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselI0e", scope.makeOpName("BesselI0e")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI0e")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselI0e<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java index 9b5c2e38932..a31a2245a90 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1.java @@ -57,7 +57,7 @@ private BesselI1(Operation operation) { describeByClass = true ) public static BesselI1 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselI1", scope.makeOpName("BesselI1")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI1")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselI1<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java index e79790decfd..181f9738b63 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/BesselI1e.java @@ -57,7 +57,7 @@ private BesselI1e(Operation operation) { describeByClass = true ) public static BesselI1e create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselI1e", scope.makeOpName("BesselI1e")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselI1e")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselI1e<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java index c7ba55995a5..ca2b90c3976 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Betainc.java @@ -70,7 +70,7 @@ private Betainc(Operation operation) { ) public static Betainc create(Scope scope, Operand a, Operand b, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Betainc", scope.makeOpName("Betainc")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Betainc")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(x.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java index aba2671e133..ad4b7beca9b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Bincount.java @@ -73,7 +73,7 @@ private Bincount(Operation operation) { ) public static Bincount create(Scope scope, Operand arr, Operand sizeOutput, Operand weights) { - OperationBuilder opBuilder = scope.env().opBuilder("Bincount", scope.makeOpName("Bincount")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Bincount")); opBuilder.addInput(arr.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(weights.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java index e77f5356233..0f2d592a623 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ceil.java @@ -61,7 +61,7 @@ private Ceil(Operation operation) { describeByClass = true ) public static Ceil create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Ceil", scope.makeOpName("Ceil")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ceil")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Ceil<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java index 06c8f028453..f3330443424 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CompareAndBitpack.java @@ -81,7 +81,7 @@ private CompareAndBitpack(Operation operation) { ) public static CompareAndBitpack create(Scope scope, Operand input, Operand threshold) { - OperationBuilder opBuilder = scope.env().opBuilder("CompareAndBitpack", scope.makeOpName("CompareAndBitpack")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompareAndBitpack")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(threshold.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java index 5f9dc2e62f6..ba0f1015f54 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ComplexAbs.java @@ -70,7 +70,7 @@ private ComplexAbs(Operation operation) { ) public static ComplexAbs create(Scope scope, Operand x, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("ComplexAbs", scope.makeOpName("ComplexAbs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ComplexAbs")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java index 3d009360a25..504d351b494 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Conj.java @@ -71,7 +71,7 @@ private Conj(Operation operation) { describeByClass = true ) public static Conj create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("Conj", scope.makeOpName("Conj")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conj")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Conj<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java index 84a1665786b..d4e329e1cd6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cos.java @@ -69,7 +69,7 @@ private Cos(Operation operation) { describeByClass = true ) public static Cos create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Cos", scope.makeOpName("Cos")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cos")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Cos<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java index 92ff056d059..7ce9f8ec55a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cosh.java @@ -68,7 +68,7 @@ private Cosh(Operation operation) { describeByClass = true ) public static Cosh create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Cosh", scope.makeOpName("Cosh")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cosh")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Cosh<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java index f4c6602ec56..39044e4d6bb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumprod.java @@ -88,7 +88,7 @@ private Cumprod(Operation operation) { ) public static Cumprod create(Scope scope, Operand x, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Cumprod", scope.makeOpName("Cumprod")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cumprod")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java index fed21ea095b..b1e69cd3416 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Cumsum.java @@ -88,7 +88,7 @@ private Cumsum(Operation operation) { ) public static Cumsum create(Scope scope, Operand x, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Cumsum", scope.makeOpName("Cumsum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Cumsum")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java index cb240aa3f7b..52953db453a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/CumulativeLogsumexp.java @@ -77,7 +77,7 @@ private CumulativeLogsumexp(Operation operation) { ) public static CumulativeLogsumexp create(Scope scope, Operand x, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CumulativeLogsumexp", scope.makeOpName("CumulativeLogsumexp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CumulativeLogsumexp")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java index 542464e1daa..b58d5cc1c43 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DenseBincount.java @@ -74,7 +74,7 @@ private DenseBincount(Operation operation) { ) public static DenseBincount create(Scope scope, Operand input, Operand sizeOutput, Operand weights, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DenseBincount", scope.makeOpName("DenseBincount")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseBincount")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(weights.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java index 3b9bdcb8cc4..5903fefec40 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Digamma.java @@ -62,7 +62,7 @@ private Digamma(Operation operation) { describeByClass = true ) public static Digamma create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Digamma", scope.makeOpName("Digamma")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Digamma")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Digamma<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java index 97ec0fb4ac8..3f62060e9be 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Div.java @@ -64,7 +64,7 @@ private Div(Operation operation) { describeByClass = true ) public static Div create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Div", scope.makeOpName("Div")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Div")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java index 1fd6eb73e25..ba8d8501b54 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/DivNoNan.java @@ -64,7 +64,7 @@ private DivNoNan(Operation operation) { describeByClass = true ) public static DivNoNan create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("DivNoNan", scope.makeOpName("DivNoNan")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DivNoNan")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java index c36a207d014..91168cdab7f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Equal.java @@ -74,7 +74,7 @@ private Equal(Operation operation) { ) public static Equal create(Scope scope, Operand x, Operand y, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Equal", scope.makeOpName("Equal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Equal")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java index 37a0cbba878..f43df0cf45e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erf.java @@ -61,7 +61,7 @@ private Erf(Operation operation) { describeByClass = true ) public static Erf create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Erf", scope.makeOpName("Erf")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Erf")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Erf<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java index c36514488e2..050212be504 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Erfc.java @@ -61,7 +61,7 @@ private Erfc(Operation operation) { describeByClass = true ) public static Erfc create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Erfc", scope.makeOpName("Erfc")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Erfc")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Erfc<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java index d983f91e8f0..e48ba3892ea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Exp.java @@ -82,7 +82,7 @@ private Exp(Operation operation) { describeByClass = true ) public static Exp create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Exp", scope.makeOpName("Exp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Exp")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Exp<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java index f8d20f833a8..1fe5bb210f3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Expm1.java @@ -73,7 +73,7 @@ private Expm1(Operation operation) { describeByClass = true ) public static Expm1 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Expm1", scope.makeOpName("Expm1")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Expm1")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Expm1<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java index a4e3fc96366..5c41d484491 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Fact.java @@ -57,7 +57,7 @@ private Fact(Operation operation) { describeByClass = true ) public static Fact create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("Fact", scope.makeOpName("Fact")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fact")); opBuilder = scope.apply(opBuilder); return new Fact(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java index fdca33b84eb..759e8ad4862 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Floor.java @@ -61,7 +61,7 @@ private Floor(Operation operation) { describeByClass = true ) public static Floor create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Floor", scope.makeOpName("Floor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Floor")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Floor<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java index 4dfca58ce59..07da210d584 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorDiv.java @@ -64,7 +64,7 @@ private FloorDiv(Operation operation) { describeByClass = true ) public static FloorDiv create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("FloorDiv", scope.makeOpName("FloorDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FloorDiv")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java index 43ac259ac8d..a3692d20df6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/FloorMod.java @@ -66,7 +66,7 @@ private FloorMod(Operation operation) { describeByClass = true ) public static FloorMod create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("FloorMod", scope.makeOpName("FloorMod")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FloorMod")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java index e79a13cbac4..9929569d99d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Greater.java @@ -73,7 +73,7 @@ private Greater(Operation operation) { describeByClass = true ) public static Greater create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Greater", scope.makeOpName("Greater")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Greater")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java index 6c49da75fae..26ae03084b8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/GreaterEqual.java @@ -73,7 +73,7 @@ private GreaterEqual(Operation operation) { describeByClass = true ) public static GreaterEqual create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("GreaterEqual", scope.makeOpName("GreaterEqual")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GreaterEqual")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java index e03507c1be5..0a2201229e1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igamma.java @@ -69,7 +69,7 @@ private Igamma(Operation operation) { describeByClass = true ) public static Igamma create(Scope scope, Operand a, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Igamma", scope.makeOpName("Igamma")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Igamma")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java index fd31d8cd394..1b2a0401952 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IgammaGradA.java @@ -58,7 +58,7 @@ private IgammaGradA(Operation operation) { describeByClass = true ) public static IgammaGradA create(Scope scope, Operand a, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("IgammaGradA", scope.makeOpName("IgammaGradA")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IgammaGradA")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java index d2a517e65c2..17966df3b73 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Igammac.java @@ -69,7 +69,7 @@ private Igammac(Operation operation) { describeByClass = true ) public static Igammac create(Scope scope, Operand a, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Igammac", scope.makeOpName("Igammac")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Igammac")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java index 6b873186138..6d1bf220734 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Imag.java @@ -75,7 +75,7 @@ private Imag(Operation operation) { ) public static Imag create(Scope scope, Operand input, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("Imag", scope.makeOpName("Imag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Imag")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java index 49a6a2574ba..ae6346a3bc3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/InvertPermutation.java @@ -72,7 +72,7 @@ private InvertPermutation(Operation operation) { describeByClass = true ) public static InvertPermutation create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("InvertPermutation", scope.makeOpName("InvertPermutation")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InvertPermutation")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new InvertPermutation<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java index ddd2f552f29..74fb4880e01 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsFinite.java @@ -67,7 +67,7 @@ private IsFinite(Operation operation) { describeByClass = true ) public static IsFinite create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("IsFinite", scope.makeOpName("IsFinite")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsFinite")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new IsFinite(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java index 9e77a33cfbe..bb51b1ade20 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsInf.java @@ -67,7 +67,7 @@ private IsInf(Operation operation) { describeByClass = true ) public static IsInf create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("IsInf", scope.makeOpName("IsInf")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsInf")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new IsInf(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java index d760997cce2..b158338a052 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/IsNan.java @@ -67,7 +67,7 @@ private IsNan(Operation operation) { describeByClass = true ) public static IsNan create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("IsNan", scope.makeOpName("IsNan")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsNan")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new IsNan(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java index 2526b390242..89b264d2a78 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Less.java @@ -73,7 +73,7 @@ private Less(Operation operation) { describeByClass = true ) public static Less create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Less", scope.makeOpName("Less")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Less")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java index ea46f504b0d..c8861aeff31 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LessEqual.java @@ -73,7 +73,7 @@ private LessEqual(Operation operation) { describeByClass = true ) public static LessEqual create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("LessEqual", scope.makeOpName("LessEqual")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LessEqual")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java index 561f491b09d..8afb9c307fd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Lgamma.java @@ -68,7 +68,7 @@ private Lgamma(Operation operation) { describeByClass = true ) public static Lgamma create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Lgamma", scope.makeOpName("Lgamma")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Lgamma")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Lgamma<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java index 416279c57c6..a974b9f8478 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log.java @@ -67,7 +67,7 @@ private Log(Operation operation) { describeByClass = true ) public static Log create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Log", scope.makeOpName("Log")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Log")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Log<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java index 84a48b62611..bdccc675f90 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Log1p.java @@ -67,7 +67,7 @@ private Log1p(Operation operation) { describeByClass = true ) public static Log1p create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Log1p", scope.makeOpName("Log1p")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Log1p")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Log1p<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java index dbbd7a94226..efa9c2a2379 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalAnd.java @@ -61,7 +61,7 @@ private LogicalAnd(Operation operation) { describeByClass = true ) public static LogicalAnd create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("LogicalAnd", scope.makeOpName("LogicalAnd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogicalAnd")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java index 286e24ed931..2d5388f1bf0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalNot.java @@ -58,7 +58,7 @@ private LogicalNot(Operation operation) { describeByClass = true ) public static LogicalNot create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("LogicalNot", scope.makeOpName("LogicalNot")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogicalNot")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new LogicalNot(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java index 016f936fe2e..ddd3fb8bd54 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/LogicalOr.java @@ -61,7 +61,7 @@ private LogicalOr(Operation operation) { describeByClass = true ) public static LogicalOr create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("LogicalOr", scope.makeOpName("LogicalOr")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogicalOr")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java index 05123a062fa..ecd43416bf7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Maximum.java @@ -64,7 +64,7 @@ private Maximum(Operation operation) { describeByClass = true ) public static Maximum create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Maximum", scope.makeOpName("Maximum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Maximum")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java index b0c3a6ae37d..0f45a4a702a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mean.java @@ -70,7 +70,7 @@ private Mean(Operation operation) { ) public static Mean create(Scope scope, Operand input, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Mean", scope.makeOpName("Mean")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mean")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java index d8bb23fc36e..5acf98b24f0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Minimum.java @@ -64,7 +64,7 @@ private Minimum(Operation operation) { describeByClass = true ) public static Minimum create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Minimum", scope.makeOpName("Minimum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Minimum")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java index e4c80f108a2..078b0e8f4c5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mod.java @@ -66,7 +66,7 @@ private Mod(Operation operation) { describeByClass = true ) public static Mod create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Mod", scope.makeOpName("Mod")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mod")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java index 3996906af1a..cbfaeb66151 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Mul.java @@ -64,7 +64,7 @@ private Mul(Operation operation) { describeByClass = true ) public static Mul create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Mul", scope.makeOpName("Mul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Mul")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java index 40d660ca27d..8c9e32db85e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/MulNoNan.java @@ -64,7 +64,7 @@ private MulNoNan(Operation operation) { describeByClass = true ) public static MulNoNan create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("MulNoNan", scope.makeOpName("MulNoNan")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MulNoNan")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java index 727c4f54ee0..925f0ab8db5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Ndtri.java @@ -61,7 +61,7 @@ private Ndtri(Operation operation) { describeByClass = true ) public static Ndtri create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Ndtri", scope.makeOpName("Ndtri")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ndtri")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Ndtri<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java index dd0d280adec..085675cd65f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Neg.java @@ -62,7 +62,7 @@ private Neg(Operation operation) { describeByClass = true ) public static Neg create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Neg", scope.makeOpName("Neg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Neg")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Neg<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java index 824652cd6d1..daf28601b65 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NextAfter.java @@ -67,7 +67,7 @@ private NextAfter(Operation operation) { describeByClass = true ) public static NextAfter create(Scope scope, Operand x1, Operand x2) { - OperationBuilder opBuilder = scope.env().opBuilder("NextAfter", scope.makeOpName("NextAfter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NextAfter")); opBuilder.addInput(x1.asOutput()); opBuilder.addInput(x2.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java index 1eb47231fd9..1291b1a8850 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/NotEqual.java @@ -65,7 +65,7 @@ private NotEqual(Operation operation) { ) public static NotEqual create(Scope scope, Operand x, Operand y, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("NotEqual", scope.makeOpName("NotEqual")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NotEqual")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java index 51755979c87..bbcd3bd9dad 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Polygamma.java @@ -66,7 +66,7 @@ private Polygamma(Operation operation) { describeByClass = true ) public static Polygamma create(Scope scope, Operand a, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Polygamma", scope.makeOpName("Polygamma")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Polygamma")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java index a1bb46a9ec5..5c9f2c63137 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/PopulationCount.java @@ -64,7 +64,7 @@ private PopulationCount(Operation operation) { describeByClass = true ) public static PopulationCount create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("PopulationCount", scope.makeOpName("PopulationCount")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PopulationCount")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new PopulationCount(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java index 82ddfd03026..2f39d1da201 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Pow.java @@ -69,7 +69,7 @@ private Pow(Operation operation) { describeByClass = true ) public static Pow create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Pow", scope.makeOpName("Pow")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Pow")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java index bc1d4b07165..f6cdf0c8a13 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedAdd.java @@ -77,7 +77,7 @@ private QuantizedAdd(Operation operation) { public static QuantizedAdd create(Scope scope, Operand x, Operand y, Operand minX, Operand maxX, Operand minY, Operand maxY, Class Toutput) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedAdd", scope.makeOpName("QuantizedAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedAdd")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder.addInput(minX.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java index cb69740807e..14d2ef8f4b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/QuantizedMul.java @@ -77,7 +77,7 @@ private QuantizedMul(Operation operation) { public static QuantizedMul create(Scope scope, Operand x, Operand y, Operand minX, Operand maxX, Operand minY, Operand maxY, Class Toutput) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMul", scope.makeOpName("QuantizedMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMul")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder.addInput(minX.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java index 8c6f5a8eb8d..ec019f2899f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Real.java @@ -75,7 +75,7 @@ private Real(Operation operation) { ) public static Real create(Scope scope, Operand input, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("Real", scope.makeOpName("Real")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Real")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java index 2bf500ef10a..6ca3a21c7f3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RealDiv.java @@ -65,7 +65,7 @@ private RealDiv(Operation operation) { describeByClass = true ) public static RealDiv create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RealDiv", scope.makeOpName("RealDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RealDiv")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java index 17caba787df..179c86160fe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Reciprocal.java @@ -62,7 +62,7 @@ private Reciprocal(Operation operation) { describeByClass = true ) public static Reciprocal create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Reciprocal", scope.makeOpName("Reciprocal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Reciprocal")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Reciprocal<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java index cc0ec84a0c5..bc95cef39c5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/ReciprocalGrad.java @@ -61,7 +61,7 @@ private ReciprocalGrad(Operation operation) { ) public static ReciprocalGrad create(Scope scope, Operand y, Operand dy) { - OperationBuilder opBuilder = scope.env().opBuilder("ReciprocalGrad", scope.makeOpName("ReciprocalGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReciprocalGrad")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(dy.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java index 4ccf6718696..6c1539cee41 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizationRangePerChannel.java @@ -63,7 +63,7 @@ private RequantizationRangePerChannel(Operation operation) { ) public static RequantizationRangePerChannel create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Float clipValueMax) { - OperationBuilder opBuilder = scope.env().opBuilder("RequantizationRangePerChannel", scope.makeOpName("RequantizationRangePerChannel")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RequantizationRangePerChannel")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java index fb21eb1e38a..76c28bd2b87 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RequantizePerChannel.java @@ -73,7 +73,7 @@ public static RequantizePerChannel create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Operand requestedOutputMin, Operand requestedOutputMax, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("RequantizePerChannel", scope.makeOpName("RequantizePerChannel")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RequantizePerChannel")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java index 1b481b2b613..4d139c2aed8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rint.java @@ -69,7 +69,7 @@ private Rint(Operation operation) { describeByClass = true ) public static Rint create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Rint", scope.makeOpName("Rint")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rint")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Rint<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java index b1c9d56e6a4..6198340ce3f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Round.java @@ -63,7 +63,7 @@ private Round(Operation operation) { describeByClass = true ) public static Round create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Round", scope.makeOpName("Round")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Round")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Round<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java index 664dd6722c8..c5414bba1f4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Rsqrt.java @@ -62,7 +62,7 @@ private Rsqrt(Operation operation) { describeByClass = true ) public static Rsqrt create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Rsqrt", scope.makeOpName("Rsqrt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rsqrt")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Rsqrt<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java index 9391283211d..4537e79ef60 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/RsqrtGrad.java @@ -60,7 +60,7 @@ private RsqrtGrad(Operation operation) { describeByClass = true ) public static RsqrtGrad create(Scope scope, Operand y, Operand dy) { - OperationBuilder opBuilder = scope.env().opBuilder("RsqrtGrad", scope.makeOpName("RsqrtGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RsqrtGrad")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(dy.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java index e480323f02b..65e7b648769 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMax.java @@ -81,7 +81,7 @@ private SegmentMax(Operation operation) { ) public static SegmentMax create(Scope scope, Operand data, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SegmentMax", scope.makeOpName("SegmentMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentMax")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java index de3468012ad..ca2733c96c8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMean.java @@ -83,7 +83,7 @@ private SegmentMean(Operation operation) { ) public static SegmentMean create(Scope scope, Operand data, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SegmentMean", scope.makeOpName("SegmentMean")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentMean")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java index eab68f6bccd..2c0da496029 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentMin.java @@ -81,7 +81,7 @@ private SegmentMin(Operation operation) { ) public static SegmentMin create(Scope scope, Operand data, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SegmentMin", scope.makeOpName("SegmentMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentMin")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java index a29b348a830..6c79d7cbb0f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentProd.java @@ -82,7 +82,7 @@ private SegmentProd(Operation operation) { ) public static SegmentProd create(Scope scope, Operand data, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SegmentProd", scope.makeOpName("SegmentProd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentProd")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java index 0f726cc10e0..aae76b9dd85 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SegmentSum.java @@ -82,7 +82,7 @@ private SegmentSum(Operation operation) { ) public static SegmentSum create(Scope scope, Operand data, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SegmentSum", scope.makeOpName("SegmentSum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SegmentSum")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java index 752113b4947..d76210dc510 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sigmoid.java @@ -62,7 +62,7 @@ private Sigmoid(Operation operation) { describeByClass = true ) public static Sigmoid create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Sigmoid", scope.makeOpName("Sigmoid")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sigmoid")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Sigmoid<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java index ee500922cd6..3e307c96161 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SigmoidGrad.java @@ -60,7 +60,7 @@ private SigmoidGrad(Operation operation) { describeByClass = true ) public static SigmoidGrad create(Scope scope, Operand y, Operand dy) { - OperationBuilder opBuilder = scope.env().opBuilder("SigmoidGrad", scope.makeOpName("SigmoidGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SigmoidGrad")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(dy.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java index a8b3940948b..0f7b1a02ac2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sign.java @@ -72,7 +72,7 @@ private Sign(Operation operation) { describeByClass = true ) public static Sign create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Sign", scope.makeOpName("Sign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sign")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Sign<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java index 9e076a6a8fd..7f4fa0211bd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sin.java @@ -68,7 +68,7 @@ private Sin(Operation operation) { describeByClass = true ) public static Sin create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Sin", scope.makeOpName("Sin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sin")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Sin<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java index 8365de53578..8d89458774a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sinh.java @@ -68,7 +68,7 @@ private Sinh(Operation operation) { describeByClass = true ) public static Sinh create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Sinh", scope.makeOpName("Sinh")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sinh")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Sinh<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java index 88523a88cb0..ee8508fba07 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SobolSample.java @@ -68,7 +68,7 @@ private SobolSample(Operation operation) { ) public static SobolSample create(Scope scope, Operand dim, Operand numResults, Operand skip, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("SobolSample", scope.makeOpName("SobolSample")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SobolSample")); opBuilder.addInput(dim.asOutput()); opBuilder.addInput(numResults.asOutput()); opBuilder.addInput(skip.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java index 00e59eadad2..41fb2fbbda1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Softplus.java @@ -61,7 +61,7 @@ private Softplus(Operation operation) { describeByClass = true ) public static Softplus create(Scope scope, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Softplus", scope.makeOpName("Softplus")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Softplus")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); return new Softplus<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java index 0cf9b9963bc..f9662185666 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SoftplusGrad.java @@ -59,7 +59,7 @@ private SoftplusGrad(Operation operation) { ) public static SoftplusGrad create(Scope scope, Operand gradients, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("SoftplusGrad", scope.makeOpName("SoftplusGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SoftplusGrad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java index bcba1c9e2ef..43c436f2a1e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sqrt.java @@ -62,7 +62,7 @@ private Sqrt(Operation operation) { describeByClass = true ) public static Sqrt create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Sqrt", scope.makeOpName("Sqrt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sqrt")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Sqrt<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java index 15ac765690a..4b941896b95 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SqrtGrad.java @@ -60,7 +60,7 @@ private SqrtGrad(Operation operation) { describeByClass = true ) public static SqrtGrad create(Scope scope, Operand y, Operand dy) { - OperationBuilder opBuilder = scope.env().opBuilder("SqrtGrad", scope.makeOpName("SqrtGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SqrtGrad")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(dy.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java index 22321e62837..bd513b48b81 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Square.java @@ -62,7 +62,7 @@ private Square(Operation operation) { describeByClass = true ) public static Square create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Square", scope.makeOpName("Square")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Square")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Square<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java index 0b01fa5a1f7..ff49e2a2be0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/SquaredDifference.java @@ -65,7 +65,7 @@ private SquaredDifference(Operation operation) { ) public static SquaredDifference create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("SquaredDifference", scope.makeOpName("SquaredDifference")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SquaredDifference")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java index f1fae6af3d4..494e6a0a48e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Sub.java @@ -64,7 +64,7 @@ private Sub(Operation operation) { describeByClass = true ) public static Sub create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Sub", scope.makeOpName("Sub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sub")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java index 0511fd4c0a6..c12388ecf17 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tan.java @@ -69,7 +69,7 @@ private Tan(Operation operation) { describeByClass = true ) public static Tan create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Tan", scope.makeOpName("Tan")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Tan")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Tan<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java index ce218e74fc9..9d3d1407e55 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Tanh.java @@ -75,7 +75,7 @@ private Tanh(Operation operation) { describeByClass = true ) public static Tanh create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Tanh", scope.makeOpName("Tanh")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Tanh")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Tanh<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java index a46fb120cc6..9513223a61c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TanhGrad.java @@ -60,7 +60,7 @@ private TanhGrad(Operation operation) { describeByClass = true ) public static TanhGrad create(Scope scope, Operand y, Operand dy) { - OperationBuilder opBuilder = scope.env().opBuilder("TanhGrad", scope.makeOpName("TanhGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TanhGrad")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(dy.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java index 101422dc4c0..a5b7247eb9c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateDiv.java @@ -68,7 +68,7 @@ private TruncateDiv(Operation operation) { describeByClass = true ) public static TruncateDiv create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("TruncateDiv", scope.makeOpName("TruncateDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TruncateDiv")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java index 05e9b656cb1..afc4a569f0c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/TruncateMod.java @@ -65,7 +65,7 @@ private TruncateMod(Operation operation) { describeByClass = true ) public static TruncateMod create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("TruncateMod", scope.makeOpName("TruncateMod")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TruncateMod")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java index 9ae0ba7019d..5948bea7bb4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMax.java @@ -87,7 +87,7 @@ private UnsortedSegmentMax(Operation operation) { ) public static UnsortedSegmentMax create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentMax", scope.makeOpName("UnsortedSegmentMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentMax")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder.addInput(numSegments.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java index 2d3497e61ae..4c924844b12 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentMin.java @@ -84,7 +84,7 @@ private UnsortedSegmentMin(Operation operation) { ) public static UnsortedSegmentMin create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentMin", scope.makeOpName("UnsortedSegmentMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentMin")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder.addInput(numSegments.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java index 5677ce1943f..ad3b2afa22a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentProd.java @@ -84,7 +84,7 @@ private UnsortedSegmentProd(Operation operation) { ) public static UnsortedSegmentProd create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentProd", scope.makeOpName("UnsortedSegmentProd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentProd")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder.addInput(numSegments.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java index 9bf98201624..6a7d80d3bce 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/UnsortedSegmentSum.java @@ -86,7 +86,7 @@ private UnsortedSegmentSum(Operation operation) { ) public static UnsortedSegmentSum create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentSum", scope.makeOpName("UnsortedSegmentSum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentSum")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder.addInput(numSegments.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java index b27043121f1..51b01fcc145 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xdivy.java @@ -62,7 +62,7 @@ private Xdivy(Operation operation) { describeByClass = true ) public static Xdivy create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Xdivy", scope.makeOpName("Xdivy")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Xdivy")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java index a266f4f7947..40a9ffde383 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlog1py.java @@ -62,7 +62,7 @@ private Xlog1py(Operation operation) { describeByClass = true ) public static Xlog1py create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Xlog1py", scope.makeOpName("Xlog1py")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Xlog1py")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java index a5227700166..c40480718a7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Xlogy.java @@ -62,7 +62,7 @@ private Xlogy(Operation operation) { describeByClass = true ) public static Xlogy create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("Xlogy", scope.makeOpName("Xlogy")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Xlogy")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java index 40502468711..f137c7387fa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/Zeta.java @@ -64,7 +64,7 @@ private Zeta(Operation operation) { describeByClass = true ) public static Zeta create(Scope scope, Operand x, Operand q) { - OperationBuilder opBuilder = scope.env().opBuilder("Zeta", scope.makeOpName("Zeta")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Zeta")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(q.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java index 2f8af83f094..312289d1311 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/erfinv.java @@ -61,7 +61,7 @@ private erfinv(Operation operation) { describeByClass = true ) public static erfinv create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Erfinv", scope.makeOpName("erfinv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("erfinv")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new erfinv<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java index 42f0519eaa7..5a813d9bc63 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ0.java @@ -57,7 +57,7 @@ private BesselJ0(Operation operation) { describeByClass = true ) public static BesselJ0 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselJ0", scope.makeOpName("BesselJ0")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselJ0")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselJ0<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java index c288143289c..e5465ae883c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselJ1.java @@ -57,7 +57,7 @@ private BesselJ1(Operation operation) { describeByClass = true ) public static BesselJ1 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselJ1", scope.makeOpName("BesselJ1")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselJ1")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselJ1<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java index 7c13e1cb6fc..e0ece545227 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0.java @@ -57,7 +57,7 @@ private BesselK0(Operation operation) { describeByClass = true ) public static BesselK0 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselK0", scope.makeOpName("BesselK0")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK0")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselK0<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java index 1ec7c7cafca..66ea449ddc8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK0e.java @@ -57,7 +57,7 @@ private BesselK0e(Operation operation) { describeByClass = true ) public static BesselK0e create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselK0e", scope.makeOpName("BesselK0e")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK0e")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselK0e<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java index 58163b4fff0..e0d1e82c578 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1.java @@ -57,7 +57,7 @@ private BesselK1(Operation operation) { describeByClass = true ) public static BesselK1 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselK1", scope.makeOpName("BesselK1")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK1")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselK1<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java index cc8e512c4b6..1137ceb5430 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselK1e.java @@ -57,7 +57,7 @@ private BesselK1e(Operation operation) { describeByClass = true ) public static BesselK1e create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselK1e", scope.makeOpName("BesselK1e")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselK1e")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselK1e<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java index 4b6eb42de1e..5991a62d911 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY0.java @@ -57,7 +57,7 @@ private BesselY0(Operation operation) { describeByClass = true ) public static BesselY0 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselY0", scope.makeOpName("BesselY0")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselY0")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselY0<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java index 4965db1cd8c..87fe3b8b799 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/BesselY1.java @@ -57,7 +57,7 @@ private BesselY1(Operation operation) { describeByClass = true ) public static BesselY1 create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("BesselY1", scope.makeOpName("BesselY1")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BesselY1")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new BesselY1<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java index ef5934fb7ce..b8fd4b7c4bf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Dawsn.java @@ -57,7 +57,7 @@ private Dawsn(Operation operation) { describeByClass = true ) public static Dawsn create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Dawsn", scope.makeOpName("Dawsn")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dawsn")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Dawsn<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java index 999dfee7900..a5459c2e49a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Expint.java @@ -57,7 +57,7 @@ private Expint(Operation operation) { describeByClass = true ) public static Expint create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Expint", scope.makeOpName("Expint")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Expint")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Expint<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java index d590d1869b5..9ed978da85f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelCos.java @@ -57,7 +57,7 @@ private FresnelCos(Operation operation) { describeByClass = true ) public static FresnelCos create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("FresnelCos", scope.makeOpName("FresnelCos")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FresnelCos")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new FresnelCos<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java index 919b887cf29..4de11696395 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/FresnelSin.java @@ -57,7 +57,7 @@ private FresnelSin(Operation operation) { describeByClass = true ) public static FresnelSin create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("FresnelSin", scope.makeOpName("FresnelSin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FresnelSin")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new FresnelSin<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java index 8d6a983ffa5..18da2e750c2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/math/special/Spence.java @@ -57,7 +57,7 @@ private Spence(Operation operation) { describeByClass = true ) public static Spence create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("Spence", scope.makeOpName("Spence")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Spence")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new Spence<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java index d9ff43a7bf0..13947a3f016 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool.java @@ -69,7 +69,7 @@ private AvgPool(Operation operation) { ) public static AvgPool create(Scope scope, Operand value, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AvgPool", scope.makeOpName("AvgPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPool")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizeArray = new long[ksize.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java index 97e608b32c8..2dbb98b2960 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3d.java @@ -71,7 +71,7 @@ private AvgPool3d(Operation operation) { ) public static AvgPool3d create(Scope scope, Operand input, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AvgPool3D", scope.makeOpName("AvgPool3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPool3d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizeArray = new long[ksize.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java index 4bdb6034816..af10950e7fb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPool3dGrad.java @@ -72,7 +72,7 @@ private AvgPool3dGrad(Operation operation) { public static AvgPool3dGrad create(Scope scope, Operand origInputShape, Operand grad, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AvgPool3DGrad", scope.makeOpName("AvgPool3dGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPool3dGrad")); opBuilder.addInput(origInputShape.asOutput()); opBuilder.addInput(grad.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java index 039307cdbdd..813fd26b428 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/AvgPoolGrad.java @@ -67,7 +67,7 @@ private AvgPoolGrad(Operation operation) { public static AvgPoolGrad create(Scope scope, Operand origInputShape, Operand grad, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AvgPoolGrad", scope.makeOpName("AvgPoolGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AvgPoolGrad")); opBuilder.addInput(origInputShape.asOutput()); opBuilder.addInput(grad.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java index 7c84dd5f26f..47cf236cad5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalization.java @@ -78,7 +78,7 @@ private BatchNormWithGlobalNormalization(Operation operation) { public static BatchNormWithGlobalNormalization create(Scope scope, Operand t, Operand m, Operand v, Operand beta, Operand gamma, Float varianceEpsilon, Boolean scaleAfterNormalization) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchNormWithGlobalNormalization", scope.makeOpName("BatchNormWithGlobalNormalization")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchNormWithGlobalNormalization")); opBuilder.addInput(t.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java index 01189753828..0472d472dd6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BatchNormWithGlobalNormalizationGrad.java @@ -89,7 +89,7 @@ private BatchNormWithGlobalNormalizationGrad(Operation operation) { public static BatchNormWithGlobalNormalizationGrad create(Scope scope, Operand t, Operand m, Operand v, Operand gamma, Operand backprop, Float varianceEpsilon, Boolean scaleAfterNormalization) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchNormWithGlobalNormalizationGrad", scope.makeOpName("BatchNormWithGlobalNormalizationGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchNormWithGlobalNormalizationGrad")); opBuilder.addInput(t.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java index 26445fd21e5..fd477c86dc5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAdd.java @@ -66,7 +66,7 @@ private BiasAdd(Operation operation) { ) public static BiasAdd create(Scope scope, Operand value, Operand bias, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BiasAdd", scope.makeOpName("BiasAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BiasAdd")); opBuilder.addInput(value.asOutput()); opBuilder.addInput(bias.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java index 4ef33c75908..70204d02a5a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BiasAddGrad.java @@ -66,7 +66,7 @@ private BiasAddGrad(Operation operation) { ) public static BiasAddGrad create(Scope scope, Operand outBackprop, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BiasAddGrad", scope.makeOpName("BiasAddGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BiasAddGrad")); opBuilder.addInput(outBackprop.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java index 9e2adfd2b29..d6f0ead46ba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTM.java @@ -108,7 +108,7 @@ private BlockLSTM(Operation operation) { public static BlockLSTM create(Scope scope, Operand seqLenMax, Operand x, Operand csPrev, Operand hPrev, Operand w, Operand wci, Operand wcf, Operand wco, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BlockLSTMV2", scope.makeOpName("BlockLSTM")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BlockLSTM")); opBuilder.addInput(seqLenMax.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder.addInput(csPrev.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java index ed7c7b79957..3727d150aac 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/BlockLSTMGrad.java @@ -103,7 +103,7 @@ public static BlockLSTMGrad create(Scope scope, Operand wcf, Operand wco, Operand b, Operand i, Operand cs, Operand f, Operand o, Operand ci, Operand co, Operand h, Operand csGrad, Operand hGrad, Boolean usePeephole) { - OperationBuilder opBuilder = scope.env().opBuilder("BlockLSTMGradV2", scope.makeOpName("BlockLSTMGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BlockLSTMGrad")); opBuilder.addInput(seqLenMax.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder.addInput(csPrev.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java index 17b187b0ec4..b8d3779d820 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CTCLossV2.java @@ -70,7 +70,7 @@ private CTCLossV2(Operation operation) { public static CTCLossV2 create(Scope scope, Operand inputs, Operand labelsIndices, Operand labelsValues, Operand sequenceLength, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CTCLossV2", scope.makeOpName("CTCLossV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CTCLossV2")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(labelsIndices.asOutput()); opBuilder.addInput(labelsValues.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java index 9a7dbaf6080..594719f47ac 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ComputeAccidentalHits.java @@ -74,7 +74,7 @@ private ComputeAccidentalHits(Operation operation) { ) public static ComputeAccidentalHits create(Scope scope, Operand trueClasses, Operand sampledCandidates, Long numTrue, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ComputeAccidentalHits", scope.makeOpName("ComputeAccidentalHits")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ComputeAccidentalHits")); opBuilder.addInput(trueClasses.asOutput()); opBuilder.addInput(sampledCandidates.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java index cf5b02bc8bb..cdc3d27b72a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2d.java @@ -92,7 +92,7 @@ private Conv2d(Operation operation) { ) public static Conv2d create(Scope scope, Operand input, Operand filter, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Conv2D", scope.makeOpName("Conv2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java index b1fcfad96b8..a1d95bcbd54 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropFilter.java @@ -76,7 +76,7 @@ private Conv2dBackpropFilter(Operation operation) { public static Conv2dBackpropFilter create(Scope scope, Operand input, Operand filterSizes, Operand outBackprop, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Conv2DBackpropFilter", scope.makeOpName("Conv2dBackpropFilter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv2dBackpropFilter")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filterSizes.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java index 5058b930786..334519fd5fd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv2dBackpropInput.java @@ -76,7 +76,7 @@ private Conv2dBackpropInput(Operation operation) { public static Conv2dBackpropInput create(Scope scope, Operand inputSizes, Operand filter, Operand outBackprop, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Conv2DBackpropInput", scope.makeOpName("Conv2dBackpropInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv2dBackpropInput")); opBuilder.addInput(inputSizes.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java index ed04f1095da..0fe70b05c62 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3d.java @@ -73,7 +73,7 @@ private Conv3d(Operation operation) { ) public static Conv3d create(Scope scope, Operand input, Operand filter, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Conv3D", scope.makeOpName("Conv3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv3d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java index d0ea22719a6..456ee91437f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropFilter.java @@ -75,7 +75,7 @@ private Conv3dBackpropFilter(Operation operation) { public static Conv3dBackpropFilter create(Scope scope, Operand input, Operand filterSizes, Operand outBackprop, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Conv3DBackpropFilterV2", scope.makeOpName("Conv3dBackpropFilter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv3dBackpropFilter")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filterSizes.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java index 919a06a6646..7f84fb3b019 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Conv3dBackpropInput.java @@ -74,7 +74,7 @@ private Conv3dBackpropInput(Operation operation) { public static Conv3dBackpropInput create(Scope scope, Operand inputSizes, Operand filter, Operand outBackprop, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Conv3DBackpropInputV2", scope.makeOpName("Conv3dBackpropInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv3dBackpropInput")); opBuilder.addInput(inputSizes.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java index 88e3c05a648..22bbe1d8274 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcBeamSearchDecoder.java @@ -91,7 +91,7 @@ private CtcBeamSearchDecoder(Operation operation) { ) public static CtcBeamSearchDecoder create(Scope scope, Operand inputs, Operand sequenceLength, Long beamWidth, Long topPaths, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CTCBeamSearchDecoder", scope.makeOpName("CtcBeamSearchDecoder")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CtcBeamSearchDecoder")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(sequenceLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java index 843715ec1c4..0630b40d3ba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcGreedyDecoder.java @@ -83,7 +83,7 @@ private CtcGreedyDecoder(Operation operation) { ) public static CtcGreedyDecoder create(Scope scope, Operand inputs, Operand sequenceLength, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CTCGreedyDecoder", scope.makeOpName("CtcGreedyDecoder")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CtcGreedyDecoder")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(sequenceLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java index 75bbbe7747c..15ce085e575 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CtcLoss.java @@ -76,7 +76,7 @@ private CtcLoss(Operation operation) { public static CtcLoss create(Scope scope, Operand inputs, Operand labelsIndices, Operand labelsValues, Operand sequenceLength, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CTCLoss", scope.makeOpName("CtcLoss")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CtcLoss")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(labelsIndices.asOutput()); opBuilder.addInput(labelsValues.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java index 5817e7011cc..3c8adc1094e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNN.java @@ -115,7 +115,7 @@ private CudnnRNN(Operation operation) { public static CudnnRNN create(Scope scope, Operand input, Operand inputH, Operand inputC, Operand params, Operand sequenceLengths, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CudnnRNNV3", scope.makeOpName("CudnnRNN")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNN")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputH.asOutput()); opBuilder.addInput(inputC.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java index d7a50c029db..f8852914f34 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNBackprop.java @@ -131,7 +131,7 @@ public static CudnnRNNBackprop create(Scope scope, Operan Operand output, Operand outputH, Operand outputC, Operand outputBackprop, Operand outputHBackprop, Operand outputCBackprop, Operand reserveSpace, Operand hostReserved, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CudnnRNNBackpropV3", scope.makeOpName("CudnnRNNBackprop")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNNBackprop")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputH.asOutput()); opBuilder.addInput(inputC.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java index c704ad9fe1f..d94d7201002 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNCanonicalToParams.java @@ -98,7 +98,7 @@ private CudnnRNNCanonicalToParams(Operation operation) { public static CudnnRNNCanonicalToParams create(Scope scope, Operand numLayers, Operand numUnits, Operand inputSize, Iterable> weights, Iterable> biases, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CudnnRNNCanonicalToParamsV2", scope.makeOpName("CudnnRNNCanonicalToParams")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNNCanonicalToParams")); opBuilder.addInput(numLayers.asOutput()); opBuilder.addInput(numUnits.asOutput()); opBuilder.addInput(inputSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java index f336e5bd553..70dc874dc27 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRNNParamsToCanonical.java @@ -108,7 +108,7 @@ private CudnnRNNParamsToCanonical(Operation operation) { public static CudnnRNNParamsToCanonical create(Scope scope, Operand numLayers, Operand numUnits, Operand inputSize, Operand params, Long numParamsWeights, Long numParamsBiases, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CudnnRNNParamsToCanonicalV2", scope.makeOpName("CudnnRNNParamsToCanonical")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRNNParamsToCanonical")); opBuilder.addInput(numLayers.asOutput()); opBuilder.addInput(numUnits.asOutput()); opBuilder.addInput(inputSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java index 642a79909fd..17114a95d9f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/CudnnRnnParamsSize.java @@ -91,7 +91,7 @@ private CudnnRnnParamsSize(Operation operation) { public static CudnnRnnParamsSize create(Scope scope, Operand numLayers, Operand numUnits, Operand inputSize, Class T, Class S, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CudnnRNNParamsSize", scope.makeOpName("CudnnRnnParamsSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CudnnRnnParamsSize")); opBuilder.addInput(numLayers.asOutput()); opBuilder.addInput(numUnits.asOutput()); opBuilder.addInput(inputSize.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java index 991d5961a29..7ebfca31245 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatDimMap.java @@ -65,7 +65,7 @@ private DataFormatDimMap(Operation operation) { ) public static DataFormatDimMap create(Scope scope, Operand x, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DataFormatDimMap", scope.makeOpName("DataFormatDimMap")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataFormatDimMap")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java index fcc7c3fe995..1f0740e51f9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DataFormatVecPermute.java @@ -82,7 +82,7 @@ private DataFormatVecPermute(Operation operation) { ) public static DataFormatVecPermute create(Scope scope, Operand x, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DataFormatVecPermute", scope.makeOpName("DataFormatVecPermute")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataFormatVecPermute")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java index 11595c5d17e..7607d7abc44 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthToSpace.java @@ -138,7 +138,7 @@ private DepthToSpace(Operation operation) { ) public static DepthToSpace create(Scope scope, Operand input, Long blockSize, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DepthToSpace", scope.makeOpName("DepthToSpace")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthToSpace")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("block_size", blockSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java index 2062c1d2823..115df899a13 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNative.java @@ -85,7 +85,7 @@ private DepthwiseConv2dNative(Operation operation) { ) public static DepthwiseConv2dNative create(Scope scope, Operand input, Operand filter, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DepthwiseConv2dNative", scope.makeOpName("DepthwiseConv2dNative")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthwiseConv2dNative")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java index cb53251b8bd..46039ed5364 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropFilter.java @@ -78,7 +78,7 @@ private DepthwiseConv2dNativeBackpropFilter(Operation operation) { public static DepthwiseConv2dNativeBackpropFilter create(Scope scope, Operand input, Operand filterSizes, Operand outBackprop, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DepthwiseConv2dNativeBackpropFilter", scope.makeOpName("DepthwiseConv2dNativeBackpropFilter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthwiseConv2dNativeBackpropFilter")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filterSizes.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java index 6d514f599ec..84b917dda07 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/DepthwiseConv2dNativeBackpropInput.java @@ -78,7 +78,7 @@ private DepthwiseConv2dNativeBackpropInput(Operation operation) { public static DepthwiseConv2dNativeBackpropInput create(Scope scope, Operand inputSizes, Operand filter, Operand outBackprop, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DepthwiseConv2dNativeBackpropInput", scope.makeOpName("DepthwiseConv2dNativeBackpropInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DepthwiseConv2dNativeBackpropInput")); opBuilder.addInput(inputSizes.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java index 0838b5f6eea..0ce416f962d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2d.java @@ -90,7 +90,7 @@ private Dilation2d(Operation operation) { ) public static Dilation2d create(Scope scope, Operand input, Operand filter, List strides, List rates, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("Dilation2D", scope.makeOpName("Dilation2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dilation2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java index fb07f81692a..f278fb3f223 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropFilter.java @@ -71,7 +71,7 @@ private Dilation2dBackpropFilter(Operation operation) { public static Dilation2dBackpropFilter create(Scope scope, Operand input, Operand filter, Operand outBackprop, List strides, List rates, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("Dilation2DBackpropFilter", scope.makeOpName("Dilation2dBackpropFilter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dilation2dBackpropFilter")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java index e7f407b7d50..def304dcbe7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Dilation2dBackpropInput.java @@ -71,7 +71,7 @@ private Dilation2dBackpropInput(Operation operation) { public static Dilation2dBackpropInput create(Scope scope, Operand input, Operand filter, Operand outBackprop, List strides, List rates, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("Dilation2DBackpropInput", scope.makeOpName("Dilation2dBackpropInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dilation2dBackpropInput")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java index d7afc873a44..35656420d31 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Elu.java @@ -81,7 +81,7 @@ private Elu(Operation operation) { describeByClass = true ) public static Elu create(Scope scope, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Elu", scope.makeOpName("Elu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Elu")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); return new Elu<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java index 94c17656ca9..84b0f7a0232 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/EluGrad.java @@ -59,7 +59,7 @@ private EluGrad(Operation operation) { ) public static EluGrad create(Scope scope, Operand gradients, Operand outputs) { - OperationBuilder opBuilder = scope.env().opBuilder("EluGrad", scope.makeOpName("EluGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EluGrad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(outputs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java index 86aaf612abf..acfe0fe9a34 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FixedUnigramCandidateSampler.java @@ -87,7 +87,7 @@ private FixedUnigramCandidateSampler(Operation operation) { ) public static FixedUnigramCandidateSampler create(Scope scope, Operand trueClasses, Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FixedUnigramCandidateSampler", scope.makeOpName("FixedUnigramCandidateSampler")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FixedUnigramCandidateSampler")); opBuilder.addInput(trueClasses.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_true", numTrue); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java index 5fddbf60bbe..291d2c22ec6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPool.java @@ -81,7 +81,7 @@ private FractionalAvgPool(Operation operation) { ) public static FractionalAvgPool create(Scope scope, Operand value, List poolingRatio, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FractionalAvgPool", scope.makeOpName("FractionalAvgPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalAvgPool")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); float[] poolingRatioArray = new float[poolingRatio.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java index 298f4309afe..b3b5cdc8e49 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalAvgPoolGrad.java @@ -72,7 +72,7 @@ private FractionalAvgPoolGrad(Operation operation) { public static FractionalAvgPoolGrad create(Scope scope, Operand origInputTensorShape, Operand outBackprop, Operand rowPoolingSequence, Operand colPoolingSequence, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FractionalAvgPoolGrad", scope.makeOpName("FractionalAvgPoolGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalAvgPoolGrad")); opBuilder.addInput(origInputTensorShape.asOutput()); opBuilder.addInput(outBackprop.asOutput()); opBuilder.addInput(rowPoolingSequence.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java index ff58d050dfd..632f0ffab4b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPool.java @@ -103,7 +103,7 @@ private FractionalMaxPool(Operation operation) { ) public static FractionalMaxPool create(Scope scope, Operand value, List poolingRatio, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FractionalMaxPool", scope.makeOpName("FractionalMaxPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalMaxPool")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); float[] poolingRatioArray = new float[poolingRatio.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java index 2e1ec6d800d..9168aada03d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FractionalMaxPoolGrad.java @@ -68,7 +68,7 @@ private FractionalMaxPoolGrad(Operation operation) { public static FractionalMaxPoolGrad create(Scope scope, Operand origInput, Operand origOutput, Operand outBackprop, Operand rowPoolingSequence, Operand colPoolingSequence, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FractionalMaxPoolGrad", scope.makeOpName("FractionalMaxPoolGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FractionalMaxPoolGrad")); opBuilder.addInput(origInput.asOutput()); opBuilder.addInput(origOutput.asOutput()); opBuilder.addInput(outBackprop.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java index 158d5f58709..be19069844a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNorm.java @@ -90,7 +90,7 @@ private FusedBatchNorm(Operation operation) { public static FusedBatchNorm create(Scope scope, Operand x, Operand scale, Operand offset, Operand mean, Operand variance, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FusedBatchNormV3", scope.makeOpName("FusedBatchNorm")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedBatchNorm")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(scale.asOutput()); opBuilder.addInput(offset.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java index 081bc93da40..8f70d25a40c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedBatchNormGrad.java @@ -96,7 +96,7 @@ private FusedBatchNormGrad(Operation operation) { public static FusedBatchNormGrad create(Scope scope, Operand yBackprop, Operand x, Operand scale, Operand reserveSpace1, Operand reserveSpace2, Operand reserveSpace3, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FusedBatchNormGradV3", scope.makeOpName("FusedBatchNormGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedBatchNormGrad")); opBuilder.addInput(yBackprop.asOutput()); opBuilder.addInput(x.asOutput()); opBuilder.addInput(scale.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java index 8e1d840740f..7ffb05c66d7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedPadConv2d.java @@ -84,7 +84,7 @@ private FusedPadConv2d(Operation operation) { public static FusedPadConv2d create(Scope scope, Operand input, Operand paddings, Operand filter, String mode, List strides, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("FusedPadConv2D", scope.makeOpName("FusedPadConv2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedPadConv2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddings.asOutput()); opBuilder.addInput(filter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java index c7e368d1042..1ec36de171c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/FusedResizeAndPadConv2d.java @@ -86,7 +86,7 @@ private FusedResizeAndPadConv2d(Operation operation) { public static FusedResizeAndPadConv2d create(Scope scope, Operand input, Operand sizeOutput, Operand paddings, Operand filter, String mode, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FusedResizeAndPadConv2D", scope.makeOpName("FusedResizeAndPadConv2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FusedResizeAndPadConv2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); opBuilder.addInput(paddings.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java index cf6598621f0..dc096503547 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCell.java @@ -110,7 +110,7 @@ private GRUBlockCell(Operation operation) { ) public static GRUBlockCell create(Scope scope, Operand x, Operand hPrev, Operand wRu, Operand wC, Operand bRu, Operand bC) { - OperationBuilder opBuilder = scope.env().opBuilder("GRUBlockCell", scope.makeOpName("GRUBlockCell")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GRUBlockCell")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(hPrev.asOutput()); opBuilder.addInput(wRu.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java index 094b7d46f6e..12503ae477d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/GRUBlockCellGrad.java @@ -150,7 +150,7 @@ private GRUBlockCellGrad(Operation operation) { public static GRUBlockCellGrad create(Scope scope, Operand x, Operand hPrev, Operand wRu, Operand wC, Operand bRu, Operand bC, Operand r, Operand u, Operand c, Operand dH) { - OperationBuilder opBuilder = scope.env().opBuilder("GRUBlockCellGrad", scope.makeOpName("GRUBlockCellGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GRUBlockCellGrad")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(hPrev.asOutput()); opBuilder.addInput(wRu.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java index bd307645aed..2d87109548b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InTopK.java @@ -75,7 +75,7 @@ private InTopK(Operation operation) { ) public static InTopK create(Scope scope, Operand predictions, Operand targets, Operand k) { - OperationBuilder opBuilder = scope.env().opBuilder("InTopKV2", scope.makeOpName("InTopK")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InTopK")); opBuilder.addInput(predictions.asOutput()); opBuilder.addInput(targets.asOutput()); opBuilder.addInput(k.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java index 2673b2e225d..a65d21a2ca0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/InvGrad.java @@ -60,7 +60,7 @@ private InvGrad(Operation operation) { describeByClass = true ) public static InvGrad create(Scope scope, Operand y, Operand dy) { - OperationBuilder opBuilder = scope.env().opBuilder("InvGrad", scope.makeOpName("InvGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InvGrad")); opBuilder.addInput(y.asOutput()); opBuilder.addInput(dy.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java index 7e3642b9f5f..9810a19768b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/IsotonicRegression.java @@ -65,7 +65,7 @@ private IsotonicRegression(Operation operation) { ) public static IsotonicRegression create(Scope scope, Operand input, Class outputDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("IsotonicRegression", scope.makeOpName("IsotonicRegression")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("IsotonicRegression")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_dtype", Operands.toDataType(outputDtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java index 8fb95490147..a85f32110f6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/L2Loss.java @@ -65,7 +65,7 @@ private L2Loss(Operation operation) { describeByClass = true ) public static L2Loss create(Scope scope, Operand t) { - OperationBuilder opBuilder = scope.env().opBuilder("L2Loss", scope.makeOpName("L2Loss")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("L2Loss")); opBuilder.addInput(t.asOutput()); opBuilder = scope.apply(opBuilder); return new L2Loss<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java index 9f9084b8007..f910a98be46 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCell.java @@ -107,7 +107,7 @@ private LSTMBlockCell(Operation operation) { public static LSTMBlockCell create(Scope scope, Operand x, Operand csPrev, Operand hPrev, Operand w, Operand wci, Operand wcf, Operand wco, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LSTMBlockCell", scope.makeOpName("LSTMBlockCell")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LSTMBlockCell")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(csPrev.asOutput()); opBuilder.addInput(hPrev.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java index 401ba8a0dd6..1c5be476677 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LSTMBlockCellGrad.java @@ -89,7 +89,7 @@ public static LSTMBlockCellGrad create(Scope scope, Opera Operand csPrev, Operand hPrev, Operand w, Operand wci, Operand wcf, Operand wco, Operand b, Operand i, Operand cs, Operand f, Operand o, Operand ci, Operand co, Operand csGrad, Operand hGrad, Boolean usePeephole) { - OperationBuilder opBuilder = scope.env().opBuilder("LSTMBlockCellGrad", scope.makeOpName("LSTMBlockCellGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LSTMBlockCellGrad")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(csPrev.asOutput()); opBuilder.addInput(hPrev.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java index 1a0679d979c..102e339294a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LeakyRelu.java @@ -63,7 +63,7 @@ private LeakyRelu(Operation operation) { ) public static LeakyRelu create(Scope scope, Operand features, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LeakyRelu", scope.makeOpName("LeakyRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LeakyRelu")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java index e7fba301202..a4e0e02ac56 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LearnedUnigramCandidateSampler.java @@ -81,7 +81,7 @@ private LearnedUnigramCandidateSampler(Operation operation) { ) public static LearnedUnigramCandidateSampler create(Scope scope, Operand trueClasses, Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LearnedUnigramCandidateSampler", scope.makeOpName("LearnedUnigramCandidateSampler")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LearnedUnigramCandidateSampler")); opBuilder.addInput(trueClasses.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_true", numTrue); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java index 2da47d2cecc..aafc6033ad4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalization.java @@ -74,7 +74,7 @@ private LocalResponseNormalization(Operation operation) { ) public static LocalResponseNormalization create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LRN", scope.makeOpName("LocalResponseNormalization")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LocalResponseNormalization")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java index bbd4a38dee0..ef0017a4c90 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LocalResponseNormalizationGrad.java @@ -61,7 +61,7 @@ private LocalResponseNormalizationGrad(Operation operation) { ) public static LocalResponseNormalizationGrad create(Scope scope, Operand inputGrads, Operand inputImage, Operand outputImage, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LRNGrad", scope.makeOpName("LocalResponseNormalizationGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LocalResponseNormalizationGrad")); opBuilder.addInput(inputGrads.asOutput()); opBuilder.addInput(inputImage.asOutput()); opBuilder.addInput(outputImage.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java index e39f5686016..699922585a8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/LogSoftmax.java @@ -65,7 +65,7 @@ private LogSoftmax(Operation operation) { describeByClass = true ) public static LogSoftmax create(Scope scope, Operand logits) { - OperationBuilder opBuilder = scope.env().opBuilder("LogSoftmax", scope.makeOpName("LogSoftmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogSoftmax")); opBuilder.addInput(logits.asOutput()); opBuilder = scope.apply(opBuilder); return new LogSoftmax<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java index 9eda868c92f..9079b0bd366 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool.java @@ -68,7 +68,7 @@ private MaxPool(Operation operation) { ) public static MaxPool create(Scope scope, Operand input, Operand ksize, Operand strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolV2", scope.makeOpName("MaxPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(ksize.asOutput()); opBuilder.addInput(strides.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java index 9488cba0214..31cdd55de62 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3d.java @@ -69,7 +69,7 @@ private MaxPool3d(Operation operation) { ) public static MaxPool3d create(Scope scope, Operand input, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPool3D", scope.makeOpName("MaxPool3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool3d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizeArray = new long[ksize.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java index 2d38c68cdbd..096e4b4369e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGrad.java @@ -73,7 +73,7 @@ private MaxPool3dGrad(Operation operation) { public static MaxPool3dGrad create(Scope scope, Operand origInput, Operand origOutput, Operand grad, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPool3DGrad", scope.makeOpName("MaxPool3dGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool3dGrad")); opBuilder.addInput(origInput.asOutput()); opBuilder.addInput(origOutput.asOutput()); opBuilder.addInput(grad.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java index dba59ac6923..3c5bbf30708 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPool3dGradGrad.java @@ -72,7 +72,7 @@ private MaxPool3dGradGrad(Operation operation) { public static MaxPool3dGradGrad create(Scope scope, Operand origInput, Operand origOutput, Operand grad, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPool3DGradGrad", scope.makeOpName("MaxPool3dGradGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPool3dGradGrad")); opBuilder.addInput(origInput.asOutput()); opBuilder.addInput(origOutput.asOutput()); opBuilder.addInput(grad.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java index 3323aeed090..e73b77b308c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGrad.java @@ -71,7 +71,7 @@ private MaxPoolGrad(Operation operation) { public static MaxPoolGrad create(Scope scope, Operand origInput, Operand origOutput, Operand grad, Operand ksize, Operand strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolGradV2", scope.makeOpName("MaxPoolGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGrad")); opBuilder.addInput(origInput.asOutput()); opBuilder.addInput(origOutput.asOutput()); opBuilder.addInput(grad.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java index e254b70bf7f..d0bfcc9956a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGrad.java @@ -71,7 +71,7 @@ private MaxPoolGradGrad(Operation operation) { public static MaxPoolGradGrad create(Scope scope, Operand origInput, Operand origOutput, Operand grad, Operand ksize, Operand strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolGradGradV2", scope.makeOpName("MaxPoolGradGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGradGrad")); opBuilder.addInput(origInput.asOutput()); opBuilder.addInput(origOutput.asOutput()); opBuilder.addInput(grad.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java index 7751bca3d64..6a4d68fcab3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradGradWithArgmax.java @@ -72,7 +72,7 @@ private MaxPoolGradGradWithArgmax(Operation operation) { public static MaxPoolGradGradWithArgmax create(Scope scope, Operand input, Operand grad, Operand argmax, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolGradGradWithArgmax", scope.makeOpName("MaxPoolGradGradWithArgmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGradGradWithArgmax")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(grad.asOutput()); opBuilder.addInput(argmax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java index e4a93a781a0..ca8153f86da 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolGradWithArgmax.java @@ -68,7 +68,7 @@ private MaxPoolGradWithArgmax(Operation operation) { public static MaxPoolGradWithArgmax create(Scope scope, Operand input, Operand grad, Operand argmax, List ksize, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolGradWithArgmax", scope.makeOpName("MaxPoolGradWithArgmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolGradWithArgmax")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(grad.asOutput()); opBuilder.addInput(argmax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java index bc705020ec7..d8682b8e4bf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/MaxPoolWithArgmax.java @@ -86,7 +86,7 @@ private MaxPoolWithArgmax(Operation operation) { public static MaxPoolWithArgmax create(Scope scope, Operand input, List ksize, List strides, Class Targmax, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolWithArgmax", scope.makeOpName("MaxPoolWithArgmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MaxPoolWithArgmax")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizeArray = new long[ksize.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java index 33dbf662b9d..7ed8fee52d3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/NthElement.java @@ -73,7 +73,7 @@ private NthElement(Operation operation) { ) public static NthElement create(Scope scope, Operand input, Operand n, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("NthElement", scope.makeOpName("NthElement")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NthElement")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(n.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java index 34101f042f4..b33fc36e608 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedAvgPool.java @@ -78,7 +78,7 @@ private QuantizedAvgPool(Operation operation) { public static QuantizedAvgPool create(Scope scope, Operand input, Operand minInput, Operand maxInput, List ksize, List strides, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedAvgPool", scope.makeOpName("QuantizedAvgPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedAvgPool")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(minInput.asOutput()); opBuilder.addInput(maxInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java index 058947effea..ddc13f90224 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBatchNormWithGlobalNormalization.java @@ -102,7 +102,7 @@ public static QuantizedBatchNormWithGloba Operand vMax, Operand beta, Operand betaMin, Operand betaMax, Operand gamma, Operand gammaMin, Operand gammaMax, Class outType, Float varianceEpsilon, Boolean scaleAfterNormalization) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedBatchNormWithGlobalNormalization", scope.makeOpName("QuantizedBatchNormWithGlobalNormalization")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedBatchNormWithGlobalNormalization")); opBuilder.addInput(t.asOutput()); opBuilder.addInput(tMin.asOutput()); opBuilder.addInput(tMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java index a5857e1ae76..cb1e586f257 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedBiasAdd.java @@ -79,7 +79,7 @@ public static QuantizedBiasAdd create(Scope scope, Operand input, Operand bias, Operand minInput, Operand maxInput, Operand minBias, Operand maxBias, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedBiasAdd", scope.makeOpName("QuantizedBiasAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedBiasAdd")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(bias.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java index 1548df84847..17df774e266 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRelu.java @@ -80,7 +80,7 @@ public static QuantizedConv2DAndRelu create(Scope scope, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndRelu", scope.makeOpName("QuantizedConv2DAndRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DAndRelu")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java index cb0ed49c2e9..aff2a5fa3ba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndReluAndRequantize.java @@ -83,7 +83,7 @@ public static QuantizedConv2DAndReluAndRequantize create( Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndReluAndRequantize", scope.makeOpName("QuantizedConv2DAndReluAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DAndReluAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java index ebb408f7434..ff848ffe752 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DAndRequantize.java @@ -83,7 +83,7 @@ public static QuantizedConv2DAndRequantize create(Scope s Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndRequantize", scope.makeOpName("QuantizedConv2DAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java index 5fb9a7ccae3..db50edce61d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DPerChannel.java @@ -80,7 +80,7 @@ public static QuantizedConv2DPerChannel create(Scope scop Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DPerChannel", scope.makeOpName("QuantizedConv2DPerChannel")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DPerChannel")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java index 4988f86b878..bab9a335a71 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBias.java @@ -81,7 +81,7 @@ public static QuantizedConv2DWithBias create(Scope scope, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBias", scope.makeOpName("QuantizedConv2DWithBias")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBias")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java index 4dcee0cfa02..2fd266645ce 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRelu.java @@ -81,7 +81,7 @@ public static QuantizedConv2DWithBiasAndRelu create(Scope Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndRelu", scope.makeOpName("QuantizedConv2DWithBiasAndRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasAndRelu")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java index de6b10dfc0a..f2675f3d14b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndReluAndRequantize.java @@ -84,7 +84,7 @@ public static QuantizedConv2DWithBiasAndReluAndRequantize Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasAndReluAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasAndReluAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java index 8ff06313fca..87c648079e2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasAndRequantize.java @@ -84,7 +84,7 @@ public static QuantizedConv2DWithBiasAndRequantize create Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java index 06cde9bad75..f8db22536e2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSignedSumAndReluAndRequantize.java @@ -88,7 +88,7 @@ public static QuantizedConv2DWithBiasSignedSumAndReluAndRequ Operand maxFreezedOutput, Operand summand, Operand minSummand, Operand maxSummand, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java index 7cd443db36d..90d4172060d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndRelu.java @@ -82,7 +82,7 @@ public static QuantizedConv2DWithBiasSumAndRelu create(Sc Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand summand, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSumAndRelu", scope.makeOpName("QuantizedConv2DWithBiasSumAndRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasSumAndRelu")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java index 1081e876325..fb302d2676a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2DWithBiasSumAndReluAndRequantize.java @@ -88,7 +88,7 @@ public static QuantizedConv2DWithBiasSumAndReluAndRequantize Operand maxFreezedOutput, Operand summand, Operand minSummand, Operand maxSummand, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSumAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasSumAndReluAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2DWithBiasSumAndReluAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java index 634dcbf13eb..1074cf9f002 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedConv2d.java @@ -89,7 +89,7 @@ public static QuantizedConv2d create(Scope scope, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2D", scope.makeOpName("QuantizedConv2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConv2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java index 36acaca3067..126a89aa6b7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2D.java @@ -80,7 +80,7 @@ public static QuantizedDepthwiseConv2D create(Scope scope Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2D", scope.makeOpName("QuantizedDepthwiseConv2D")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2D")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(minInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java index 40298bf6d2a..e8672cdcd8e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBias.java @@ -81,7 +81,7 @@ public static QuantizedDepthwiseConv2DWithBias create(Sco Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBias", scope.makeOpName("QuantizedDepthwiseConv2DWithBias")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2DWithBias")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java index d9105ad94a4..43163c51c44 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndRelu.java @@ -81,7 +81,7 @@ public static QuantizedDepthwiseConv2DWithBiasAndRelu cre Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBiasAndRelu", scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndRelu")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java index dc801c317f0..b330f7609c0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize.java @@ -84,7 +84,7 @@ public static QuantizedDepthwiseConv2DWithBiasAndReluAndRequ Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Class outType, List strides, String padding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java index 28336b47159..b357e42f390 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedInstanceNorm.java @@ -72,7 +72,7 @@ private QuantizedInstanceNorm(Operation operation) { ) public static QuantizedInstanceNorm create(Scope scope, Operand x, Operand xMin, Operand xMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedInstanceNorm", scope.makeOpName("QuantizedInstanceNorm")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedInstanceNorm")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(xMin.asOutput()); opBuilder.addInput(xMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java index fef1e38a3d8..e37245fdd42 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedMaxPool.java @@ -78,7 +78,7 @@ private QuantizedMaxPool(Operation operation) { public static QuantizedMaxPool create(Scope scope, Operand input, Operand minInput, Operand maxInput, List ksize, List strides, String padding) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMaxPool", scope.makeOpName("QuantizedMaxPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMaxPool")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(minInput.asOutput()); opBuilder.addInput(maxInput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java index 82b87d4f38c..b060f82abe6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu.java @@ -74,7 +74,7 @@ private QuantizedRelu(Operation operation) { public static QuantizedRelu create(Scope scope, Operand features, Operand minFeatures, Operand maxFeatures, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedRelu", scope.makeOpName("QuantizedRelu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedRelu")); opBuilder.addInput(features.asOutput()); opBuilder.addInput(minFeatures.asOutput()); opBuilder.addInput(maxFeatures.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java index 79034e99177..2f865eb4ad1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedRelu6.java @@ -74,7 +74,7 @@ private QuantizedRelu6(Operation operation) { public static QuantizedRelu6 create(Scope scope, Operand features, Operand minFeatures, Operand maxFeatures, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedRelu6", scope.makeOpName("QuantizedRelu6")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedRelu6")); opBuilder.addInput(features.asOutput()); opBuilder.addInput(minFeatures.asOutput()); opBuilder.addInput(maxFeatures.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java index c529a8851bc..36809492c69 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/QuantizedReluX.java @@ -75,7 +75,7 @@ private QuantizedReluX(Operation operation) { public static QuantizedReluX create(Scope scope, Operand features, Operand maxValue, Operand minFeatures, Operand maxFeatures, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedReluX", scope.makeOpName("QuantizedReluX")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedReluX")); opBuilder.addInput(features.asOutput()); opBuilder.addInput(maxValue.asOutput()); opBuilder.addInput(minFeatures.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java index 6963a4905cb..4bae9944d20 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu.java @@ -71,7 +71,7 @@ private Relu(Operation operation) { describeByClass = true ) public static Relu create(Scope scope, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Relu", scope.makeOpName("Relu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Relu")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); return new Relu<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java index 7fd261997e1..b710f942761 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6.java @@ -61,7 +61,7 @@ private Relu6(Operation operation) { describeByClass = true ) public static Relu6 create(Scope scope, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Relu6", scope.makeOpName("Relu6")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Relu6")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); return new Relu6<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java index ef74b7153e2..660dcb7085a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Relu6Grad.java @@ -60,7 +60,7 @@ private Relu6Grad(Operation operation) { ) public static Relu6Grad create(Scope scope, Operand gradients, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Relu6Grad", scope.makeOpName("Relu6Grad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Relu6Grad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java index 9d332cb5f9a..92788e886ae 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/ReluGrad.java @@ -60,7 +60,7 @@ private ReluGrad(Operation operation) { ) public static ReluGrad create(Scope scope, Operand gradients, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("ReluGrad", scope.makeOpName("ReluGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReluGrad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java index 4958748b10c..ca3357fdff1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Selu.java @@ -66,7 +66,7 @@ private Selu(Operation operation) { describeByClass = true ) public static Selu create(Scope scope, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Selu", scope.makeOpName("Selu")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Selu")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); return new Selu<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java index 5c54a3f109b..66a4c89806f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SeluGrad.java @@ -59,7 +59,7 @@ private SeluGrad(Operation operation) { ) public static SeluGrad create(Scope scope, Operand gradients, Operand outputs) { - OperationBuilder opBuilder = scope.env().opBuilder("SeluGrad", scope.makeOpName("SeluGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SeluGrad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(outputs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java index fa3f0b32214..bd7f8c0f9c0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softmax.java @@ -65,7 +65,7 @@ private Softmax(Operation operation) { describeByClass = true ) public static Softmax create(Scope scope, Operand logits) { - OperationBuilder opBuilder = scope.env().opBuilder("Softmax", scope.makeOpName("Softmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Softmax")); opBuilder.addInput(logits.asOutput()); opBuilder = scope.apply(opBuilder); return new Softmax<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java index 5eeb25a3be3..0fe94d6659e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/Softsign.java @@ -61,7 +61,7 @@ private Softsign(Operation operation) { describeByClass = true ) public static Softsign create(Scope scope, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("Softsign", scope.makeOpName("Softsign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Softsign")); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); return new Softsign<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java index c60c25a60cd..45de76bc54f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftsignGrad.java @@ -59,7 +59,7 @@ private SoftsignGrad(Operation operation) { ) public static SoftsignGrad create(Scope scope, Operand gradients, Operand features) { - OperationBuilder opBuilder = scope.env().opBuilder("SoftsignGrad", scope.makeOpName("SoftsignGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SoftsignGrad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(features.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java index b3cd1fb0c60..0b29e7b9afe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToBatch.java @@ -138,7 +138,7 @@ private SpaceToBatch(Operation operation) { ) public static SpaceToBatch create(Scope scope, Operand input, Operand paddings, Long blockSize) { - OperationBuilder opBuilder = scope.env().opBuilder("SpaceToBatch", scope.makeOpName("SpaceToBatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpaceToBatch")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddings.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java index c592597f077..e1fa58d4ff1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SpaceToDepth.java @@ -132,7 +132,7 @@ private SpaceToDepth(Operation operation) { ) public static SpaceToDepth create(Scope scope, Operand input, Long blockSize, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SpaceToDepth", scope.makeOpName("SpaceToDepth")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SpaceToDepth")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("block_size", blockSize); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java index 99d156bba87..6da2e8816a8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/TopK.java @@ -78,7 +78,7 @@ private TopK(Operation operation) { ) public static TopK create(Scope scope, Operand input, Operand k, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TopKV2", scope.makeOpName("TopK")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TopK")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(k.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SoftmaxCrossEntropyWithLogits.java index 331933979c7..0f2d50289b9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SoftmaxCrossEntropyWithLogits.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SoftmaxCrossEntropyWithLogits.java @@ -69,7 +69,7 @@ private SoftmaxCrossEntropyWithLogits(Operation operation) { ) public static SoftmaxCrossEntropyWithLogits create(Scope scope, Operand features, Operand labels) { - OperationBuilder opBuilder = scope.env().opBuilder("SoftmaxCrossEntropyWithLogits", scope.makeOpName("SoftmaxCrossEntropyWithLogits")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SoftmaxCrossEntropyWithLogits")); opBuilder.addInput(features.asOutput()); opBuilder.addInput(labels.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java index 8c48cd0db4d..30eec4c3c05 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/raw/SparseSoftmaxCrossEntropyWithLogits.java @@ -72,7 +72,7 @@ private SparseSoftmaxCrossEntropyWithLogits(Operation operation) { ) public static SparseSoftmaxCrossEntropyWithLogits create(Scope scope, Operand features, Operand labels) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSoftmaxCrossEntropyWithLogits", scope.makeOpName("SparseSoftmaxCrossEntropyWithLogits")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSoftmaxCrossEntropyWithLogits")); opBuilder.addInput(features.asOutput()); opBuilder.addInput(labels.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java index 134856e714e..faab6105ce4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Dequantize.java @@ -113,7 +113,7 @@ private Dequantize(Operation operation) { public static Dequantize create(Scope scope, Operand input, Operand minRange, Operand maxRange, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Dequantize", scope.makeOpName("Dequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(minRange.asOutput()); opBuilder.addInput(maxRange.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java index 8f0e3a3cd5d..b56ea653c7a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgs.java @@ -80,7 +80,7 @@ private FakeQuantWithMinMaxArgs(Operation operation) { ) public static FakeQuantWithMinMaxArgs create(Scope scope, Operand inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxArgs", scope.makeOpName("FakeQuantWithMinMaxArgs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxArgs")); opBuilder.addInput(inputs.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java index 05da8e5d06f..e7cdd673eda 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxArgsGradient.java @@ -61,7 +61,7 @@ private FakeQuantWithMinMaxArgsGradient(Operation operation) { ) public static FakeQuantWithMinMaxArgsGradient create(Scope scope, Operand gradients, Operand inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxArgsGradient", scope.makeOpName("FakeQuantWithMinMaxArgsGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxArgsGradient")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(inputs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java index e411e8e93d3..81ac8d7d52a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVars.java @@ -85,7 +85,7 @@ private FakeQuantWithMinMaxVars(Operation operation) { ) public static FakeQuantWithMinMaxVars create(Scope scope, Operand inputs, Operand min, Operand max, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxVars", scope.makeOpName("FakeQuantWithMinMaxVars")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVars")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(min.asOutput()); opBuilder.addInput(max.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java index d5809fa3abc..66a5e18efe0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsGradient.java @@ -70,7 +70,7 @@ private FakeQuantWithMinMaxVarsGradient(Operation operation) { ) public static FakeQuantWithMinMaxVarsGradient create(Scope scope, Operand gradients, Operand inputs, Operand min, Operand max, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxVarsGradient", scope.makeOpName("FakeQuantWithMinMaxVarsGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVarsGradient")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(min.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java index 953271d9129..61c59c23a0d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannel.java @@ -86,7 +86,7 @@ private FakeQuantWithMinMaxVarsPerChannel(Operation operation) { ) public static FakeQuantWithMinMaxVarsPerChannel create(Scope scope, Operand inputs, Operand min, Operand max, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxVarsPerChannel", scope.makeOpName("FakeQuantWithMinMaxVarsPerChannel")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVarsPerChannel")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(min.asOutput()); opBuilder.addInput(max.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java index 0f5748301cf..e07a811035b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/FakeQuantWithMinMaxVarsPerChannelGradient.java @@ -73,7 +73,7 @@ private FakeQuantWithMinMaxVarsPerChannelGradient(Operation operation) { public static FakeQuantWithMinMaxVarsPerChannelGradient create(Scope scope, Operand gradients, Operand inputs, Operand min, Operand max, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxVarsPerChannelGradient", scope.makeOpName("FakeQuantWithMinMaxVarsPerChannelGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FakeQuantWithMinMaxVarsPerChannelGradient")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(min.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java index 2302b6530c5..6c63f3ec77d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Quantize.java @@ -171,7 +171,7 @@ private Quantize(Operation operation) { ) public static Quantize create(Scope scope, Operand input, Operand minRange, Operand maxRange, Class T, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizeV2", scope.makeOpName("Quantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Quantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(minRange.asOutput()); opBuilder.addInput(maxRange.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java index 4fa1a9a0021..314b577d96d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantize.java @@ -69,7 +69,7 @@ private QuantizeAndDequantize(Operation operation) { ) public static QuantizeAndDequantize create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Operand numBits, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizeAndDequantizeV3", scope.makeOpName("QuantizeAndDequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java index 6cb3d26c426..ad04f64d628 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV3.java @@ -69,7 +69,7 @@ private QuantizeAndDequantizeV3(Operation operation) { ) public static QuantizeAndDequantizeV3 create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Operand numBits, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizeAndDequantizeV3", scope.makeOpName("QuantizeAndDequantizeV3")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantizeV3")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java index 00f10f48024..0d51a0020b2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4.java @@ -67,7 +67,7 @@ private QuantizeAndDequantizeV4(Operation operation) { ) public static QuantizeAndDequantizeV4 create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizeAndDequantizeV4", scope.makeOpName("QuantizeAndDequantizeV4")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantizeV4")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java index 31ee0a84208..84274a6e9d4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeAndDequantizeV4Grad.java @@ -75,7 +75,7 @@ private QuantizeAndDequantizeV4Grad(Operation operation) { public static QuantizeAndDequantizeV4Grad create(Scope scope, Operand gradients, Operand input, Operand inputMin, Operand inputMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizeAndDequantizeV4Grad", scope.makeOpName("QuantizeAndDequantizeV4Grad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeAndDequantizeV4Grad")); opBuilder.addInput(gradients.asOutput()); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java index 3de5b5c3f34..4e98bdcaa26 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizeDownAndShrinkRange.java @@ -93,7 +93,7 @@ private QuantizeDownAndShrinkRange(Operation operation) { public static QuantizeDownAndShrinkRange create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizeDownAndShrinkRange", scope.makeOpName("QuantizeDownAndShrinkRange")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizeDownAndShrinkRange")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java index 602bd900291..0ef565d38db 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedConcat.java @@ -77,7 +77,7 @@ private QuantizedConcat(Operation operation) { public static QuantizedConcat create(Scope scope, Operand concatDim, Iterable> values, Iterable> inputMins, Iterable> inputMaxes) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConcat", scope.makeOpName("QuantizedConcat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedConcat")); opBuilder.addInput(concatDim.asOutput()); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder.addInputList(Operands.asOutputs(inputMins)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java index 1fc826d66d7..233af64fc95 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndDequantize.java @@ -73,7 +73,7 @@ public static QuantizedMatMulWithBiasAndDequantize create Operand minA, Operand maxA, Operand minB, Operand maxB, Operand minFreezedOutput, Operand maxFreezedOutput, Class Toutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndDequantize", scope.makeOpName("QuantizedMatMulWithBiasAndDequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndDequantize")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java index a5b19eedc25..b235db81014 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/QuantizedMatMulWithBiasAndRequantize.java @@ -79,7 +79,7 @@ public static QuantizedMatMulWithBiasAndRequantize create Operand minA, Operand maxA, Operand minB, Operand maxB, Operand minFreezedOutput, Operand maxFreezedOutput, Class Toutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndRequantize", scope.makeOpName("QuantizedMatMulWithBiasAndRequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("QuantizedMatMulWithBiasAndRequantize")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder.addInput(bias.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java index e226adfe73a..0a8d62cab19 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/RequantizationRange.java @@ -69,7 +69,7 @@ private RequantizationRange(Operation operation) { ) public static RequantizationRange create(Scope scope, Operand input, Operand inputMin, Operand inputMax) { - OperationBuilder opBuilder = scope.env().opBuilder("RequantizationRange", scope.makeOpName("RequantizationRange")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RequantizationRange")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java index f990b3548f0..f7a4cb8fe11 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/quantization/Requantize.java @@ -83,7 +83,7 @@ public static Requantize create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Operand requestedOutputMin, Operand requestedOutputMax, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("Requantize", scope.makeOpName("Requantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Requantize")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(inputMin.asOutput()); opBuilder.addInput(inputMax.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java index 6a3aaa298c4..3441decff8d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedBincount.java @@ -77,7 +77,7 @@ private RaggedBincount(Operation operation) { public static RaggedBincount create(Scope scope, Operand splits, Operand values, Operand sizeOutput, Operand weights, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedBincount", scope.makeOpName("RaggedBincount")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedBincount")); opBuilder.addInput(splits.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java index 20ec23bdafc..925d4a3a505 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCountSparseOutput.java @@ -72,7 +72,7 @@ private RaggedCountSparseOutput(Operation operation) { public static RaggedCountSparseOutput create(Scope scope, Operand splits, Operand values, Operand weights, Boolean binaryOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedCountSparseOutput", scope.makeOpName("RaggedCountSparseOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedCountSparseOutput")); opBuilder.addInput(splits.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(weights.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java index 7f388bb3212..976f9aa9c1f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedCross.java @@ -86,7 +86,7 @@ public static RaggedCross create(Scop Iterable> sparseShape, Iterable> denseInputs, String inputOrder, Boolean hashedOutput, Long numBuckets, Long hashKey, Class outValuesType, Class outRowSplitsType) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedCross", scope.makeOpName("RaggedCross")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedCross")); opBuilder.addInputList(Operands.asOutputs(raggedValues)); opBuilder.addInputList(Operands.asOutputs(raggedRowSplits)); opBuilder.addInputList(Operands.asOutputs(sparseIndices)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java index 036a5f252f2..4744fb613a3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedGather.java @@ -99,7 +99,7 @@ private RaggedGather(Operation operation) { public static RaggedGather create(Scope scope, Iterable> paramsNestedSplits, Operand paramsDenseValues, Operand indices, Long OUTPUTRAGGEDRANK) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedGather", scope.makeOpName("RaggedGather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedGather")); opBuilder.addInputList(Operands.asOutputs(paramsNestedSplits)); opBuilder.addInput(paramsDenseValues.asOutput()); opBuilder.addInput(indices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java index d842da7dd53..715d8771f7f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedRange.java @@ -82,7 +82,7 @@ private RaggedRange(Operation operation) { ) public static RaggedRange create(Scope scope, Operand starts, Operand limits, Operand deltas, Class Tsplits) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedRange", scope.makeOpName("RaggedRange")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedRange")); opBuilder.addInput(starts.asOutput()); opBuilder.addInput(limits.asOutput()); opBuilder.addInput(deltas.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java index 830b73899f2..f293efe3754 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorFromVariant.java @@ -90,7 +90,7 @@ private RaggedTensorFromVariant(Operation operation) { public static RaggedTensorFromVariant create( Scope scope, Operand encodedRagged, Long inputRaggedRank, Long outputRaggedRank, Class Tvalues, Class Tsplits) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorFromVariant", scope.makeOpName("RaggedTensorFromVariant")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorFromVariant")); opBuilder.addInput(encodedRagged.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("input_ragged_rank", inputRaggedRank); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java index 8b0b91bbcf1..fdf111286a4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToSparse.java @@ -71,7 +71,7 @@ private RaggedTensorToSparse(Operation operation) { ) public static RaggedTensorToSparse create(Scope scope, Iterable> rtNestedSplits, Operand rtDenseValues) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToSparse", scope.makeOpName("RaggedTensorToSparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToSparse")); opBuilder.addInputList(Operands.asOutputs(rtNestedSplits)); opBuilder.addInput(rtDenseValues.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java index 6b269656c5d..94970bfcd57 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToTensor.java @@ -108,7 +108,7 @@ private RaggedTensorToTensor(Operation operation) { public static RaggedTensorToTensor create(Scope scope, Operand shape, Operand values, Operand defaultValue, Iterable> rowPartitionTensors, List rowPartitionTypes) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToTensor", scope.makeOpName("RaggedTensorToTensor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToTensor")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(defaultValue.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java index 52385b1cf29..6324dcf933f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariant.java @@ -72,7 +72,7 @@ private RaggedTensorToVariant(Operation operation) { public static RaggedTensorToVariant create(Scope scope, Iterable> rtNestedSplits, Operand rtDenseValues, Boolean batchedInput) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToVariant", scope.makeOpName("RaggedTensorToVariant")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToVariant")); opBuilder.addInputList(Operands.asOutputs(rtNestedSplits)); opBuilder.addInput(rtDenseValues.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java index ae33a6e778a..f090fb01bdf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/ragged/RaggedTensorToVariantGradient.java @@ -70,7 +70,7 @@ private RaggedTensorToVariantGradient(Operation operation) { public static RaggedTensorToVariantGradient create(Scope scope, Operand encodedRaggedGrad, Operand rowSplits, Operand denseValuesShape, Class Tvalues) { - OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToVariantGradient", scope.makeOpName("RaggedTensorToVariantGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RaggedTensorToVariantGradient")); opBuilder.addInput(encodedRaggedGrad.asOutput()); opBuilder.addInput(rowSplits.asOutput()); opBuilder.addInput(denseValuesShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java index ec4700fa695..73197facfd8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AllCandidateSampler.java @@ -80,7 +80,7 @@ private AllCandidateSampler(Operation operation) { ) public static AllCandidateSampler create(Scope scope, Operand trueClasses, Long numTrue, Long numSampled, Boolean unique, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AllCandidateSampler", scope.makeOpName("AllCandidateSampler")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AllCandidateSampler")); opBuilder.addInput(trueClasses.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_true", numTrue); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java index 7081ec18ef8..9ee7de7e0aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousRandomSeedGenerator.java @@ -61,7 +61,7 @@ private AnonymousRandomSeedGenerator(Operation operation) { ) public static AnonymousRandomSeedGenerator create(Scope scope, Operand seed, Operand seed2) { - OperationBuilder opBuilder = scope.env().opBuilder("AnonymousRandomSeedGenerator", scope.makeOpName("AnonymousRandomSeedGenerator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousRandomSeedGenerator")); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(seed2.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java index 11a128fb80a..e4a21446bbc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/AnonymousSeedGenerator.java @@ -63,7 +63,7 @@ private AnonymousSeedGenerator(Operation operation) { ) public static AnonymousSeedGenerator create(Scope scope, Operand seed, Operand seed2, Operand reshuffle) { - OperationBuilder opBuilder = scope.env().opBuilder("AnonymousSeedGenerator", scope.makeOpName("AnonymousSeedGenerator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AnonymousSeedGenerator")); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(seed2.asOutput()); opBuilder.addInput(reshuffle.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java index 60600eab717..6d777113e8b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteRandomSeedGenerator.java @@ -51,7 +51,7 @@ private DeleteRandomSeedGenerator(Operation operation) { ) public static DeleteRandomSeedGenerator create(Scope scope, Operand handle, Operand deleter) { - OperationBuilder opBuilder = scope.env().opBuilder("DeleteRandomSeedGenerator", scope.makeOpName("DeleteRandomSeedGenerator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteRandomSeedGenerator")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(deleter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java index 663529c7ee3..4e32e957220 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/DeleteSeedGenerator.java @@ -51,7 +51,7 @@ private DeleteSeedGenerator(Operation operation) { ) public static DeleteSeedGenerator create(Scope scope, Operand handle, Operand deleter) { - OperationBuilder opBuilder = scope.env().opBuilder("DeleteSeedGenerator", scope.makeOpName("DeleteSeedGenerator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeleteSeedGenerator")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(deleter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java index 617175b4152..03e07249afb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/LogUniformCandidateSampler.java @@ -81,7 +81,7 @@ private LogUniformCandidateSampler(Operation operation) { ) public static LogUniformCandidateSampler create(Scope scope, Operand trueClasses, Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LogUniformCandidateSampler", scope.makeOpName("LogUniformCandidateSampler")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LogUniformCandidateSampler")); opBuilder.addInput(trueClasses.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_true", numTrue); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java index 123a5de9e16..1e6cd745615 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/Multinomial.java @@ -70,7 +70,7 @@ private Multinomial(Operation operation) { public static Multinomial create(Scope scope, Operand logits, Operand numSamples, Class outputDtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Multinomial", scope.makeOpName("Multinomial")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Multinomial")); opBuilder.addInput(logits.asOutput()); opBuilder.addInput(numSamples.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java index 9c1fa52000f..3d6636de0fd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/NonDeterministicInts.java @@ -62,7 +62,7 @@ private NonDeterministicInts(Operation operation) { ) public static NonDeterministicInts create(Scope scope, Operand shape, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("NonDeterministicInts", scope.makeOpName("NonDeterministicInts")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NonDeterministicInts")); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java index 3187c28447c..606d62a32a5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/ParameterizedTruncatedNormal.java @@ -71,7 +71,7 @@ private ParameterizedTruncatedNormal(Operation operation) { public static ParameterizedTruncatedNormal create(Scope scope, Operand shape, Operand means, Operand stdevs, Operand minvals, Operand maxvals, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ParameterizedTruncatedNormal", scope.makeOpName("ParameterizedTruncatedNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParameterizedTruncatedNormal")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(means.asOutput()); opBuilder.addInput(stdevs.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java index da7fa82b70c..8cb32cd1c30 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGamma.java @@ -69,7 +69,7 @@ private RandomGamma(Operation operation) { ) public static RandomGamma create(Scope scope, Operand shape, Operand alpha, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomGamma", scope.makeOpName("RandomGamma")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomGamma")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java index 6daf06d2e7f..802b9fdd757 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomGammaGrad.java @@ -59,7 +59,7 @@ private RandomGammaGrad(Operation operation) { ) public static RandomGammaGrad create(Scope scope, Operand alpha, Operand sample) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomGammaGrad", scope.makeOpName("RandomGammaGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomGammaGrad")); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(sample.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java index 914ab2f3a44..4922b13255e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomPoisson.java @@ -78,7 +78,7 @@ private RandomPoisson(Operation operation) { public static RandomPoisson create(Scope scope, Operand shape, Operand rate, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomPoissonV2", scope.makeOpName("RandomPoisson")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomPoisson")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(rate.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java index bb2a282ad00..32aeeb36e34 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomShuffle.java @@ -71,7 +71,7 @@ private RandomShuffle(Operation operation) { ) public static RandomShuffle create(Scope scope, Operand value, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomShuffle", scope.makeOpName("RandomShuffle")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomShuffle")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java index 1cdea4ae17f..fae2ff235c4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomStandardNormal.java @@ -66,7 +66,7 @@ private RandomStandardNormal(Operation operation) { ) public static RandomStandardNormal create(Scope scope, Operand shape, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomStandardNormal", scope.makeOpName("RandomStandardNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomStandardNormal")); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java index f5ad7fcc271..58e9944512b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniform.java @@ -67,7 +67,7 @@ private RandomUniform(Operation operation) { ) public static RandomUniform create(Scope scope, Operand shape, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomUniform", scope.makeOpName("RandomUniform")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomUniform")); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java index d08e70a0baf..fa87d13c8ae 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RandomUniformInt.java @@ -71,7 +71,7 @@ private RandomUniformInt(Operation operation) { ) public static RandomUniformInt create(Scope scope, Operand shape, Operand minval, Operand maxval, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RandomUniformInt", scope.makeOpName("RandomUniformInt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RandomUniformInt")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(minval.asOutput()); opBuilder.addInput(maxval.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java index 9469070c11a..0ab52ae834c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RecordInput.java @@ -59,7 +59,7 @@ private RecordInput(Operation operation) { describeByClass = true ) public static RecordInput create(Scope scope, String filePattern, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RecordInput", scope.makeOpName("RecordInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RecordInput")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("file_pattern", filePattern); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java index d86074997b0..0803ccfc026 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngReadAndSkip.java @@ -63,7 +63,7 @@ private RngReadAndSkip(Operation operation) { ) public static RngReadAndSkip create(Scope scope, Operand resource, Operand alg, Operand delta) { - OperationBuilder opBuilder = scope.env().opBuilder("RngReadAndSkip", scope.makeOpName("RngReadAndSkip")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RngReadAndSkip")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(alg.asOutput()); opBuilder.addInput(delta.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java index fea4eed3b24..5e027c1ea8f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/RngSkip.java @@ -57,7 +57,7 @@ private RngSkip(Operation operation) { ) public static RngSkip create(Scope scope, Operand resource, Operand algorithm, Operand delta) { - OperationBuilder opBuilder = scope.env().opBuilder("RngSkip", scope.makeOpName("RngSkip")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RngSkip")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(delta.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java index 405f3be4ed5..4bcb8219373 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulRandomBinomial.java @@ -72,7 +72,7 @@ private StatefulRandomBinomial(Operation operation) { public static StatefulRandomBinomial create(Scope scope, Operand resource, Operand algorithm, Operand shape, Operand counts, Operand probs, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatefulRandomBinomial", scope.makeOpName("StatefulRandomBinomial")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulRandomBinomial")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java index 920b132283c..8cde26f1306 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulStandardNormal.java @@ -70,7 +70,7 @@ private StatefulStandardNormal(Operation operation) { public static StatefulStandardNormal create(Scope scope, Operand resource, Operand algorithm, Operand shape, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatefulStandardNormalV2", scope.makeOpName("StatefulStandardNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulStandardNormal")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java index 29f4c827a56..c97237166a6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulTruncatedNormal.java @@ -68,7 +68,7 @@ private StatefulTruncatedNormal(Operation operation) { public static StatefulTruncatedNormal create(Scope scope, Operand resource, Operand algorithm, Operand shape, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatefulTruncatedNormal", scope.makeOpName("StatefulTruncatedNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulTruncatedNormal")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java index 525ec5d6db3..54530a52e9f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniform.java @@ -67,7 +67,7 @@ private StatefulUniform(Operation operation) { public static StatefulUniform create(Scope scope, Operand resource, Operand algorithm, Operand shape, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniform", scope.makeOpName("StatefulUniform")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulUniform")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java index 17c36ba762d..de83124e355 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformFullInt.java @@ -65,7 +65,7 @@ private StatefulUniformFullInt(Operation operation) { public static StatefulUniformFullInt create(Scope scope, Operand resource, Operand algorithm, Operand shape, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniformFullInt", scope.makeOpName("StatefulUniformFullInt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulUniformFullInt")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java index 34b12f3c48f..d51b3ca0f11 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatefulUniformInt.java @@ -70,7 +70,7 @@ private StatefulUniformInt(Operation operation) { public static StatefulUniformInt create(Scope scope, Operand resource, Operand algorithm, Operand shape, Operand minval, Operand maxval) { - OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniformInt", scope.makeOpName("StatefulUniformInt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatefulUniformInt")); opBuilder.addInput(resource.asOutput()); opBuilder.addInput(algorithm.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java index d1cb7dd4542..661327137f5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessMultinomial.java @@ -70,7 +70,7 @@ private StatelessMultinomial(Operation operation) { public static StatelessMultinomial create(Scope scope, Operand logits, Operand numSamples, Operand seed, Class outputDtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessMultinomial", scope.makeOpName("StatelessMultinomial")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessMultinomial")); opBuilder.addInput(logits.asOutput()); opBuilder.addInput(numSamples.asOutput()); opBuilder.addInput(seed.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java index 6cfee4854e1..65561c38db9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessParameterizedTruncatedNormal.java @@ -65,7 +65,7 @@ private StatelessParameterizedTruncatedNormal(Operation operation) { public static StatelessParameterizedTruncatedNormal create(Scope scope, Operand shape, Operand seed, Operand means, Operand stddevs, Operand minvals, Operand maxvals) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessParameterizedTruncatedNormal", scope.makeOpName("StatelessParameterizedTruncatedNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessParameterizedTruncatedNormal")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(means.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java index f2f8548aa7a..857c1898ee2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomBinomial.java @@ -70,7 +70,7 @@ private StatelessRandomBinomial(Operation operation) { public static StatelessRandomBinomial create( Scope scope, Operand shape, Operand seed, Operand counts, Operand probs, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomBinomial", scope.makeOpName("StatelessRandomBinomial")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomBinomial")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(counts.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java index b19c41fe4eb..6a254a07415 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGamma.java @@ -63,7 +63,7 @@ private StatelessRandomGamma(Operation operation) { ) public static StatelessRandomGamma create(Scope scope, Operand shape, Operand seed, Operand alpha) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomGammaV2", scope.makeOpName("StatelessRandomGamma")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGamma")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(alpha.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java index 9432aa91e76..28f5edd810d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomGetKeyCounterAlg.java @@ -65,7 +65,7 @@ private StatelessRandomGetKeyCounterAlg(Operation operation) { ) public static StatelessRandomGetKeyCounterAlg create(Scope scope, Operand seed) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomGetKeyCounterAlg", scope.makeOpName("StatelessRandomGetKeyCounterAlg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGetKeyCounterAlg")); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); return new StatelessRandomGetKeyCounterAlg(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java index 03402d96c48..abd2b668fd3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormal.java @@ -68,7 +68,7 @@ private StatelessRandomNormal(Operation operation) { ) public static StatelessRandomNormal create(Scope scope, Operand shape, Operand seed, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomNormal", scope.makeOpName("StatelessRandomNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomNormal")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java index beae49bbea2..853b40eb33c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomNormalV2.java @@ -69,7 +69,7 @@ private StatelessRandomNormalV2(Operation operation) { public static StatelessRandomNormalV2 create(Scope scope, Operand shape, Operand key, Operand counter, Operand alg, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomNormalV2", scope.makeOpName("StatelessRandomNormalV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomNormalV2")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder.addInput(counter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java index 024b387165b..f11d14cd4fb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomPoisson.java @@ -66,7 +66,7 @@ private StatelessRandomPoisson(Operation operation) { public static StatelessRandomPoisson create(Scope scope, Operand shape, Operand seed, Operand lam, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomPoisson", scope.makeOpName("StatelessRandomPoisson")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomPoisson")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(lam.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java index 862fd3cdd30..e6f8732083a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniform.java @@ -69,7 +69,7 @@ private StatelessRandomUniform(Operation operation) { ) public static StatelessRandomUniform create(Scope scope, Operand shape, Operand seed, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniform", scope.makeOpName("StatelessRandomUniform")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniform")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java index 7b3b02d9677..519adfae636 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullInt.java @@ -63,7 +63,7 @@ private StatelessRandomUniformFullInt(Operation operation) { ) public static StatelessRandomUniformFullInt create(Scope scope, Operand shape, Operand seed, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformFullInt", scope.makeOpName("StatelessRandomUniformFullInt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformFullInt")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java index b2334470ce2..d85c334d713 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformFullIntV2.java @@ -68,7 +68,7 @@ private StatelessRandomUniformFullIntV2(Operation operation) { public static StatelessRandomUniformFullIntV2 create(Scope scope, Operand shape, Operand key, Operand counter, Operand alg, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformFullIntV2", scope.makeOpName("StatelessRandomUniformFullIntV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformFullIntV2")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder.addInput(counter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java index 4233ab669e0..b7a31b2f180 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformInt.java @@ -64,7 +64,7 @@ private StatelessRandomUniformInt(Operation operation) { public static StatelessRandomUniformInt create(Scope scope, Operand shape, Operand seed, Operand minval, Operand maxval) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformInt", scope.makeOpName("StatelessRandomUniformInt")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformInt")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder.addInput(minval.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java index ad8440df49b..3b1086869b1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformIntV2.java @@ -68,7 +68,7 @@ private StatelessRandomUniformIntV2(Operation operation) { public static StatelessRandomUniformIntV2 create(Scope scope, Operand shape, Operand key, Operand counter, Operand alg, Operand minval, Operand maxval) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformIntV2", scope.makeOpName("StatelessRandomUniformIntV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformIntV2")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder.addInput(counter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java index 2764bbbb81c..1f6b6339720 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessRandomUniformV2.java @@ -70,7 +70,7 @@ private StatelessRandomUniformV2(Operation operation) { public static StatelessRandomUniformV2 create(Scope scope, Operand shape, Operand key, Operand counter, Operand alg, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformV2", scope.makeOpName("StatelessRandomUniformV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomUniformV2")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder.addInput(counter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java index 7e69cacd5d4..20228830150 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormal.java @@ -70,7 +70,7 @@ private StatelessTruncatedNormal(Operation operation) { ) public static StatelessTruncatedNormal create(Scope scope, Operand shape, Operand seed, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessTruncatedNormal", scope.makeOpName("StatelessTruncatedNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessTruncatedNormal")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java index 24515a7739f..51de197be08 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/StatelessTruncatedNormalV2.java @@ -71,7 +71,7 @@ private StatelessTruncatedNormalV2(Operation operation) { public static StatelessTruncatedNormalV2 create(Scope scope, Operand shape, Operand key, Operand counter, Operand alg, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessTruncatedNormalV2", scope.makeOpName("StatelessTruncatedNormalV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessTruncatedNormalV2")); opBuilder.addInput(shape.asOutput()); opBuilder.addInput(key.asOutput()); opBuilder.addInput(counter.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java index 064c00c8eaf..bb61bb3fc28 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/TruncatedNormal.java @@ -68,7 +68,7 @@ private TruncatedNormal(Operation operation) { ) public static TruncatedNormal create(Scope scope, Operand shape, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TruncatedNormal", scope.makeOpName("TruncatedNormal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TruncatedNormal")); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java index acd4e26b450..4b726580c1c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/UniformCandidateSampler.java @@ -81,7 +81,7 @@ private UniformCandidateSampler(Operation operation) { ) public static UniformCandidateSampler create(Scope scope, Operand trueClasses, Long numTrue, Long numSampled, Boolean unique, Long rangeMax, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UniformCandidateSampler", scope.makeOpName("UniformCandidateSampler")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UniformCandidateSampler")); opBuilder.addInput(trueClasses.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_true", numTrue); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/experimental/DummySeedGenerator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/experimental/DummySeedGenerator.java index 5a9a6d8b9ff..b5f8baccd92 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/experimental/DummySeedGenerator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/random/experimental/DummySeedGenerator.java @@ -54,7 +54,7 @@ private DummySeedGenerator(Operation operation) { describeByClass = true ) public static DummySeedGenerator create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("DummySeedGenerator", scope.makeOpName("DummySeedGenerator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DummySeedGenerator")); opBuilder = scope.apply(opBuilder); return new DummySeedGenerator(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java index aba0663c0d1..20337970fdd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastRecvV2.java @@ -67,7 +67,7 @@ private CollectiveBcastRecvV2(Operation operation) { public static CollectiveBcastRecvV2 create(Scope scope, Operand groupSize, Operand groupKey, Operand instanceKey, Operand shape, Class T, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveBcastRecvV2", scope.makeOpName("CollectiveBcastRecvV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectiveBcastRecvV2")); opBuilder.addInput(groupSize.asOutput()); opBuilder.addInput(groupKey.asOutput()); opBuilder.addInput(instanceKey.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java index 28a8a714995..137f5f2d3ef 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/CollectiveBcastSendV2.java @@ -64,7 +64,7 @@ private CollectiveBcastSendV2(Operation operation) { public static CollectiveBcastSendV2 create(Scope scope, Operand input, Operand groupSize, Operand groupKey, Operand instanceKey, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectiveBcastSendV2", scope.makeOpName("CollectiveBcastSendV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectiveBcastSendV2")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(groupSize.asOutput()); opBuilder.addInput(groupKey.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/DataServiceDatasetV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/DataServiceDatasetV2.java index ebd5f4220b8..96059a264e4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/DataServiceDatasetV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/DataServiceDatasetV2.java @@ -75,7 +75,7 @@ public static DataServiceDatasetV2 create(Scope scope, Operand datasetId Operand jobName, Operand consumerIndex, Operand numConsumers, Operand maxOutstandingRequests, Operand iterationCounter, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DataServiceDatasetV2", scope.makeOpName("DataServiceDatasetV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DataServiceDatasetV2")); opBuilder.addInput(datasetId.asOutput()); opBuilder.addInput(processingMode.asOutput()); opBuilder.addInput(address.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/FinalizeDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/FinalizeDataset.java index 9ef62abad9c..6b37412d717 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/FinalizeDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/FinalizeDataset.java @@ -62,7 +62,7 @@ private FinalizeDataset(Operation operation) { ) public static FinalizeDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("FinalizeDataset", scope.makeOpName("FinalizeDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FinalizeDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("output_types", Operands.toDataTypes(outputTypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java index ad7ec23eb00..dbf716fd32d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/GetOptions.java @@ -55,7 +55,7 @@ private GetOptions(Operation operation) { describeByClass = true ) public static GetOptions create(Scope scope, Operand inputDataset) { - OperationBuilder opBuilder = scope.env().opBuilder("GetOptions", scope.makeOpName("GetOptions")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GetOptions")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); return new GetOptions(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java index be8583f352c..a74c575add4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParameters.java @@ -60,7 +60,7 @@ private LoadTPUEmbeddingFrequencyEstimatorParameters(Operation operation) { public static LoadTPUEmbeddingFrequencyEstimatorParameters create(Scope scope, Operand parameters, Operand lastHitStep, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingFrequencyEstimatorParameters", scope.makeOpName("LoadTPUEmbeddingFrequencyEstimatorParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFrequencyEstimatorParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(lastHitStep.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java index cb5dcd87eef..eca33b34407 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug(Operation ope public static LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug create(Scope scope, Operand parameters, Operand lastHitStep, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(lastHitStep.asOutput()); opBuilder.addInput(gradientAccumulators.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/OptionsDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/OptionsDataset.java index a8a2bea05a3..ec3bf2560c2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/OptionsDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/OptionsDataset.java @@ -63,7 +63,7 @@ private OptionsDataset(Operation operation) { public static OptionsDataset create(Scope scope, Operand inputDataset, String serializedOptions, List> outputTypes, List outputShapes) { - OperationBuilder opBuilder = scope.env().opBuilder("OptionsDataset", scope.makeOpName("OptionsDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OptionsDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("serialized_options", serializedOptions); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/ParallelBatchDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/ParallelBatchDataset.java index 49b2b56b1c6..23fe867b5ae 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/ParallelBatchDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/ParallelBatchDataset.java @@ -68,7 +68,7 @@ private ParallelBatchDataset(Operation operation) { public static ParallelBatchDataset create(Scope scope, Operand inputDataset, Operand batchSize, Operand numParallelCalls, Operand dropRemainder, List> outputTypes, List outputShapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ParallelBatchDataset", scope.makeOpName("ParallelBatchDataset")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ParallelBatchDataset")); opBuilder.addInput(inputDataset.asOutput()); opBuilder.addInput(batchSize.asOutput()); opBuilder.addInput(numParallelCalls.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java index 56a60afbde8..cef412fb0e1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParameters.java @@ -63,7 +63,7 @@ private RetrieveTPUEmbeddingFrequencyEstimatorParameters(Operation operation) { ) public static RetrieveTPUEmbeddingFrequencyEstimatorParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingFrequencyEstimatorParameters", scope.makeOpName("RetrieveTPUEmbeddingFrequencyEstimatorParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFrequencyEstimatorParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java index dfa83fc4ee2..a2911a8b4bd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug(Operation ) public static RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFrequencyEstimatorParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java index f2fae0ede92..60545e4ee6c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetAlg.java @@ -54,7 +54,7 @@ private StatelessRandomGetAlg(Operation operation) { describeByClass = true ) public static StatelessRandomGetAlg create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomGetAlg", scope.makeOpName("StatelessRandomGetAlg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGetAlg")); opBuilder = scope.apply(opBuilder); return new StatelessRandomGetAlg(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java index 96e06befdc7..cf481a59478 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/rawops/StatelessRandomGetKeyCounter.java @@ -60,7 +60,7 @@ private StatelessRandomGetKeyCounter(Operation operation) { describeByClass = true ) public static StatelessRandomGetKeyCounter create(Scope scope, Operand seed) { - OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomGetKeyCounter", scope.makeOpName("StatelessRandomGetKeyCounter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatelessRandomGetKeyCounter")); opBuilder.addInput(seed.asOutput()); opBuilder = scope.apply(opBuilder); return new StatelessRandomGetKeyCounter(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java index 19b042663bd..29a7dcdd9c8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAbs.java @@ -57,7 +57,7 @@ private RiscAbs(Operation operation) { describeByClass = true ) public static RiscAbs create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscAbs", scope.makeOpName("RiscAbs")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscAbs")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscAbs<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java index 33a9471e18b..406b45a4711 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscAdd.java @@ -61,7 +61,7 @@ private RiscAdd(Operation operation) { describeByClass = true ) public static RiscAdd create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscAdd", scope.makeOpName("RiscAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscAdd")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java index 94c493dcea1..62213143018 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryArithmetic.java @@ -60,7 +60,7 @@ private RiscBinaryArithmetic(Operation operation) { ) public static RiscBinaryArithmetic create(Scope scope, Operand x, Operand y, String opType) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscBinaryArithmetic", scope.makeOpName("RiscBinaryArithmetic")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBinaryArithmetic")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java index 8ef2fcd4e79..4409d5229d2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBinaryComparison.java @@ -59,7 +59,7 @@ private RiscBinaryComparison(Operation operation) { ) public static RiscBinaryComparison create(Scope scope, Operand x, Operand y, String opType) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscBinaryComparison", scope.makeOpName("RiscBinaryComparison")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBinaryComparison")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java index 9692477dfd4..ed3ea2df3b6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBitcast.java @@ -60,7 +60,7 @@ private RiscBitcast(Operation operation) { ) public static RiscBitcast create(Scope scope, Operand x, Class DstT) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscBitcast", scope.makeOpName("RiscBitcast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBitcast")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("DstT", Operands.toDataType(DstT)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java index b8f1bfe7086..54f7c313839 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscBroadcast.java @@ -60,7 +60,7 @@ private RiscBroadcast(Operation operation) { ) public static RiscBroadcast create(Scope scope, Operand input, Operand shape) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscBroadcast", scope.makeOpName("RiscBroadcast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscBroadcast")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java index fcdf9c65520..c998c319f04 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCast.java @@ -60,7 +60,7 @@ private RiscCast(Operation operation) { ) public static RiscCast create(Scope scope, Operand x, Class DstT) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscCast", scope.makeOpName("RiscCast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCast")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("DstT", Operands.toDataType(DstT)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java index cff47bfb7aa..b42a4c7fc20 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCeil.java @@ -57,7 +57,7 @@ private RiscCeil(Operation operation) { describeByClass = true ) public static RiscCeil create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscCeil", scope.makeOpName("RiscCeil")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCeil")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscCeil<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java index a862bfda954..01fd5eda433 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCholesky.java @@ -57,7 +57,7 @@ private RiscCholesky(Operation operation) { describeByClass = true ) public static RiscCholesky create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscCholesky", scope.makeOpName("RiscCholesky")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCholesky")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscCholesky<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java index c5432006fcd..60b42cbd7a6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConcat.java @@ -61,7 +61,7 @@ private RiscConcat(Operation operation) { ) public static RiscConcat create(Scope scope, Iterable> values, Operand axis) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscConcat", scope.makeOpName("RiscConcat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscConcat")); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java index 7f320f37311..327010ddf5c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscConv.java @@ -63,7 +63,7 @@ private RiscConv(Operation operation) { ) public static RiscConv create(Scope scope, Operand input, Operand filter, List strides, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscConv", scope.makeOpName("RiscConv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscConv")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(filter.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java index f81bc3b4040..69ce9934490 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscCos.java @@ -57,7 +57,7 @@ private RiscCos(Operation operation) { describeByClass = true ) public static RiscCos create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscCos", scope.makeOpName("RiscCos")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscCos")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscCos<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java index 621e4213f56..abaa5fb8866 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDiv.java @@ -58,7 +58,7 @@ private RiscDiv(Operation operation) { describeByClass = true ) public static RiscDiv create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscDiv", scope.makeOpName("RiscDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscDiv")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java index 650d2db5157..f644c8aaf65 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscDot.java @@ -60,7 +60,7 @@ private RiscDot(Operation operation) { ) public static RiscDot create(Scope scope, Operand a, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscDot", scope.makeOpName("RiscDot")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscDot")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java index ab6b1388b52..0d1ab7791ea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscExp.java @@ -57,7 +57,7 @@ private RiscExp(Operation operation) { describeByClass = true ) public static RiscExp create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscExp", scope.makeOpName("RiscExp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscExp")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscExp<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java index 9096bcb2f33..020983224bf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFft.java @@ -57,7 +57,7 @@ private RiscFft(Operation operation) { describeByClass = true ) public static RiscFft create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscFft", scope.makeOpName("RiscFft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscFft")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscFft<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java index ceac25a2609..8b0c26e14a3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscFloor.java @@ -57,7 +57,7 @@ private RiscFloor(Operation operation) { describeByClass = true ) public static RiscFloor create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscFloor", scope.makeOpName("RiscFloor")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscFloor")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscFloor<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java index 9b6f39aa2ac..f28efc507df 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscGather.java @@ -62,7 +62,7 @@ private RiscGather(Operation operation) { ) public static RiscGather create(Scope scope, Operand params, Operand indices, Operand axis, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscGather", scope.makeOpName("RiscGather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscGather")); opBuilder.addInput(params.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(axis.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java index ba7c79dd7e7..a6ba50a85c4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscImag.java @@ -62,7 +62,7 @@ private RiscImag(Operation operation) { ) public static RiscImag create(Scope scope, Operand input, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscImag", scope.makeOpName("RiscImag")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscImag")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java index d9f88c6006a..be1c544f909 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscIsFinite.java @@ -55,7 +55,7 @@ private RiscIsFinite(Operation operation) { describeByClass = true ) public static RiscIsFinite create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscIsFinite", scope.makeOpName("RiscIsFinite")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscIsFinite")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscIsFinite(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java index 97fac206298..c089cf21012 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLog.java @@ -57,7 +57,7 @@ private RiscLog(Operation operation) { describeByClass = true ) public static RiscLog create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscLog", scope.makeOpName("RiscLog")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLog")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscLog<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java index 71ea8855546..ee63434558c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalAnd.java @@ -55,7 +55,7 @@ private RiscLogicalAnd(Operation operation) { describeByClass = true ) public static RiscLogicalAnd create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscLogicalAnd", scope.makeOpName("RiscLogicalAnd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLogicalAnd")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java index 053a64376a5..478c6cf0ca7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalNot.java @@ -54,7 +54,7 @@ private RiscLogicalNot(Operation operation) { describeByClass = true ) public static RiscLogicalNot create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscLogicalNot", scope.makeOpName("RiscLogicalNot")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLogicalNot")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscLogicalNot(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java index e3ffe0141f2..0b59472b63c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscLogicalOr.java @@ -55,7 +55,7 @@ private RiscLogicalOr(Operation operation) { describeByClass = true ) public static RiscLogicalOr create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscLogicalOr", scope.makeOpName("RiscLogicalOr")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscLogicalOr")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java index f036460b85e..7c04002ff3c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMax.java @@ -60,7 +60,7 @@ private RiscMax(Operation operation) { describeByClass = true ) public static RiscMax create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscMax", scope.makeOpName("RiscMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscMax")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java index 259bc140e93..a2ad19c04bc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMin.java @@ -58,7 +58,7 @@ private RiscMin(Operation operation) { describeByClass = true ) public static RiscMin create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscMin", scope.makeOpName("RiscMin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscMin")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java index 16518324a8d..d72af9fceec 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscMul.java @@ -58,7 +58,7 @@ private RiscMul(Operation operation) { describeByClass = true ) public static RiscMul create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscMul", scope.makeOpName("RiscMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscMul")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java index 8b2833592c1..4fd5d508102 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscNeg.java @@ -57,7 +57,7 @@ private RiscNeg(Operation operation) { describeByClass = true ) public static RiscNeg create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscNeg", scope.makeOpName("RiscNeg")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscNeg")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscNeg<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java index 34dfbd72afe..ddf537f8788 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPad.java @@ -60,7 +60,7 @@ private RiscPad(Operation operation) { ) public static RiscPad create(Scope scope, Operand input, Operand paddings, Operand constantValues) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscPad", scope.makeOpName("RiscPad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscPad")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddings.asOutput()); opBuilder.addInput(constantValues.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java index 83762058d15..2f9a14c0ed2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPool.java @@ -63,7 +63,7 @@ private RiscPool(Operation operation) { ) public static RiscPool create(Scope scope, Operand value, List ksize, List strides, String poolingType, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscPool", scope.makeOpName("RiscPool")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscPool")); opBuilder.addInput(value.asOutput()); opBuilder = scope.apply(opBuilder); long[] ksizeArray = new long[ksize.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java index 657dc0dd80a..7b7a991c662 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscPow.java @@ -58,7 +58,7 @@ private RiscPow(Operation operation) { describeByClass = true ) public static RiscPow create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscPow", scope.makeOpName("RiscPow")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscPow")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java index af8f26b7802..4dfdc4d9f8e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRandomUniform.java @@ -57,7 +57,7 @@ private RiscRandomUniform(Operation operation) { ) public static RiscRandomUniform create(Scope scope, Operand shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscRandomUniform", scope.makeOpName("RiscRandomUniform")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscRandomUniform")); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java index 962dde9f7c2..0e15a35ff5d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReal.java @@ -62,7 +62,7 @@ private RiscReal(Operation operation) { ) public static RiscReal create(Scope scope, Operand input, Class Tout) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscReal", scope.makeOpName("RiscReal")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReal")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Tout", Operands.toDataType(Tout)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java index f8a66eff454..813bd04c4bb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReduce.java @@ -60,7 +60,7 @@ private RiscReduce(Operation operation) { ) public static RiscReduce create(Scope scope, Operand tensor, Operand axis, String reduceType) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscReduce", scope.makeOpName("RiscReduce")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReduce")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java index 3cd94a30933..8efdc93dd16 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscRem.java @@ -58,7 +58,7 @@ private RiscRem(Operation operation) { describeByClass = true ) public static RiscRem create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscRem", scope.makeOpName("RiscRem")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscRem")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java index 8e0690bf7c1..e102911a274 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReshape.java @@ -59,7 +59,7 @@ private RiscReshape(Operation operation) { ) public static RiscReshape create(Scope scope, Operand tensor, Operand shape) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscReshape", scope.makeOpName("RiscReshape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReshape")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(shape.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java index faacbbc2e0d..1717c78dea0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscReverse.java @@ -59,7 +59,7 @@ private RiscReverse(Operation operation) { ) public static RiscReverse create(Scope scope, Operand tensor, Operand axis) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscReverse", scope.makeOpName("RiscReverse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscReverse")); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java index 6b412dc25d4..caa17adc322 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscScatter.java @@ -61,7 +61,7 @@ private RiscScatter(Operation operation) { ) public static RiscScatter create(Scope scope, Operand indices, Operand updates, Operand shape) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscScatter", scope.makeOpName("RiscScatter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscScatter")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(updates.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java index 0075fbabc2e..6e9fb8238eb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscShape.java @@ -61,7 +61,7 @@ private RiscShape(Operation operation) { ) public static RiscShape create(Scope scope, Operand input, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscShape", scope.makeOpName("RiscShape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscShape")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java index c4fbabe08ff..4cd3a6031b9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSign.java @@ -57,7 +57,7 @@ private RiscSign(Operation operation) { describeByClass = true ) public static RiscSign create(Scope scope, Operand x) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscSign", scope.makeOpName("RiscSign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSign")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); return new RiscSign<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java index cbeb1e65a9d..7d6fdea814c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSlice.java @@ -61,7 +61,7 @@ private RiscSlice(Operation operation) { ) public static RiscSlice create(Scope scope, Operand input, Operand begin, Operand sizeOutput) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscSlice", scope.makeOpName("RiscSlice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSlice")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(begin.asOutput()); opBuilder.addInput(sizeOutput.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java index 54ed2a79e69..3739958cf2c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSort.java @@ -60,7 +60,7 @@ private RiscSort(Operation operation) { ) public static RiscSort create(Scope scope, Operand input, Operand axis, String direction) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscSort", scope.makeOpName("RiscSort")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSort")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(axis.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java index 1e14f2ea36d..4f40fdb43e1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSqueeze.java @@ -61,7 +61,7 @@ private RiscSqueeze(Operation operation) { ) public static RiscSqueeze create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscSqueeze", scope.makeOpName("RiscSqueeze")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSqueeze")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java index 4f1a9515914..d83078cf01d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscSub.java @@ -58,7 +58,7 @@ private RiscSub(Operation operation) { describeByClass = true ) public static RiscSub create(Scope scope, Operand x, Operand y) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscSub", scope.makeOpName("RiscSub")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscSub")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java index 27a0a2879fc..a993d61e780 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTranspose.java @@ -60,7 +60,7 @@ private RiscTranspose(Operation operation) { ) public static RiscTranspose create(Scope scope, Operand x, Operand perm) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscTranspose", scope.makeOpName("RiscTranspose")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscTranspose")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(perm.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java index 000b5c22b66..839392b2112 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscTriangularSolve.java @@ -60,7 +60,7 @@ private RiscTriangularSolve(Operation operation) { ) public static RiscTriangularSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscTriangularSolve", scope.makeOpName("RiscTriangularSolve")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscTriangularSolve")); opBuilder.addInput(matrix.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java index ef530d473a4..2931d94605a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/risc/RiscUnary.java @@ -58,7 +58,7 @@ private RiscUnary(Operation operation) { describeByClass = true ) public static RiscUnary create(Scope scope, Operand x, String opType) { - OperationBuilder opBuilder = scope.env().opBuilder("RiscUnary", scope.makeOpName("RiscUnary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RiscUnary")); opBuilder.addInput(x.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("op_type", opType); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java index 4aa82a29d13..15b4c6d4c15 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft.java @@ -59,7 +59,7 @@ private BatchFft(Operation operation) { describeByClass = true ) public static BatchFft create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchFFT", scope.makeOpName("BatchFft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFft")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchFft(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java index d35c420a4fc..86eeb226d49 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft2d.java @@ -59,7 +59,7 @@ private BatchFft2d(Operation operation) { describeByClass = true ) public static BatchFft2d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchFFT2D", scope.makeOpName("BatchFft2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFft2d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchFft2d(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java index cec014617f6..3282b91163e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchFft3d.java @@ -59,7 +59,7 @@ private BatchFft3d(Operation operation) { describeByClass = true ) public static BatchFft3d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchFFT3D", scope.makeOpName("BatchFft3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchFft3d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchFft3d(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java index ddd64123e1f..b14da1814ce 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft.java @@ -59,7 +59,7 @@ private BatchIfft(Operation operation) { describeByClass = true ) public static BatchIfft create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchIFFT", scope.makeOpName("BatchIfft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchIfft")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchIfft(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java index 162d4111ec7..5b660ab4717 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft2d.java @@ -59,7 +59,7 @@ private BatchIfft2d(Operation operation) { describeByClass = true ) public static BatchIfft2d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchIFFT2D", scope.makeOpName("BatchIfft2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchIfft2d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchIfft2d(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java index a3b30fcfa99..de17e51457d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/BatchIfft3d.java @@ -59,7 +59,7 @@ private BatchIfft3d(Operation operation) { describeByClass = true ) public static BatchIfft3d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchIFFT3D", scope.makeOpName("BatchIfft3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchIfft3d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new BatchIfft3d(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java index 70f3d26624f..70a615edc54 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft.java @@ -63,7 +63,7 @@ private Fft(Operation operation) { describeByClass = true ) public static Fft create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("FFT", scope.makeOpName("Fft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fft")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Fft<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java index 11269998d38..2a9e532fed5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft2d.java @@ -63,7 +63,7 @@ private Fft2d(Operation operation) { describeByClass = true ) public static Fft2d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("FFT2D", scope.makeOpName("Fft2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fft2d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Fft2d<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java index 034937793d3..6dffbd658d1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Fft3d.java @@ -63,7 +63,7 @@ private Fft3d(Operation operation) { describeByClass = true ) public static Fft3d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("FFT3D", scope.makeOpName("Fft3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Fft3d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Fft3d<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java index aee45785d2b..fe2a1572a49 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft.java @@ -63,7 +63,7 @@ private Ifft(Operation operation) { describeByClass = true ) public static Ifft create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("IFFT", scope.makeOpName("Ifft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ifft")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Ifft<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java index 3e16e93f3b4..34a73ec59f8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft2d.java @@ -63,7 +63,7 @@ private Ifft2d(Operation operation) { describeByClass = true ) public static Ifft2d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("IFFT2D", scope.makeOpName("Ifft2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ifft2d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Ifft2d<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java index 518b8123129..b126e65bb71 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Ifft3d.java @@ -63,7 +63,7 @@ private Ifft3d(Operation operation) { describeByClass = true ) public static Ifft3d create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("IFFT3D", scope.makeOpName("Ifft3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Ifft3d")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Ifft3d<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java index d60e3507876..1246e75df6f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft.java @@ -79,7 +79,7 @@ private Irfft(Operation operation) { ) public static Irfft create(Scope scope, Operand input, Operand fftLength, Class Treal) { - OperationBuilder opBuilder = scope.env().opBuilder("IRFFT", scope.makeOpName("Irfft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Irfft")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(fftLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java index 944cb75feda..bd7239a5398 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft2d.java @@ -80,7 +80,7 @@ private Irfft2d(Operation operation) { ) public static Irfft2d create(Scope scope, Operand input, Operand fftLength, Class Treal) { - OperationBuilder opBuilder = scope.env().opBuilder("IRFFT2D", scope.makeOpName("Irfft2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Irfft2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(fftLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java index 1e09ac9f401..9dde73296c4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Irfft3d.java @@ -80,7 +80,7 @@ private Irfft3d(Operation operation) { ) public static Irfft3d create(Scope scope, Operand input, Operand fftLength, Class Treal) { - OperationBuilder opBuilder = scope.env().opBuilder("IRFFT3D", scope.makeOpName("Irfft3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Irfft3d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(fftLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java index 36651f98d4a..08284d88051 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft.java @@ -75,7 +75,7 @@ private Rfft(Operation operation) { ) public static Rfft create(Scope scope, Operand input, Operand fftLength, Class Tcomplex) { - OperationBuilder opBuilder = scope.env().opBuilder("RFFT", scope.makeOpName("Rfft")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rfft")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(fftLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java index 04fb89f3ec8..e48596b4329 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft2d.java @@ -76,7 +76,7 @@ private Rfft2d(Operation operation) { ) public static Rfft2d create(Scope scope, Operand input, Operand fftLength, Class Tcomplex) { - OperationBuilder opBuilder = scope.env().opBuilder("RFFT2D", scope.makeOpName("Rfft2d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rfft2d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(fftLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java index 7786b8003ad..028fdf53c7b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/signal/Rfft3d.java @@ -76,7 +76,7 @@ private Rfft3d(Operation operation) { ) public static Rfft3d create(Scope scope, Operand input, Operand fftLength, Class Tcomplex) { - OperationBuilder opBuilder = scope.env().opBuilder("RFFT3D", scope.makeOpName("Rfft3d")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Rfft3d")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(fftLength.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java index 69cdfdc804f..3763cc869ad 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddManySparseToTensorsMap.java @@ -83,7 +83,7 @@ private AddManySparseToTensorsMap(Operation operation) { ) public static AddManySparseToTensorsMap create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AddManySparseToTensorsMap", scope.makeOpName("AddManySparseToTensorsMap")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AddManySparseToTensorsMap")); opBuilder.addInput(sparseIndices.asOutput()); opBuilder.addInput(sparseValues.asOutput()); opBuilder.addInput(sparseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java index f8e7db00640..3a3e7a36687 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/AddSparseToTensorsMap.java @@ -75,7 +75,7 @@ private AddSparseToTensorsMap(Operation operation) { ) public static AddSparseToTensorsMap create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AddSparseToTensorsMap", scope.makeOpName("AddSparseToTensorsMap")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AddSparseToTensorsMap")); opBuilder.addInput(sparseIndices.asOutput()); opBuilder.addInput(sparseValues.asOutput()); opBuilder.addInput(sparseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java index b388165cf92..50c007410a6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseCountSparseOutput.java @@ -71,7 +71,7 @@ private DenseCountSparseOutput(Operation operation) { public static DenseCountSparseOutput create(Scope scope, Operand values, Operand weights, Boolean binaryOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DenseCountSparseOutput", scope.makeOpName("DenseCountSparseOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseCountSparseOutput")); opBuilder.addInput(values.asOutput()); opBuilder.addInput(weights.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java index 56c3e4f1fb4..3bdf87ac4cb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToDenseSetOperation.java @@ -80,7 +80,7 @@ private DenseToDenseSetOperation(Operation operation) { ) public static DenseToDenseSetOperation create(Scope scope, Operand set1, Operand set2, String setOperation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DenseToDenseSetOperation", scope.makeOpName("DenseToDenseSetOperation")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToDenseSetOperation")); opBuilder.addInput(set1.asOutput()); opBuilder.addInput(set2.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java index a960a1b9217..e00e1ca536a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DenseToSparseSetOperation.java @@ -92,7 +92,7 @@ private DenseToSparseSetOperation(Operation operation) { public static DenseToSparseSetOperation create(Scope scope, Operand set1, Operand set2Indices, Operand set2Values, Operand set2Shape, String setOperation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("DenseToSparseSetOperation", scope.makeOpName("DenseToSparseSetOperation")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DenseToSparseSetOperation")); opBuilder.addInput(set1.asOutput()); opBuilder.addInput(set2Indices.asOutput()); opBuilder.addInput(set2Values.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java index 710cee3d76a..fb60e31778d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/DeserializeSparse.java @@ -111,7 +111,7 @@ private DeserializeSparse(Operation operation) { ) public static DeserializeSparse create(Scope scope, Operand serializedSparse, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("DeserializeSparse", scope.makeOpName("DeserializeSparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DeserializeSparse")); opBuilder.addInput(serializedSparse.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java index 993fcbf4bcf..d224c39509f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorApplyGradient.java @@ -69,7 +69,7 @@ public static SparseAccumulatorApplyGradient create(Scope scope, Operand localStep, Operand gradientIndices, Operand gradientValues, Operand gradientShape, Boolean hasKnownShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseAccumulatorApplyGradient", scope.makeOpName("SparseAccumulatorApplyGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAccumulatorApplyGradient")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(localStep.asOutput()); opBuilder.addInput(gradientIndices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java index ffa4e52430f..896d1ebd74a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAccumulatorTakeGradient.java @@ -81,7 +81,7 @@ private SparseAccumulatorTakeGradient(Operation operation) { ) public static SparseAccumulatorTakeGradient create(Scope scope, Operand handle, Operand numRequired, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseAccumulatorTakeGradient", scope.makeOpName("SparseAccumulatorTakeGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAccumulatorTakeGradient")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(numRequired.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java index d7f3a908a6f..fca9b69819f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAdd.java @@ -89,7 +89,7 @@ private SparseAdd(Operation operation) { public static SparseAdd create(Scope scope, Operand aIndices, Operand aValues, Operand aShape, Operand bIndices, Operand bValues, Operand bShape, Operand thresh) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseAdd", scope.makeOpName("SparseAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAdd")); opBuilder.addInput(aIndices.asOutput()); opBuilder.addInput(aValues.asOutput()); opBuilder.addInput(aShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java index 33c0d798313..248cecd3126 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseAddGrad.java @@ -75,7 +75,7 @@ private SparseAddGrad(Operation operation) { ) public static SparseAddGrad create(Scope scope, Operand backpropValGrad, Operand aIndices, Operand bIndices, Operand sumIndices) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseAddGrad", scope.makeOpName("SparseAddGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseAddGrad")); opBuilder.addInput(backpropValGrad.asOutput()); opBuilder.addInput(aIndices.asOutput()); opBuilder.addInput(bIndices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java index f9eb554f0fb..c30dacda188 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseBincount.java @@ -78,7 +78,7 @@ private SparseBincount(Operation operation) { public static SparseBincount create(Scope scope, Operand indices, Operand values, Operand denseShape, Operand sizeOutput, Operand weights, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseBincount", scope.makeOpName("SparseBincount")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseBincount")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(denseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java index d9dd3a19d20..152e475368f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConcat.java @@ -112,7 +112,7 @@ private SparseConcat(Operation operation) { public static SparseConcat create(Scope scope, Iterable> indices, Iterable> values, Iterable> shapes, Long concatDim) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseConcat", scope.makeOpName("SparseConcat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseConcat")); opBuilder.addInputList(Operands.asOutputs(indices)); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder.addInputList(Operands.asOutputs(shapes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java index 908b8a67212..2d2b5509fbc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseConditionalAccumulator.java @@ -71,7 +71,7 @@ private SparseConditionalAccumulator(Operation operation) { ) public static SparseConditionalAccumulator create(Scope scope, Class dtype, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseConditionalAccumulator", scope.makeOpName("SparseConditionalAccumulator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseConditionalAccumulator")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java index 945f357b277..509f91943cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCountSparseOutput.java @@ -73,7 +73,7 @@ private SparseCountSparseOutput(Operation operation) { public static SparseCountSparseOutput create(Scope scope, Operand indices, Operand values, Operand denseShape, Operand weights, Boolean binaryOutput, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseCountSparseOutput", scope.makeOpName("SparseCountSparseOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseCountSparseOutput")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(denseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java index 24c2cb32e9c..8e48ce89324 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCross.java @@ -108,7 +108,7 @@ private SparseCross(Operation operation) { public static SparseCross create(Scope scope, Iterable> indices, Iterable> values, Iterable> shapes, Iterable> denseInputs, Operand sep) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseCrossV2", scope.makeOpName("SparseCross")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseCross")); opBuilder.addInputList(Operands.asOutputs(indices)); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder.addInputList(Operands.asOutputs(shapes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java index cf1f10e8a77..39373955fde 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseCrossHashed.java @@ -112,7 +112,7 @@ public static SparseCrossHashed create(Scope scope, Iterable> in Iterable> values, Iterable> shapes, Iterable> denseInputs, Operand numBuckets, Operand strongHash, Operand salt) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseCrossHashed", scope.makeOpName("SparseCrossHashed")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseCrossHashed")); opBuilder.addInputList(Operands.asOutputs(indices)); opBuilder.addInputList(Operands.asOutputs(values)); opBuilder.addInputList(Operands.asOutputs(shapes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java index 9056e35cc1d..5b90d60145f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseAdd.java @@ -74,7 +74,7 @@ private SparseDenseCwiseAdd(Operation operation) { ) public static SparseDenseCwiseAdd create(Scope scope, Operand spIndices, Operand spValues, Operand spShape, Operand dense) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseDenseCwiseAdd", scope.makeOpName("SparseDenseCwiseAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseDenseCwiseAdd")); opBuilder.addInput(spIndices.asOutput()); opBuilder.addInput(spValues.asOutput()); opBuilder.addInput(spShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java index 10e57e9d2ef..26276a5729f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseDiv.java @@ -69,7 +69,7 @@ private SparseDenseCwiseDiv(Operation operation) { ) public static SparseDenseCwiseDiv create(Scope scope, Operand spIndices, Operand spValues, Operand spShape, Operand dense) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseDenseCwiseDiv", scope.makeOpName("SparseDenseCwiseDiv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseDenseCwiseDiv")); opBuilder.addInput(spIndices.asOutput()); opBuilder.addInput(spValues.asOutput()); opBuilder.addInput(spShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java index 87fe9de55e0..bdd20f9da24 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseDenseCwiseMul.java @@ -72,7 +72,7 @@ private SparseDenseCwiseMul(Operation operation) { ) public static SparseDenseCwiseMul create(Scope scope, Operand spIndices, Operand spValues, Operand spShape, Operand dense) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseDenseCwiseMul", scope.makeOpName("SparseDenseCwiseMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseDenseCwiseMul")); opBuilder.addInput(spIndices.asOutput()); opBuilder.addInput(spValues.asOutput()); opBuilder.addInput(spShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java index b175002e7e0..e63b03b97ea 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRows.java @@ -113,7 +113,7 @@ private SparseFillEmptyRows(Operation operation) { public static SparseFillEmptyRows create(Scope scope, Operand indices, Operand values, Operand denseShape, Operand defaultValue) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseFillEmptyRows", scope.makeOpName("SparseFillEmptyRows")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseFillEmptyRows")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(denseShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java index 4e4056ad334..3733bf3eeab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseFillEmptyRowsGrad.java @@ -74,7 +74,7 @@ private SparseFillEmptyRowsGrad(Operation operation) { ) public static SparseFillEmptyRowsGrad create(Scope scope, Operand reverseIndexMap, Operand gradValues) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseFillEmptyRowsGrad", scope.makeOpName("SparseFillEmptyRowsGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseFillEmptyRowsGrad")); opBuilder.addInput(reverseIndexMap.asOutput()); opBuilder.addInput(gradValues.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java index 143221bf47d..a7b3ea3aa7f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseMatMul.java @@ -70,7 +70,7 @@ private SparseMatMul(Operation operation) { ) public static SparseMatMul create(Scope scope, Operand a, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseMatMul", scope.makeOpName("SparseMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseMatMul")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java index e903970abdf..e76ad7af8e2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMax.java @@ -80,7 +80,7 @@ private SparseReduceMax(Operation operation) { public static SparseReduceMax create(Scope scope, Operand inputIndices, Operand inputValues, Operand inputShape, Operand reductionAxes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseReduceMax", scope.makeOpName("SparseReduceMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceMax")); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputValues.asOutput()); opBuilder.addInput(inputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java index 7861f41c263..85626a38039 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceMaxSparse.java @@ -86,7 +86,7 @@ private SparseReduceMaxSparse(Operation operation) { public static SparseReduceMaxSparse create(Scope scope, Operand inputIndices, Operand inputValues, Operand inputShape, Operand reductionAxes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseReduceMaxSparse", scope.makeOpName("SparseReduceMaxSparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceMaxSparse")); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputValues.asOutput()); opBuilder.addInput(inputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java index 60edd502866..a047dc998ad 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSum.java @@ -80,7 +80,7 @@ private SparseReduceSum(Operation operation) { public static SparseReduceSum create(Scope scope, Operand inputIndices, Operand inputValues, Operand inputShape, Operand reductionAxes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseReduceSum", scope.makeOpName("SparseReduceSum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceSum")); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputValues.asOutput()); opBuilder.addInput(inputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java index 5aa1b160680..ebc2f1889fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReduceSumSparse.java @@ -86,7 +86,7 @@ private SparseReduceSumSparse(Operation operation) { public static SparseReduceSumSparse create(Scope scope, Operand inputIndices, Operand inputValues, Operand inputShape, Operand reductionAxes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseReduceSumSparse", scope.makeOpName("SparseReduceSumSparse")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReduceSumSparse")); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputValues.asOutput()); opBuilder.addInput(inputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java index bb63b87263d..dba473df550 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReorder.java @@ -75,7 +75,7 @@ private SparseReorder(Operation operation) { ) public static SparseReorder create(Scope scope, Operand inputIndices, Operand inputValues, Operand inputShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseReorder", scope.makeOpName("SparseReorder")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReorder")); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputValues.asOutput()); opBuilder.addInput(inputShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java index 06e3b505ae5..1ac246fd9e0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseReshape.java @@ -77,7 +77,7 @@ private SparseReshape(Operation operation) { ) public static SparseReshape create(Scope scope, Operand inputIndices, Operand inputShape, Operand newShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseReshape", scope.makeOpName("SparseReshape")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseReshape")); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputShape.asOutput()); opBuilder.addInput(newShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java index 6a47dd27947..85b840b16e9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMean.java @@ -67,7 +67,7 @@ private SparseSegmentMean(Operation operation) { ) public static SparseSegmentMean create(Scope scope, Operand data, Operand indices, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMean", scope.makeOpName("SparseSegmentMean")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentMean")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java index f6b1f87a832..d071f487d35 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanGrad.java @@ -69,7 +69,7 @@ private SparseSegmentMeanGrad(Operation operation) { public static SparseSegmentMeanGrad create(Scope scope, Operand grad, Operand indices, Operand segmentIds, Operand outputDim0) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMeanGrad", scope.makeOpName("SparseSegmentMeanGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentMeanGrad")); opBuilder.addInput(grad.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java index b39c32e74f3..154c324b5bc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentMeanWithNumSegments.java @@ -71,7 +71,7 @@ private SparseSegmentMeanWithNumSegments(Operation operation) { public static SparseSegmentMeanWithNumSegments create(Scope scope, Operand data, Operand indices, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMeanWithNumSegments", scope.makeOpName("SparseSegmentMeanWithNumSegments")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentMeanWithNumSegments")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java index ed7eae4bcce..0e984d8faa7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtN.java @@ -66,7 +66,7 @@ private SparseSegmentSqrtN(Operation operation) { ) public static SparseSegmentSqrtN create(Scope scope, Operand data, Operand indices, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtN", scope.makeOpName("SparseSegmentSqrtN")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSqrtN")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java index 7322722e355..db99f27f376 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNGrad.java @@ -69,7 +69,7 @@ private SparseSegmentSqrtNGrad(Operation operation) { public static SparseSegmentSqrtNGrad create(Scope scope, Operand grad, Operand indices, Operand segmentIds, Operand outputDim0) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtNGrad", scope.makeOpName("SparseSegmentSqrtNGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSqrtNGrad")); opBuilder.addInput(grad.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java index f3d8174ea8b..2f936493b98 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSqrtNWithNumSegments.java @@ -72,7 +72,7 @@ private SparseSegmentSqrtNWithNumSegments(Operation operation) { public static SparseSegmentSqrtNWithNumSegments create(Scope scope, Operand data, Operand indices, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtNWithNumSegments", scope.makeOpName("SparseSegmentSqrtNWithNumSegments")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSqrtNWithNumSegments")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java index 80a224d44b1..2df68c339df 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSum.java @@ -90,7 +90,7 @@ private SparseSegmentSum(Operation operation) { ) public static SparseSegmentSum create(Scope scope, Operand data, Operand indices, Operand segmentIds) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSum", scope.makeOpName("SparseSegmentSum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSum")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java index 5a704742473..8cc379497d3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSegmentSumWithNumSegments.java @@ -90,7 +90,7 @@ private SparseSegmentSumWithNumSegments(Operation operation) { public static SparseSegmentSumWithNumSegments create(Scope scope, Operand data, Operand indices, Operand segmentIds, Operand numSegments) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSumWithNumSegments", scope.makeOpName("SparseSegmentSumWithNumSegments")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSegmentSumWithNumSegments")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(segmentIds.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java index 0c4d117518b..6e026b471fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSlice.java @@ -91,7 +91,7 @@ private SparseSlice(Operation operation) { ) public static SparseSlice create(Scope scope, Operand indices, Operand values, Operand shape, Operand start, Operand sizeOutput) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSlice", scope.makeOpName("SparseSlice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSlice")); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder.addInput(shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java index f66672e967a..06fae6bca46 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSliceGrad.java @@ -70,7 +70,7 @@ private SparseSliceGrad(Operation operation) { ) public static SparseSliceGrad create(Scope scope, Operand backpropValGrad, Operand inputIndices, Operand inputStart, Operand outputIndices) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSliceGrad", scope.makeOpName("SparseSliceGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSliceGrad")); opBuilder.addInput(backpropValGrad.asOutput()); opBuilder.addInput(inputIndices.asOutput()); opBuilder.addInput(inputStart.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java index 8278006e830..75fc6fa5b76 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSoftmax.java @@ -78,7 +78,7 @@ private SparseSoftmax(Operation operation) { ) public static SparseSoftmax create(Scope scope, Operand spIndices, Operand spValues, Operand spShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSoftmax", scope.makeOpName("SparseSoftmax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSoftmax")); opBuilder.addInput(spIndices.asOutput()); opBuilder.addInput(spValues.asOutput()); opBuilder.addInput(spShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java index ec699a3a53c..8b26b4d31c3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMaximum.java @@ -74,7 +74,7 @@ private SparseSparseMaximum(Operation operation) { public static SparseSparseMaximum create(Scope scope, Operand aIndices, Operand aValues, Operand aShape, Operand bIndices, Operand bValues, Operand bShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSparseMaximum", scope.makeOpName("SparseSparseMaximum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSparseMaximum")); opBuilder.addInput(aIndices.asOutput()); opBuilder.addInput(aValues.asOutput()); opBuilder.addInput(aShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java index 8483cbae9c4..d4b4102b8b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSparseMinimum.java @@ -74,7 +74,7 @@ private SparseSparseMinimum(Operation operation) { public static SparseSparseMinimum create(Scope scope, Operand aIndices, Operand aValues, Operand aShape, Operand bIndices, Operand bValues, Operand bShape) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSparseMinimum", scope.makeOpName("SparseSparseMinimum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSparseMinimum")); opBuilder.addInput(aIndices.asOutput()); opBuilder.addInput(aValues.asOutput()); opBuilder.addInput(aShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java index bc7eccb7dbf..35da11942be 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseSplit.java @@ -103,7 +103,7 @@ private SparseSplit(Operation operation) { ) public static SparseSplit create(Scope scope, Operand splitDim, Operand indices, Operand values, Operand shape, Long numSplit) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseSplit", scope.makeOpName("SparseSplit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseSplit")); opBuilder.addInput(splitDim.asOutput()); opBuilder.addInput(indices.asOutput()); opBuilder.addInput(values.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java index 3131109d49f..81261298396 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseAdd.java @@ -68,7 +68,7 @@ private SparseTensorDenseAdd(Operation operation) { ) public static SparseTensorDenseAdd create(Scope scope, Operand aIndices, Operand aValues, Operand aShape, Operand b) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorDenseAdd", scope.makeOpName("SparseTensorDenseAdd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorDenseAdd")); opBuilder.addInput(aIndices.asOutput()); opBuilder.addInput(aValues.asOutput()); opBuilder.addInput(aShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java index e11260f527e..4c89fcc00d9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseTensorDenseMatMul.java @@ -77,7 +77,7 @@ private SparseTensorDenseMatMul(Operation operation) { public static SparseTensorDenseMatMul create(Scope scope, Operand aIndices, Operand aValues, Operand aShape, Operand b, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorDenseMatMul", scope.makeOpName("SparseTensorDenseMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseTensorDenseMatMul")); opBuilder.addInput(aIndices.asOutput()); opBuilder.addInput(aValues.asOutput()); opBuilder.addInput(aShape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java index 559fe3b7819..6d24b010ace 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToDense.java @@ -88,7 +88,7 @@ private SparseToDense(Operation operation) { public static SparseToDense create(Scope scope, Operand sparseIndices, Operand outputShape, Operand sparseValues, Operand defaultValue, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseToDense", scope.makeOpName("SparseToDense")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseToDense")); opBuilder.addInput(sparseIndices.asOutput()); opBuilder.addInput(outputShape.asOutput()); opBuilder.addInput(sparseValues.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java index 8e1ee3ffd54..ac968d5dce7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/SparseToSparseSetOperation.java @@ -104,7 +104,7 @@ public static SparseToSparseSetOperation create(Scope scope Operand set1Indices, Operand set1Values, Operand set1Shape, Operand set2Indices, Operand set2Values, Operand set2Shape, String setOperation, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseToSparseSetOperation", scope.makeOpName("SparseToSparseSetOperation")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseToSparseSetOperation")); opBuilder.addInput(set1Indices.asOutput()); opBuilder.addInput(set1Values.asOutput()); opBuilder.addInput(set1Shape.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java index 92a51d8e3c3..bc913bd875d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/sparse/TakeManySparseFromTensorsMap.java @@ -114,7 +114,7 @@ private TakeManySparseFromTensorsMap(Operation operation) { ) public static TakeManySparseFromTensorsMap create(Scope scope, Operand sparseHandles, Class dtype, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TakeManySparseFromTensorsMap", scope.makeOpName("TakeManySparseFromTensorsMap")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TakeManySparseFromTensorsMap")); opBuilder.addInput(sparseHandles.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java index 8e0f658be2a..a654b7428b9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Join.java @@ -73,7 +73,7 @@ private Join(Operation operation) { describeByClass = true ) public static Join create(Scope scope, Iterable> inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StringJoin", scope.makeOpName("Join")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Join")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java index aca6e8ed033..e3e322c9a22 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Lower.java @@ -68,7 +68,7 @@ private Lower(Operation operation) { describeByClass = true ) public static Lower create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StringLower", scope.makeOpName("Lower")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Lower")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java index f468b2937bc..b7d16e40739 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ReduceJoin.java @@ -85,7 +85,7 @@ private ReduceJoin(Operation operation) { ) public static ReduceJoin create(Scope scope, Operand inputs, Operand reductionIndices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ReduceJoin", scope.makeOpName("ReduceJoin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReduceJoin")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(reductionIndices.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java index 91f0c94c7cd..e12d78a14fe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexFullMatch.java @@ -77,7 +77,7 @@ private RegexFullMatch(Operation operation) { ) public static RegexFullMatch create(Scope scope, Operand input, Operand pattern) { - OperationBuilder opBuilder = scope.env().opBuilder("RegexFullMatch", scope.makeOpName("RegexFullMatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RegexFullMatch")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(pattern.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java index c87bdc150fc..f3c822e6665 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/RegexReplace.java @@ -65,7 +65,7 @@ private RegexReplace(Operation operation) { ) public static RegexReplace create(Scope scope, Operand input, Operand pattern, Operand rewrite, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RegexReplace", scope.makeOpName("RegexReplace")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RegexReplace")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(pattern.asOutput()); opBuilder.addInput(rewrite.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java index e54ef367f2c..02380fe50d7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexFullMatch.java @@ -61,7 +61,7 @@ private StaticRegexFullMatch(Operation operation) { describeByClass = true ) public static StaticRegexFullMatch create(Scope scope, Operand input, String pattern) { - OperationBuilder opBuilder = scope.env().opBuilder("StaticRegexFullMatch", scope.makeOpName("StaticRegexFullMatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StaticRegexFullMatch")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("pattern", pattern); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java index 230d9da7e8e..30d9eea653f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StaticRegexReplace.java @@ -59,7 +59,7 @@ private StaticRegexReplace(Operation operation) { ) public static StaticRegexReplace create(Scope scope, Operand input, String pattern, String rewrite, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StaticRegexReplace", scope.makeOpName("StaticRegexReplace")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StaticRegexReplace")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("pattern", pattern); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java index 14df380f308..22de96a3b4f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringFormat.java @@ -61,7 +61,7 @@ private StringFormat(Operation operation) { describeByClass = true ) public static StringFormat create(Scope scope, Iterable> inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StringFormat", scope.makeOpName("StringFormat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringFormat")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java index 39f5a62c604..5f2984ffcd4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringLength.java @@ -72,7 +72,7 @@ private StringLength(Operation operation) { describeByClass = true ) public static StringLength create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StringLength", scope.makeOpName("StringLength")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringLength")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java index ee33d1cd20f..5c8b8d5142d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringNGrams.java @@ -84,7 +84,7 @@ private StringNGrams(Operation operation) { public static StringNGrams create(Scope scope, Operand data, Operand dataSplits, String separator, List ngramWidths, String leftPad, String rightPad, Long padWidth, Boolean preserveShortSequences) { - OperationBuilder opBuilder = scope.env().opBuilder("StringNGrams", scope.makeOpName("StringNGrams")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringNGrams")); opBuilder.addInput(data.asOutput()); opBuilder.addInput(dataSplits.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java index 1edadbaa03d..cf3975f9db5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/StringSplit.java @@ -89,7 +89,7 @@ private StringSplit(Operation operation) { ) public static StringSplit create(Scope scope, Operand input, Operand sep, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StringSplitV2", scope.makeOpName("StringSplit")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StringSplit")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(sep.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java index 3506f8f0329..6cfd6d3ab58 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Strip.java @@ -58,7 +58,7 @@ private Strip(Operation operation) { describeByClass = true ) public static Strip create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("StringStrip", scope.makeOpName("Strip")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Strip")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Strip(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java index a1562de32bf..4cad2a56b3a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Substr.java @@ -131,7 +131,7 @@ private Substr(Operation operation) { ) public static Substr create(Scope scope, Operand input, Operand pos, Operand len, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Substr", scope.makeOpName("Substr")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Substr")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(pos.asOutput()); opBuilder.addInput(len.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java index 484de33eb41..02e3d2455a9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucket.java @@ -65,7 +65,7 @@ private ToHashBucket(Operation operation) { describeByClass = true ) public static ToHashBucket create(Scope scope, Operand stringTensor, Long numBuckets) { - OperationBuilder opBuilder = scope.env().opBuilder("StringToHashBucket", scope.makeOpName("ToHashBucket")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToHashBucket")); opBuilder.addInput(stringTensor.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_buckets", numBuckets); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java index 7f5c34dcef0..baa4b880028 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketFast.java @@ -75,7 +75,7 @@ private ToHashBucketFast(Operation operation) { describeByClass = true ) public static ToHashBucketFast create(Scope scope, Operand input, Long numBuckets) { - OperationBuilder opBuilder = scope.env().opBuilder("StringToHashBucketFast", scope.makeOpName("ToHashBucketFast")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToHashBucketFast")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_buckets", numBuckets); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java index ad02539dce0..93f3ba45fab 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToHashBucketStrong.java @@ -84,7 +84,7 @@ private ToHashBucketStrong(Operation operation) { ) public static ToHashBucketStrong create(Scope scope, Operand input, Long numBuckets, List key) { - OperationBuilder opBuilder = scope.env().opBuilder("StringToHashBucketStrong", scope.makeOpName("ToHashBucketStrong")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToHashBucketStrong")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_buckets", numBuckets); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java index 8c1fb9d77fd..76eb22c44d1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/ToNumber.java @@ -78,7 +78,7 @@ private ToNumber(Operation operation) { ) public static ToNumber create(Scope scope, Operand stringTensor, Class outType) { - OperationBuilder opBuilder = scope.env().opBuilder("StringToNumber", scope.makeOpName("ToNumber")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ToNumber")); opBuilder.addInput(stringTensor.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("out_type", Operands.toDataType(outType)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java index 04854c17c67..aace664a5f4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecode.java @@ -83,7 +83,7 @@ private UnicodeDecode(Operation operation) { ) public static UnicodeDecode create(Scope scope, Operand input, String inputEncoding, Class Tsplits, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UnicodeDecode", scope.makeOpName("UnicodeDecode")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeDecode")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("input_encoding", inputEncoding); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java index dd0911027d2..c852eefe39f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeDecodeWithOffsets.java @@ -90,7 +90,7 @@ private UnicodeDecodeWithOffsets(Operation operation) { ) public static UnicodeDecodeWithOffsets create(Scope scope, Operand input, String inputEncoding, Class Tsplits, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UnicodeDecodeWithOffsets", scope.makeOpName("UnicodeDecodeWithOffsets")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeDecodeWithOffsets")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("input_encoding", inputEncoding); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java index 6b10afd7927..e6c9682af5f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeEncode.java @@ -74,7 +74,7 @@ private UnicodeEncode(Operation operation) { ) public static UnicodeEncode create(Scope scope, Operand inputValues, Operand inputSplits, String outputEncoding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UnicodeEncode", scope.makeOpName("UnicodeEncode")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeEncode")); opBuilder.addInput(inputValues.asOutput()); opBuilder.addInput(inputSplits.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java index 7a2d6456e15..c700724b2f7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeScript.java @@ -77,7 +77,7 @@ private UnicodeScript(Operation operation) { describeByClass = true ) public static UnicodeScript create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("UnicodeScript", scope.makeOpName("UnicodeScript")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeScript")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new UnicodeScript(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java index eea9ba6cfcd..6a296716025 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnicodeTranscode.java @@ -99,7 +99,7 @@ private UnicodeTranscode(Operation operation) { ) public static UnicodeTranscode create(Scope scope, Operand input, String inputEncoding, String outputEncoding, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UnicodeTranscode", scope.makeOpName("UnicodeTranscode")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnicodeTranscode")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("input_encoding", inputEncoding); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java index 27fd7951863..1a756c7c70b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/UnsortedSegmentJoin.java @@ -89,7 +89,7 @@ private UnsortedSegmentJoin(Operation operation) { public static UnsortedSegmentJoin create(Scope scope, Operand inputs, Operand segmentIds, Operand numSegments, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentJoin", scope.makeOpName("UnsortedSegmentJoin")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("UnsortedSegmentJoin")); opBuilder.addInput(inputs.asOutput()); opBuilder.addInput(segmentIds.asOutput()); opBuilder.addInput(numSegments.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java index f25344e697d..b92a1b2c23d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/strings/Upper.java @@ -68,7 +68,7 @@ private Upper(Operation operation) { describeByClass = true ) public static Upper create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("StringUpper", scope.makeOpName("Upper")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Upper")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java index d5642d0fac6..0bfef4f10d8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/AudioSummary.java @@ -73,7 +73,7 @@ private AudioSummary(Operation operation) { ) public static AudioSummary create(Scope scope, Operand tag, Operand tensor, Operand sampleRate, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("AudioSummaryV2", scope.makeOpName("AudioSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AudioSummary")); opBuilder.addInput(tag.asOutput()); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(sampleRate.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java index f9a3abf4ad0..607d303ca66 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CloseSummaryWriter.java @@ -49,7 +49,7 @@ private CloseSummaryWriter(Operation operation) { describeByClass = true ) public static CloseSummaryWriter create(Scope scope, Operand writer) { - OperationBuilder opBuilder = scope.env().opBuilder("CloseSummaryWriter", scope.makeOpName("CloseSummaryWriter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CloseSummaryWriter")); opBuilder.addInput(writer.asOutput()); opBuilder = scope.apply(opBuilder); return new CloseSummaryWriter(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java index b8af67b0fd7..d65c5be39c6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryDbWriter.java @@ -56,7 +56,7 @@ private CreateSummaryDbWriter(Operation operation) { public static CreateSummaryDbWriter create(Scope scope, Operand writer, Operand dbUri, Operand experimentName, Operand runName, Operand userName) { - OperationBuilder opBuilder = scope.env().opBuilder("CreateSummaryDbWriter", scope.makeOpName("CreateSummaryDbWriter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CreateSummaryDbWriter")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(dbUri.asOutput()); opBuilder.addInput(experimentName.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java index bea08375663..12624b660bd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/CreateSummaryFileWriter.java @@ -57,7 +57,7 @@ private CreateSummaryFileWriter(Operation operation) { public static CreateSummaryFileWriter create(Scope scope, Operand writer, Operand logdir, Operand maxQueue, Operand flushMillis, Operand filenameSuffix) { - OperationBuilder opBuilder = scope.env().opBuilder("CreateSummaryFileWriter", scope.makeOpName("CreateSummaryFileWriter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CreateSummaryFileWriter")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(logdir.asOutput()); opBuilder.addInput(maxQueue.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java index c939ad76457..f84a9a7eb4e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/FlushSummaryWriter.java @@ -49,7 +49,7 @@ private FlushSummaryWriter(Operation operation) { describeByClass = true ) public static FlushSummaryWriter create(Scope scope, Operand writer) { - OperationBuilder opBuilder = scope.env().opBuilder("FlushSummaryWriter", scope.makeOpName("FlushSummaryWriter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("FlushSummaryWriter")); opBuilder.addInput(writer.asOutput()); opBuilder = scope.apply(opBuilder); return new FlushSummaryWriter(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java index 118292c93aa..c9ecf68ef74 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/HistogramSummary.java @@ -65,7 +65,7 @@ private HistogramSummary(Operation operation) { ) public static HistogramSummary create(Scope scope, Operand tag, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("HistogramSummary", scope.makeOpName("HistogramSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("HistogramSummary")); opBuilder.addInput(tag.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java index deba3e6cf00..468a708ed83 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImageSummary.java @@ -99,7 +99,7 @@ private ImageSummary(Operation operation) { ) public static ImageSummary create(Scope scope, Operand tag, Operand tensor, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ImageSummary", scope.makeOpName("ImageSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImageSummary")); opBuilder.addInput(tag.asOutput()); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java index 8b2e7a46176..0ad13d03818 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ImportEvent.java @@ -52,7 +52,7 @@ private ImportEvent(Operation operation) { ) public static ImportEvent create(Scope scope, Operand writer, Operand event) { - OperationBuilder opBuilder = scope.env().opBuilder("ImportEvent", scope.makeOpName("ImportEvent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ImportEvent")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(event.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java index f20f1b14f5c..ac2517267d0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/MergeSummary.java @@ -66,7 +66,7 @@ private MergeSummary(Operation operation) { describeByClass = true ) public static MergeSummary create(Scope scope, Iterable> inputs) { - OperationBuilder opBuilder = scope.env().opBuilder("MergeSummary", scope.makeOpName("MergeSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MergeSummary")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); return new MergeSummary(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java index 6f697366e74..80c065a4e5f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/ScalarSummary.java @@ -63,7 +63,7 @@ private ScalarSummary(Operation operation) { ) public static ScalarSummary create(Scope scope, Operand tags, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("ScalarSummary", scope.makeOpName("ScalarSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ScalarSummary")); opBuilder.addInput(tags.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java index c60f467b0d4..4a60bfc3b67 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/StatsAggregatorSummary.java @@ -55,7 +55,7 @@ private StatsAggregatorSummary(Operation operation) { describeByClass = true ) public static StatsAggregatorSummary create(Scope scope, Operand iterator) { - OperationBuilder opBuilder = scope.env().opBuilder("StatsAggregatorSummary", scope.makeOpName("StatsAggregatorSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("StatsAggregatorSummary")); opBuilder.addInput(iterator.asOutput()); opBuilder = scope.apply(opBuilder); return new StatsAggregatorSummary(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java index 98832a74fbf..7a96cfb9d61 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/SummaryWriter.java @@ -55,7 +55,7 @@ private SummaryWriter(Operation operation) { describeByClass = true ) public static SummaryWriter create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SummaryWriter", scope.makeOpName("SummaryWriter")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SummaryWriter")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java index 3b46aa41fb6..7c303f23449 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/TensorSummary.java @@ -63,7 +63,7 @@ private TensorSummary(Operation operation) { ) public static TensorSummary create(Scope scope, Operand tag, Operand tensor, Operand serializedSummaryMetadata) { - OperationBuilder opBuilder = scope.env().opBuilder("TensorSummaryV2", scope.makeOpName("TensorSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TensorSummary")); opBuilder.addInput(tag.asOutput()); opBuilder.addInput(tensor.asOutput()); opBuilder.addInput(serializedSummaryMetadata.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java index 19dac002652..34c5c37773b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteAudioSummary.java @@ -61,7 +61,7 @@ private WriteAudioSummary(Operation operation) { public static WriteAudioSummary create(Scope scope, Operand writer, Operand step, Operand tag, Operand tensor, Operand sampleRate, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteAudioSummary", scope.makeOpName("WriteAudioSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteAudioSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java index 8cfb7b8142e..039430491ad 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteGraphSummary.java @@ -55,7 +55,7 @@ private WriteGraphSummary(Operation operation) { ) public static WriteGraphSummary create(Scope scope, Operand writer, Operand step, Operand tensor) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteGraphSummary", scope.makeOpName("WriteGraphSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteGraphSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tensor.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java index 6ec7407312c..19a50b23491 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteHistogramSummary.java @@ -57,7 +57,7 @@ private WriteHistogramSummary(Operation operation) { ) public static WriteHistogramSummary create(Scope scope, Operand writer, Operand step, Operand tag, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteHistogramSummary", scope.makeOpName("WriteHistogramSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteHistogramSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java index 09cf9aeeb03..1f00bdaa30c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteImageSummary.java @@ -62,7 +62,7 @@ private WriteImageSummary(Operation operation) { public static WriteImageSummary create(Scope scope, Operand writer, Operand step, Operand tag, Operand tensor, Operand badColor, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteImageSummary", scope.makeOpName("WriteImageSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteImageSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java index 6d63c1f6125..21d7c92bb5c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteRawProtoSummary.java @@ -55,7 +55,7 @@ private WriteRawProtoSummary(Operation operation) { ) public static WriteRawProtoSummary create(Scope scope, Operand writer, Operand step, Operand tensor) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteRawProtoSummary", scope.makeOpName("WriteRawProtoSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteRawProtoSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tensor.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java index ef4c70ad165..2721b1b1f9a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteScalarSummary.java @@ -57,7 +57,7 @@ private WriteScalarSummary(Operation operation) { ) public static WriteScalarSummary create(Scope scope, Operand writer, Operand step, Operand tag, Operand value) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteScalarSummary", scope.makeOpName("WriteScalarSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteScalarSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tag.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java index 5ec67f7c2cc..be3a6ee4c9e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/summary/WriteSummary.java @@ -58,7 +58,7 @@ private WriteSummary(Operation operation) { public static WriteSummary create(Scope scope, Operand writer, Operand step, Operand tensor, Operand tag, Operand summaryMetadata) { - OperationBuilder opBuilder = scope.env().opBuilder("WriteSummary", scope.makeOpName("WriteSummary")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WriteSummary")); opBuilder.addInput(writer.asOutput()); opBuilder.addInput(step.asOutput()); opBuilder.addInput(tensor.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java index bbc6439c9a9..e43c65b899a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/AllToAll.java @@ -79,7 +79,7 @@ private AllToAll(Operation operation) { ) public static AllToAll create(Scope scope, Operand input, Operand groupAssignment, Long concatDimension, Long splitDimension, Long splitCount) { - OperationBuilder opBuilder = scope.env().opBuilder("AllToAll", scope.makeOpName("AllToAll")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AllToAll")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(groupAssignment.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java index a0a26ad01cc..12ff7ad72f6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CollectivePermute.java @@ -65,7 +65,7 @@ private CollectivePermute(Operation operation) { ) public static CollectivePermute create(Scope scope, Operand input, Operand sourceTargetPairs) { - OperationBuilder opBuilder = scope.env().opBuilder("CollectivePermute", scope.makeOpName("CollectivePermute")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CollectivePermute")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(sourceTargetPairs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java index 64eba9c5f65..5cf2ef9cf74 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompilationResult.java @@ -56,7 +56,7 @@ private CompilationResult(Operation operation) { describeByClass = true ) public static CompilationResult create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUCompilationResult", scope.makeOpName("CompilationResult")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompilationResult")); opBuilder = scope.apply(opBuilder); return new CompilationResult(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java index 1eea28d492e..b002f863531 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CompileSucceededAssert.java @@ -55,7 +55,7 @@ private CompileSucceededAssert(Operation operation) { describeByClass = true ) public static CompileSucceededAssert create(Scope scope, Operand compilationStatus) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUCompileSucceededAssert", scope.makeOpName("CompileSucceededAssert")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CompileSucceededAssert")); opBuilder.addInput(compilationStatus.asOutput()); opBuilder = scope.apply(opBuilder); return new CompileSucceededAssert(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java index 4f2c97ca5ad..0edbc20997b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureDistributedTPU.java @@ -54,7 +54,7 @@ private ConfigureDistributedTPU(Operation operation) { describeByClass = true ) public static ConfigureDistributedTPU create(Scope scope, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ConfigureDistributedTPU", scope.makeOpName("ConfigureDistributedTPU")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConfigureDistributedTPU")); opBuilder = scope.apply(opBuilder); if (options != null) { for (Options opts : options) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java index 485bd0a7ec7..8adbdbfca5d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ConfigureTPUEmbedding.java @@ -48,7 +48,7 @@ private ConfigureTPUEmbedding(Operation operation) { describeByClass = true ) public static ConfigureTPUEmbedding create(Scope scope, String config) { - OperationBuilder opBuilder = scope.env().opBuilder("ConfigureTPUEmbedding", scope.makeOpName("ConfigureTPUEmbedding")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConfigureTPUEmbedding")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("config", config); return new ConfigureTPUEmbedding(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java index 6ac49cfc2f3..f372af713b9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/CrossReplicaSum.java @@ -67,7 +67,7 @@ private CrossReplicaSum(Operation operation) { ) public static CrossReplicaSum create(Scope scope, Operand input, Operand groupAssignment) { - OperationBuilder opBuilder = scope.env().opBuilder("CrossReplicaSum", scope.makeOpName("CrossReplicaSum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("CrossReplicaSum")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(groupAssignment.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java index 664d1bb6d3f..f334ee32906 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EmbeddingActivations.java @@ -65,7 +65,7 @@ private EmbeddingActivations(Operation operation) { ) public static EmbeddingActivations create(Scope scope, Operand embeddingVariable, Operand slicedActivations, Long tableId, Long lookupId) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUEmbeddingActivations", scope.makeOpName("EmbeddingActivations")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EmbeddingActivations")); opBuilder.addInput(embeddingVariable.asOutput()); opBuilder.addInput(slicedActivations.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java index c7108ae1d94..5856d48053f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingIntegerBatch.java @@ -58,7 +58,7 @@ private EnqueueTPUEmbeddingIntegerBatch(Operation operation) { ) public static EnqueueTPUEmbeddingIntegerBatch create(Scope scope, Iterable> batch, Operand modeOverride, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingIntegerBatch", scope.makeOpName("EnqueueTPUEmbeddingIntegerBatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingIntegerBatch")); opBuilder.addInputList(Operands.asOutputs(batch)); opBuilder.addInput(modeOverride.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java index 7ad19e303bb..16db6381f07 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingRaggedTensorBatch.java @@ -83,7 +83,7 @@ public static EnqueueTPUEmbeddingRaggedTensorBatch create(Scope scope, Iterable> embeddingIndices, Iterable> aggregationWeights, Operand modeOverride, List tableIds, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingRaggedTensorBatch", scope.makeOpName("EnqueueTPUEmbeddingRaggedTensorBatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingRaggedTensorBatch")); opBuilder.addInputList(Operands.asOutputs(sampleSplits)); opBuilder.addInputList(Operands.asOutputs(embeddingIndices)); opBuilder.addInputList(Operands.asOutputs(aggregationWeights)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java index 2f33704b828..6c28d685060 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseBatch.java @@ -77,7 +77,7 @@ public static EnqueueTPUEmbeddingSparseBatch create(Scope scope, Iterable> embeddingIndices, Iterable> aggregationWeights, Operand modeOverride, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingSparseBatch", scope.makeOpName("EnqueueTPUEmbeddingSparseBatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingSparseBatch")); opBuilder.addInputList(Operands.asOutputs(sampleIndices)); opBuilder.addInputList(Operands.asOutputs(embeddingIndices)); opBuilder.addInputList(Operands.asOutputs(aggregationWeights)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java index 42f1a114864..0eb292670a2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/EnqueueTPUEmbeddingSparseTensorBatch.java @@ -81,7 +81,7 @@ public static EnqueueTPUEmbeddingSparseTensorBatch create(Scope scope, Iterable> embeddingIndices, Iterable> aggregationWeights, Operand modeOverride, List tableIds, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingSparseTensorBatch", scope.makeOpName("EnqueueTPUEmbeddingSparseTensorBatch")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("EnqueueTPUEmbeddingSparseTensorBatch")); opBuilder.addInputList(Operands.asOutputs(sampleIndices)); opBuilder.addInputList(Operands.asOutputs(embeddingIndices)); opBuilder.addInputList(Operands.asOutputs(aggregationWeights)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java index 6b19286c2a5..d1f340b993c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Execute.java @@ -70,7 +70,7 @@ private Execute(Operation operation) { ) public static Execute create(Scope scope, Iterable> args, Operand key, List> Tresults) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUExecute", scope.makeOpName("Execute")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Execute")); opBuilder.addInputList(Operands.asOutputs(args)); opBuilder.addInput(key.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java index 529aaca1b98..d5ead20179b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ExecuteAndUpdateVariables.java @@ -79,7 +79,7 @@ private ExecuteAndUpdateVariables(Operation operation) { public static ExecuteAndUpdateVariables create(Scope scope, Iterable> args, Operand key, List> Tresults, List deviceVarReadsIndices, List deviceVarUpdatesIndices) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUExecuteAndUpdateVariables", scope.makeOpName("ExecuteAndUpdateVariables")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ExecuteAndUpdateVariables")); opBuilder.addInputList(Operands.asOutputs(args)); opBuilder.addInput(key.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java index ae20158f41e..753afadb6d8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeue.java @@ -61,7 +61,7 @@ private InfeedDequeue(Operation operation) { ) public static InfeedDequeue create(Scope scope, Class dtype, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("InfeedDequeue", scope.makeOpName("InfeedDequeue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedDequeue")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java index 256cd8e687f..cc138f3e1fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedDequeueTuple.java @@ -64,7 +64,7 @@ private InfeedDequeueTuple(Operation operation) { ) public static InfeedDequeueTuple create(Scope scope, List> dtypes, List shapes) { - OperationBuilder opBuilder = scope.env().opBuilder("InfeedDequeueTuple", scope.makeOpName("InfeedDequeueTuple")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedDequeueTuple")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); Shape[] shapesArray = new Shape[shapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java index 059bcacccfe..8a578770116 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueue.java @@ -54,7 +54,7 @@ private InfeedEnqueue(Operation operation) { ) public static InfeedEnqueue create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueue", scope.makeOpName("InfeedEnqueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedEnqueue")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java index 6883770b646..ce94c83e3cc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueuePrelinearizedBuffer.java @@ -51,7 +51,7 @@ private InfeedEnqueuePrelinearizedBuffer(Operation operation) { ) public static InfeedEnqueuePrelinearizedBuffer create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueuePrelinearizedBuffer", scope.makeOpName("InfeedEnqueuePrelinearizedBuffer")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedEnqueuePrelinearizedBuffer")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java index d72e70b184e..498c1a56d37 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/InfeedEnqueueTuple.java @@ -55,7 +55,7 @@ private InfeedEnqueueTuple(Operation operation) { ) public static InfeedEnqueueTuple create(Scope scope, Iterable> inputs, List shapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueueTuple", scope.makeOpName("InfeedEnqueueTuple")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("InfeedEnqueueTuple")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); Shape[] shapesArray = new Shape[shapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java index 7a496e02efd..5abbb44190b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParameters.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingADAMParameters(Operation operation) { public static LoadTPUEmbeddingADAMParameters create(Scope scope, Operand parameters, Operand momenta, Operand velocities, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingADAMParameters", scope.makeOpName("LoadTPUEmbeddingADAMParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingADAMParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(momenta.asOutput()); opBuilder.addInput(velocities.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java index 98fd9566f14..6e22d829faf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingADAMParametersGradAccumDebug(Operation operation) { public static LoadTPUEmbeddingADAMParametersGradAccumDebug create(Scope scope, Operand parameters, Operand momenta, Operand velocities, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingADAMParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingADAMParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingADAMParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(momenta.asOutput()); opBuilder.addInput(velocities.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java index 4369c4feca6..98dd747d864 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingAdadeltaParameters(Operation operation) { public static LoadTPUEmbeddingAdadeltaParameters create(Scope scope, Operand parameters, Operand accumulators, Operand updates, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingAdadeltaParameters", scope.makeOpName("LoadTPUEmbeddingAdadeltaParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdadeltaParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java index 09fc85b0cec..be53836e037 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingAdadeltaParametersGradAccumDebug(Operation operation) { public static LoadTPUEmbeddingAdadeltaParametersGradAccumDebug create(Scope scope, Operand parameters, Operand accumulators, Operand updates, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingAdadeltaParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingAdadeltaParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdadeltaParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(updates.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java index 947c20df3a1..95108793139 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java @@ -59,7 +59,7 @@ private LoadTPUEmbeddingAdagradParameters(Operation operation) { ) public static LoadTPUEmbeddingAdagradParameters create(Scope scope, Operand parameters, Operand accumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingAdagradParameters", scope.makeOpName("LoadTPUEmbeddingAdagradParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdagradParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java index 1c3e783315c..3b995b8cb36 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingAdagradParametersGradAccumDebug(Operation operation) { public static LoadTPUEmbeddingAdagradParametersGradAccumDebug create(Scope scope, Operand parameters, Operand accumulators, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingAdagradParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingAdagradParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingAdagradParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(gradientAccumulators.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java index 5eb28d70048..9bbac55427b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingCenteredRMSPropParameters(Operation operation) { public static LoadTPUEmbeddingCenteredRMSPropParameters create(Scope scope, Operand parameters, Operand ms, Operand mom, Operand mg, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingCenteredRMSPropParameters", scope.makeOpName("LoadTPUEmbeddingCenteredRMSPropParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingCenteredRMSPropParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java index 2716c7a612a..ea3aa91041b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingFTRLParameters(Operation operation) { public static LoadTPUEmbeddingFTRLParameters create(Scope scope, Operand parameters, Operand accumulators, Operand linears, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingFTRLParameters", scope.makeOpName("LoadTPUEmbeddingFTRLParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFTRLParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(linears.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java index f192a59158b..ea9b4e6b4c3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingFTRLParametersGradAccumDebug(Operation operation) { public static LoadTPUEmbeddingFTRLParametersGradAccumDebug create(Scope scope, Operand parameters, Operand accumulators, Operand linears, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingFTRLParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingFTRLParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingFTRLParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(linears.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java index faa63392307..f4516f0b19a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingMDLAdagradLightParameters(Operation operation) { public static LoadTPUEmbeddingMDLAdagradLightParameters create(Scope scope, Operand parameters, Operand accumulators, Operand weights, Operand benefits, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingMDLAdagradLightParameters", scope.makeOpName("LoadTPUEmbeddingMDLAdagradLightParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingMDLAdagradLightParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(weights.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java index 73a429740b8..370d5702a67 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java @@ -59,7 +59,7 @@ private LoadTPUEmbeddingMomentumParameters(Operation operation) { ) public static LoadTPUEmbeddingMomentumParameters create(Scope scope, Operand parameters, Operand momenta, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingMomentumParameters", scope.makeOpName("LoadTPUEmbeddingMomentumParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingMomentumParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(momenta.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java index fc53f223334..07d265b9bb0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingMomentumParametersGradAccumDebug(Operation operation) { public static LoadTPUEmbeddingMomentumParametersGradAccumDebug create(Scope scope, Operand parameters, Operand momenta, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingMomentumParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingMomentumParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingMomentumParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(momenta.asOutput()); opBuilder.addInput(gradientAccumulators.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java index ce4ce4ddb6a..0aff4832087 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java @@ -60,7 +60,7 @@ private LoadTPUEmbeddingProximalAdagradParameters(Operation operation) { public static LoadTPUEmbeddingProximalAdagradParameters create(Scope scope, Operand parameters, Operand accumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingProximalAdagradParameters", scope.makeOpName("LoadTPUEmbeddingProximalAdagradParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalAdagradParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java index 858ee5dbf0a..01a15d09e59 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug(Operation operat public static LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug create(Scope scope, Operand parameters, Operand accumulators, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(accumulators.asOutput()); opBuilder.addInput(gradientAccumulators.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java index 179616df417..40981674d7b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParameters.java @@ -56,7 +56,7 @@ private LoadTPUEmbeddingProximalYogiParameters(Operation operation) { public static LoadTPUEmbeddingProximalYogiParameters create(Scope scope, Operand parameters, Operand v, Operand m, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingProximalYogiParameters", scope.makeOpName("LoadTPUEmbeddingProximalYogiParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalYogiParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(v.asOutput()); opBuilder.addInput(m.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java index dc999e0b256..cd9dbf74078 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalYogiParametersGradAccumDebug.java @@ -57,7 +57,7 @@ private LoadTPUEmbeddingProximalYogiParametersGradAccumDebug(Operation operation public static LoadTPUEmbeddingProximalYogiParametersGradAccumDebug create(Scope scope, Operand parameters, Operand v, Operand m, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingProximalYogiParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingProximalYogiParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingProximalYogiParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(v.asOutput()); opBuilder.addInput(m.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java index 98492be993a..b3fca976f57 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java @@ -61,7 +61,7 @@ private LoadTPUEmbeddingRMSPropParameters(Operation operation) { public static LoadTPUEmbeddingRMSPropParameters create(Scope scope, Operand parameters, Operand ms, Operand mom, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingRMSPropParameters", scope.makeOpName("LoadTPUEmbeddingRMSPropParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingRMSPropParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java index a610de483b1..60c13d0163d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java @@ -62,7 +62,7 @@ private LoadTPUEmbeddingRMSPropParametersGradAccumDebug(Operation operation) { public static LoadTPUEmbeddingRMSPropParametersGradAccumDebug create(Scope scope, Operand parameters, Operand ms, Operand mom, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingRMSPropParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingRMSPropParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingRMSPropParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java index 98edf6c04da..362186da66d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java @@ -58,7 +58,7 @@ private LoadTPUEmbeddingStochasticGradientDescentParameters(Operation operation) ) public static LoadTPUEmbeddingStochasticGradientDescentParameters create(Scope scope, Operand parameters, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingStochasticGradientDescentParameters", scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParameters")); opBuilder.addInput(parameters.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java index ec195d07ca1..e43d7866f75 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java @@ -60,7 +60,7 @@ private LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug(Operat public static LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug create( Scope scope, Operand parameters, Operand gradientAccumulators, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug", scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug")); opBuilder.addInput(parameters.asOutput()); opBuilder.addInput(gradientAccumulators.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java index a3b286fd850..e47274b97f5 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OrdinalSelector.java @@ -56,7 +56,7 @@ private OrdinalSelector(Operation operation) { describeByClass = true ) public static OrdinalSelector create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUOrdinalSelector", scope.makeOpName("OrdinalSelector")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OrdinalSelector")); opBuilder = scope.apply(opBuilder); return new OrdinalSelector(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java index a2aab40fad4..691d6030e01 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java @@ -63,7 +63,7 @@ private OutfeedDequeue(Operation operation) { ) public static OutfeedDequeue create(Scope scope, Class dtype, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OutfeedDequeue", scope.makeOpName("OutfeedDequeue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeue")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java index 51ece781c08..cfcf0a470d3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTuple.java @@ -67,7 +67,7 @@ private OutfeedDequeueTuple(Operation operation) { ) public static OutfeedDequeueTuple create(Scope scope, List> dtypes, List shapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("OutfeedDequeueTuple", scope.makeOpName("OutfeedDequeueTuple")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeueTuple")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); Shape[] shapesArray = new Shape[shapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java index e6e5f3dfaf4..b83a2d2989d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueTupleV2.java @@ -71,7 +71,7 @@ private OutfeedDequeueTupleV2(Operation operation) { ) public static OutfeedDequeueTupleV2 create(Scope scope, Operand deviceOrdinal, List> dtypes, List shapes) { - OperationBuilder opBuilder = scope.env().opBuilder("OutfeedDequeueTupleV2", scope.makeOpName("OutfeedDequeueTupleV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeueTupleV2")); opBuilder.addInput(deviceOrdinal.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtypes", Operands.toDataTypes(dtypes)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java index 1f176f35da8..71b6be5fa75 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeueV2.java @@ -67,7 +67,7 @@ private OutfeedDequeueV2(Operation operation) { ) public static OutfeedDequeueV2 create(Scope scope, Operand deviceOrdinal, Class dtype, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("OutfeedDequeueV2", scope.makeOpName("OutfeedDequeueV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedDequeueV2")); opBuilder.addInput(deviceOrdinal.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java index 0f418ed124b..0563d432c56 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueue.java @@ -49,7 +49,7 @@ private OutfeedEnqueue(Operation operation) { describeByClass = true ) public static OutfeedEnqueue create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("OutfeedEnqueue", scope.makeOpName("OutfeedEnqueue")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedEnqueue")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new OutfeedEnqueue(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java index e5d407a6560..f8cb68f203e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedEnqueueTuple.java @@ -50,7 +50,7 @@ private OutfeedEnqueueTuple(Operation operation) { describeByClass = true ) public static OutfeedEnqueueTuple create(Scope scope, Iterable> inputs) { - OperationBuilder opBuilder = scope.env().opBuilder("OutfeedEnqueueTuple", scope.makeOpName("OutfeedEnqueueTuple")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("OutfeedEnqueueTuple")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); return new OutfeedEnqueueTuple(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java index 4ecdd4eac74..1ccb4ee19a6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedInput.java @@ -64,7 +64,7 @@ private PartitionedInput(Operation operation) { ) public static PartitionedInput create(Scope scope, Iterable> inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUPartitionedInput", scope.makeOpName("PartitionedInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PartitionedInput")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java index 3211bcd3faf..425a009730a 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PartitionedOutput.java @@ -71,7 +71,7 @@ private PartitionedOutput(Operation operation) { ) public static PartitionedOutput create(Scope scope, Operand inputs, Long numSplits, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUPartitionedOutput", scope.makeOpName("PartitionedOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PartitionedOutput")); opBuilder.addInput(inputs.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_splits", numSplits); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java index 473b898697d..70d1fa85507 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/Prelinearize.java @@ -60,7 +60,7 @@ private Prelinearize(Operation operation) { ) public static Prelinearize create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("Prelinearize", scope.makeOpName("Prelinearize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Prelinearize")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java index f8d5b308265..1d4c3fd6e34 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/PrelinearizeTuple.java @@ -62,7 +62,7 @@ private PrelinearizeTuple(Operation operation) { ) public static PrelinearizeTuple create(Scope scope, Iterable> inputs, List shapes, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PrelinearizeTuple", scope.makeOpName("PrelinearizeTuple")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PrelinearizeTuple")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); Shape[] shapesArray = new Shape[shapes.size()]; diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java index 059ea15ff30..9605e67d8b8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RecvTPUEmbeddingActivations.java @@ -68,7 +68,7 @@ private RecvTPUEmbeddingActivations(Operation operation) { describeByClass = true ) public static RecvTPUEmbeddingActivations create(Scope scope, Long numOutputs, String config) { - OperationBuilder opBuilder = scope.env().opBuilder("RecvTPUEmbeddingActivations", scope.makeOpName("RecvTPUEmbeddingActivations")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RecvTPUEmbeddingActivations")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_outputs", numOutputs); opBuilder.setAttr("config", config); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java index 06d5c6a8ce8..7f9f50de1da 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicateMetadata.java @@ -51,7 +51,7 @@ private ReplicateMetadata(Operation operation) { describeByClass = true ) public static ReplicateMetadata create(Scope scope, Long numReplicas, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicateMetadata", scope.makeOpName("ReplicateMetadata")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicateMetadata")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_replicas", numReplicas); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java index e581ecf060d..45ef66fe475 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedInput.java @@ -70,7 +70,7 @@ private ReplicatedInput(Operation operation) { ) public static ReplicatedInput create(Scope scope, Iterable> inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicatedInput", scope.makeOpName("ReplicatedInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicatedInput")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java index 53cbf8b412e..18030fbc955 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ReplicatedOutput.java @@ -73,7 +73,7 @@ private ReplicatedOutput(Operation operation) { ) public static ReplicatedOutput create(Scope scope, Operand input, Long numReplicas) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicatedOutput", scope.makeOpName("ReplicatedOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicatedOutput")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_replicas", numReplicas); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java index acea126fd17..6ef132a4a6e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParameters.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingADAMParameters(Operation operation) { ) public static RetrieveTPUEmbeddingADAMParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingADAMParameters", scope.makeOpName("RetrieveTPUEmbeddingADAMParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingADAMParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java index ba381888271..6812e2c8a75 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingADAMParametersGradAccumDebug.java @@ -69,7 +69,7 @@ private RetrieveTPUEmbeddingADAMParametersGradAccumDebug(Operation operation) { ) public static RetrieveTPUEmbeddingADAMParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingADAMParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingADAMParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingADAMParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java index 17f05b8bd5e..2afc96e2677 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParameters.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingAdadeltaParameters(Operation operation) { ) public static RetrieveTPUEmbeddingAdadeltaParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingAdadeltaParameters", scope.makeOpName("RetrieveTPUEmbeddingAdadeltaParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdadeltaParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java index c96c22897c1..1a2bf517d4d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug.java @@ -69,7 +69,7 @@ private RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug(Operation operation ) public static RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdadeltaParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java index 1f7e6064936..07f0ce6cc67 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParameters.java @@ -63,7 +63,7 @@ private RetrieveTPUEmbeddingAdagradParameters(Operation operation) { ) public static RetrieveTPUEmbeddingAdagradParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingAdagradParameters", scope.makeOpName("RetrieveTPUEmbeddingAdagradParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdagradParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java index bec9e018904..71d118edab7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingAdagradParametersGradAccumDebug.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingAdagradParametersGradAccumDebug(Operation operation) ) public static RetrieveTPUEmbeddingAdagradParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingAdagradParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingAdagradParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingAdagradParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java index e5be5990a3a..02054dd4fd6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingCenteredRMSPropParameters.java @@ -69,7 +69,7 @@ private RetrieveTPUEmbeddingCenteredRMSPropParameters(Operation operation) { ) public static RetrieveTPUEmbeddingCenteredRMSPropParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingCenteredRMSPropParameters", scope.makeOpName("RetrieveTPUEmbeddingCenteredRMSPropParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingCenteredRMSPropParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java index 491e59bdc38..972f0531eb6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParameters.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingFTRLParameters(Operation operation) { ) public static RetrieveTPUEmbeddingFTRLParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingFTRLParameters", scope.makeOpName("RetrieveTPUEmbeddingFTRLParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFTRLParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java index 156e5e18788..2b8d87cba31 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingFTRLParametersGradAccumDebug.java @@ -69,7 +69,7 @@ private RetrieveTPUEmbeddingFTRLParametersGradAccumDebug(Operation operation) { ) public static RetrieveTPUEmbeddingFTRLParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingFTRLParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingFTRLParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingFTRLParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java index 5b23031e101..2909a342468 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMDLAdagradLightParameters.java @@ -69,7 +69,7 @@ private RetrieveTPUEmbeddingMDLAdagradLightParameters(Operation operation) { ) public static RetrieveTPUEmbeddingMDLAdagradLightParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingMDLAdagradLightParameters", scope.makeOpName("RetrieveTPUEmbeddingMDLAdagradLightParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingMDLAdagradLightParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java index ea7b81b8166..f7e9669168c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParameters.java @@ -63,7 +63,7 @@ private RetrieveTPUEmbeddingMomentumParameters(Operation operation) { ) public static RetrieveTPUEmbeddingMomentumParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingMomentumParameters", scope.makeOpName("RetrieveTPUEmbeddingMomentumParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingMomentumParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java index 444ecb16153..bfc04d550a4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingMomentumParametersGradAccumDebug.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingMomentumParametersGradAccumDebug(Operation operation ) public static RetrieveTPUEmbeddingMomentumParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingMomentumParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingMomentumParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingMomentumParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java index 15ac2e4bbc4..ca4c8a6e2f8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParameters.java @@ -63,7 +63,7 @@ private RetrieveTPUEmbeddingProximalAdagradParameters(Operation operation) { ) public static RetrieveTPUEmbeddingProximalAdagradParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingProximalAdagradParameters", scope.makeOpName("RetrieveTPUEmbeddingProximalAdagradParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalAdagradParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java index bbf763d123e..4caa040b0d0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug(Operation op ) public static RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalAdagradParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java index 46c27514430..b9ae4dfcaf3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParameters.java @@ -62,7 +62,7 @@ private RetrieveTPUEmbeddingProximalYogiParameters(Operation operation) { ) public static RetrieveTPUEmbeddingProximalYogiParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingProximalYogiParameters", scope.makeOpName("RetrieveTPUEmbeddingProximalYogiParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalYogiParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java index c3b827522d4..09e2a534790 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug.java @@ -65,7 +65,7 @@ private RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug(Operation opera ) public static RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingProximalYogiParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java index bcad29d5d9e..ff79ff6fc51 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParameters.java @@ -66,7 +66,7 @@ private RetrieveTPUEmbeddingRMSPropParameters(Operation operation) { ) public static RetrieveTPUEmbeddingRMSPropParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingRMSPropParameters", scope.makeOpName("RetrieveTPUEmbeddingRMSPropParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingRMSPropParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java index b3e83f8ab13..6d7af19a075 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug.java @@ -69,7 +69,7 @@ private RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug(Operation operation) ) public static RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingRMSPropParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java index 71ae453a189..64d953b3695 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParameters.java @@ -61,7 +61,7 @@ private RetrieveTPUEmbeddingStochasticGradientDescentParameters(Operation operat ) public static RetrieveTPUEmbeddingStochasticGradientDescentParameters create(Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingStochasticGradientDescentParameters", scope.makeOpName("RetrieveTPUEmbeddingStochasticGradientDescentParameters")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingStochasticGradientDescentParameters")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java index 95a4620110d..ee38afd6690 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug.java @@ -64,7 +64,7 @@ private RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug( ) public static RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug create( Scope scope, Long numShards, Long shardId, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug", scope.makeOpName("RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RetrieveTPUEmbeddingStochasticGradientDescentParametersGradAccumDebug")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_shards", numShards); opBuilder.setAttr("shard_id", shardId); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java index dd2d1fa6992..1c8ba14034d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/SendTPUEmbeddingGradients.java @@ -64,7 +64,7 @@ private SendTPUEmbeddingGradients(Operation operation) { ) public static SendTPUEmbeddingGradients create(Scope scope, Iterable> inputs, Iterable> learningRates, String config, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SendTPUEmbeddingGradients", scope.makeOpName("SendTPUEmbeddingGradients")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SendTPUEmbeddingGradients")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder.addInputList(Operands.asOutputs(learningRates)); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java index c710c9617e6..843e31349b4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/ShutdownDistributedTPU.java @@ -47,7 +47,7 @@ private ShutdownDistributedTPU(Operation operation) { describeByClass = true ) public static ShutdownDistributedTPU create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("ShutdownDistributedTPU", scope.makeOpName("ShutdownDistributedTPU")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ShutdownDistributedTPU")); opBuilder = scope.apply(opBuilder); return new ShutdownDistributedTPU(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java index 760196069c4..1d83fb87d7e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUCompilationResult.java @@ -59,7 +59,7 @@ private TPUCompilationResult(Operation operation) { describeByClass = true ) public static TPUCompilationResult create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUCompilationResult", scope.makeOpName("TPUCompilationResult")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUCompilationResult")); opBuilder = scope.apply(opBuilder); return new TPUCompilationResult(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java index 21b7820aca7..f30c3ecb796 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUEmbeddingActivations.java @@ -68,7 +68,7 @@ private TPUEmbeddingActivations(Operation operation) { ) public static TPUEmbeddingActivations create(Scope scope, Operand embeddingVariable, Operand slicedActivations, Long tableId, Long lookupId) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUEmbeddingActivations", scope.makeOpName("TPUEmbeddingActivations")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUEmbeddingActivations")); opBuilder.addInput(embeddingVariable.asOutput()); opBuilder.addInput(slicedActivations.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java index fd9853a0e28..9baebd25a0b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicateMetadata.java @@ -54,7 +54,7 @@ private TPUReplicateMetadata(Operation operation) { describeByClass = true ) public static TPUReplicateMetadata create(Scope scope, Long numReplicas, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicateMetadata", scope.makeOpName("TPUReplicateMetadata")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReplicateMetadata")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_replicas", numReplicas); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java index 2480ab6c427..193aefad52c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedInput.java @@ -73,7 +73,7 @@ private TPUReplicatedInput(Operation operation) { ) public static TPUReplicatedInput create(Scope scope, Iterable> inputs, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicatedInput", scope.makeOpName("TPUReplicatedInput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReplicatedInput")); opBuilder.addInputList(Operands.asOutputs(inputs)); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java index 7c2ab316647..45ded441fa6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReplicatedOutput.java @@ -76,7 +76,7 @@ private TPUReplicatedOutput(Operation operation) { ) public static TPUReplicatedOutput create(Scope scope, Operand input, Long numReplicas) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicatedOutput", scope.makeOpName("TPUReplicatedOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReplicatedOutput")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("num_replicas", numReplicas); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java index 55f908d985b..77e2ec5ee98 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUReshardVariables.java @@ -59,7 +59,7 @@ private TPUReshardVariables(Operation operation) { ) public static TPUReshardVariables create(Scope scope, Iterable> vars, Operand newFormatKey, Operand formatStateVar) { - OperationBuilder opBuilder = scope.env().opBuilder("TPUReshardVariables", scope.makeOpName("TPUReshardVariables")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TPUReshardVariables")); opBuilder.addInputList(Operands.asOutputs(vars)); opBuilder.addInput(newFormatKey.asOutput()); opBuilder.addInput(formatStateVar.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java index 37657c395dd..8f5f20fb9bb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/WorkerHeartbeat.java @@ -56,7 +56,7 @@ private WorkerHeartbeat(Operation operation) { describeByClass = true ) public static WorkerHeartbeat create(Scope scope, Operand request) { - OperationBuilder opBuilder = scope.env().opBuilder("WorkerHeartbeat", scope.makeOpName("WorkerHeartbeat")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("WorkerHeartbeat")); opBuilder.addInput(request.asOutput()); opBuilder = scope.apply(opBuilder); return new WorkerHeartbeat(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java index a8e61a8ae00..9e6e97c2368 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorApplyGradient.java @@ -59,7 +59,7 @@ private AccumulatorApplyGradient(Operation operation) { ) public static AccumulatorApplyGradient create(Scope scope, Operand handle, Operand localStep, Operand gradient) { - OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorApplyGradient", scope.makeOpName("AccumulatorApplyGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorApplyGradient")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(localStep.asOutput()); opBuilder.addInput(gradient.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java index 9accba8bb08..7eb2131fe46 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorNumAccumulated.java @@ -59,7 +59,7 @@ private AccumulatorNumAccumulated(Operation operation) { describeByClass = true ) public static AccumulatorNumAccumulated create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorNumAccumulated", scope.makeOpName("AccumulatorNumAccumulated")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorNumAccumulated")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new AccumulatorNumAccumulated(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java index a8ea01bf654..a15cb032c33 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorSetGlobalStep.java @@ -58,7 +58,7 @@ private AccumulatorSetGlobalStep(Operation operation) { ) public static AccumulatorSetGlobalStep create(Scope scope, Operand handle, Operand newGlobalStep) { - OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorSetGlobalStep", scope.makeOpName("AccumulatorSetGlobalStep")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorSetGlobalStep")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(newGlobalStep.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java index b34ca228cbe..8ef2930e5a6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/AccumulatorTakeGradient.java @@ -73,7 +73,7 @@ private AccumulatorTakeGradient(Operation operation) { ) public static AccumulatorTakeGradient create(Scope scope, Operand handle, Operand numRequired, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorTakeGradient", scope.makeOpName("AccumulatorTakeGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("AccumulatorTakeGradient")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(numRequired.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java index 2456c6bdef6..eb480cc02cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdaMax.java @@ -71,7 +71,7 @@ private ApplyAdaMax(Operation operation) { public static ApplyAdaMax create(Scope scope, Operand var, Operand m, Operand v, Operand beta1Power, Operand lr, Operand beta1, Operand beta2, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAdaMax", scope.makeOpName("ApplyAdaMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdaMax")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java index 5148311bfac..59e1e535f02 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdadelta.java @@ -74,7 +74,7 @@ private ApplyAdadelta(Operation operation) { public static ApplyAdadelta create(Scope scope, Operand var, Operand accum, Operand accumUpdate, Operand lr, Operand rho, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAdadelta", scope.makeOpName("ApplyAdadelta")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdadelta")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(accumUpdate.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java index 63903e9cebe..f300a77b4ac 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagrad.java @@ -68,7 +68,7 @@ private ApplyAdagrad(Operation operation) { ) public static ApplyAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAdagrad", scope.makeOpName("ApplyAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java index 5bf5c640275..981a2c987e9 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradDa.java @@ -72,7 +72,7 @@ private ApplyAdagradDa(Operation operation) { public static ApplyAdagradDa create(Scope scope, Operand var, Operand gradientAccumulator, Operand gradientSquaredAccumulator, Operand grad, Operand lr, Operand l1, Operand l2, Operand globalStep, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAdagradDA", scope.makeOpName("ApplyAdagradDa")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdagradDa")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(gradientAccumulator.asOutput()); opBuilder.addInput(gradientSquaredAccumulator.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java index f35c5edd6e0..fb1f1ddd3ec 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdagradV2.java @@ -65,7 +65,7 @@ private ApplyAdagradV2(Operation operation) { ) public static ApplyAdagradV2 create(Scope scope, Operand var, Operand accum, Operand lr, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAdagradV2", scope.makeOpName("ApplyAdagradV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdagradV2")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java index 5340dda8697..79a6e198389 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAdam.java @@ -77,7 +77,7 @@ private ApplyAdam(Operation operation) { public static ApplyAdam create(Scope scope, Operand var, Operand m, Operand v, Operand beta1Power, Operand beta2Power, Operand lr, Operand beta1, Operand beta2, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAdam", scope.makeOpName("ApplyAdam")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAdam")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java index cd78906708e..16c44e61fc0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyAddSign.java @@ -73,7 +73,7 @@ private ApplyAddSign(Operation operation) { public static ApplyAddSign create(Scope scope, Operand var, Operand m, Operand lr, Operand alpha, Operand signDecay, Operand beta, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyAddSign", scope.makeOpName("ApplyAddSign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyAddSign")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java index 8b5c4862b70..56dbb1cd320 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyCenteredRmsProp.java @@ -86,7 +86,7 @@ private ApplyCenteredRmsProp(Operation operation) { public static ApplyCenteredRmsProp create(Scope scope, Operand var, Operand mg, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyCenteredRMSProp", scope.makeOpName("ApplyCenteredRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyCenteredRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(mg.asOutput()); opBuilder.addInput(ms.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java index 2c8153a2480..65021524609 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyFtrl.java @@ -79,7 +79,7 @@ private ApplyFtrl(Operation operation) { public static ApplyFtrl create(Scope scope, Operand var, Operand accum, Operand linear, Operand grad, Operand lr, Operand l1, Operand l2, Operand l2Shrinkage, Operand lrPower, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyFtrlV2", scope.makeOpName("ApplyFtrl")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyFtrl")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(linear.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java index 3f35716e98d..7a39052bd9d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyGradientDescent.java @@ -65,7 +65,7 @@ private ApplyGradientDescent(Operation operation) { ) public static ApplyGradientDescent create(Scope scope, Operand var, Operand alpha, Operand delta, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyGradientDescent", scope.makeOpName("ApplyGradientDescent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyGradientDescent")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(delta.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java index baf8e69a794..b9f2efe52e0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyMomentum.java @@ -70,7 +70,7 @@ private ApplyMomentum(Operation operation) { ) public static ApplyMomentum create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand momentum, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyMomentum", scope.makeOpName("ApplyMomentum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyMomentum")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java index 93563a4ba4a..a84b790af40 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyPowerSign.java @@ -73,7 +73,7 @@ private ApplyPowerSign(Operation operation) { public static ApplyPowerSign create(Scope scope, Operand var, Operand m, Operand lr, Operand logbase, Operand signDecay, Operand beta, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyPowerSign", scope.makeOpName("ApplyPowerSign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyPowerSign")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java index 38ac095bdce..70707c6787b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalAdagrad.java @@ -72,7 +72,7 @@ private ApplyProximalAdagrad(Operation operation) { public static ApplyProximalAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand l1, Operand l2, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyProximalAdagrad", scope.makeOpName("ApplyProximalAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyProximalAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java index 727f50ef9e3..43f9cdcd622 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyProximalGradientDescent.java @@ -70,7 +70,7 @@ private ApplyProximalGradientDescent(Operation operation) { public static ApplyProximalGradientDescent create(Scope scope, Operand var, Operand alpha, Operand l1, Operand l2, Operand delta, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyProximalGradientDescent", scope.makeOpName("ApplyProximalGradientDescent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyProximalGradientDescent")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(l1.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java index 44bc56ec3a7..4646318e109 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ApplyRmsProp.java @@ -79,7 +79,7 @@ private ApplyRmsProp(Operation operation) { public static ApplyRmsProp create(Scope scope, Operand var, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ApplyRMSProp", scope.makeOpName("ApplyRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ApplyRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java index 6fd46605550..ea1035986e8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/BatchMatMul.java @@ -84,7 +84,7 @@ private BatchMatMul(Operation operation) { ) public static BatchMatMul create(Scope scope, Operand x, Operand y, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("BatchMatMulV2", scope.makeOpName("BatchMatMul")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BatchMatMul")); opBuilder.addInput(x.asOutput()); opBuilder.addInput(y.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java index a0e4e4906f4..1eb33aba66e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ComputeBatchSize.java @@ -55,7 +55,7 @@ private ComputeBatchSize(Operation operation) { describeByClass = true ) public static ComputeBatchSize create(Scope scope, Operand inputDataset) { - OperationBuilder opBuilder = scope.env().opBuilder("ComputeBatchSize", scope.makeOpName("ComputeBatchSize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ComputeBatchSize")); opBuilder.addInput(inputDataset.asOutput()); opBuilder = scope.apply(opBuilder); return new ComputeBatchSize(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java index a075065c686..c66e06d387b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ConditionalAccumulator.java @@ -71,7 +71,7 @@ private ConditionalAccumulator(Operation operation) { ) public static ConditionalAccumulator create(Scope scope, Class dtype, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ConditionalAccumulator", scope.makeOpName("ConditionalAccumulator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ConditionalAccumulator")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java index 425698f9b52..e10213af654 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/GenerateVocabRemapping.java @@ -92,7 +92,7 @@ private GenerateVocabRemapping(Operation operation) { ) public static GenerateVocabRemapping create(Scope scope, Operand newVocabFile, Operand oldVocabFile, Long newVocabOffset, Long numNewVocab, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("GenerateVocabRemapping", scope.makeOpName("GenerateVocabRemapping")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("GenerateVocabRemapping")); opBuilder.addInput(newVocabFile.asOutput()); opBuilder.addInput(oldVocabFile.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java index 8ced390a7d8..68afca884da 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/MergeV2Checkpoints.java @@ -63,7 +63,7 @@ private MergeV2Checkpoints(Operation operation) { ) public static MergeV2Checkpoints create(Scope scope, Operand checkpointPrefixes, Operand destinationPrefix, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("MergeV2Checkpoints", scope.makeOpName("MergeV2Checkpoints")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("MergeV2Checkpoints")); opBuilder.addInput(checkpointPrefixes.asOutput()); opBuilder.addInput(destinationPrefix.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java index e1c553f72af..0581d6a3f90 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/NegTrain.java @@ -63,7 +63,7 @@ private NegTrain(Operation operation) { public static NegTrain create(Scope scope, Operand wIn, Operand wOut, Operand examples, Operand labels, Operand lr, List vocabCount, Long numNegativeSamples) { - OperationBuilder opBuilder = scope.env().opBuilder("NegTrain", scope.makeOpName("NegTrain")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("NegTrain")); opBuilder.addInput(wIn.asOutput()); opBuilder.addInput(wOut.asOutput()); opBuilder.addInput(examples.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java index 401bd65dfc8..89be9949afb 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/PreventGradient.java @@ -69,7 +69,7 @@ private PreventGradient(Operation operation) { ) public static PreventGradient create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("PreventGradient", scope.makeOpName("PreventGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("PreventGradient")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java index b9a2fafc101..fbe5b7be7d4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorApplyGradient.java @@ -55,7 +55,7 @@ private ResourceAccumulatorApplyGradient(Operation operation) { public static ResourceAccumulatorApplyGradient create(Scope scope, Operand handle, Operand localStep, Operand gradient) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorApplyGradient", scope.makeOpName("ResourceAccumulatorApplyGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorApplyGradient")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(localStep.asOutput()); opBuilder.addInput(gradient.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java index 4ab175b74ef..54d8f670440 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorNumAccumulated.java @@ -56,7 +56,7 @@ private ResourceAccumulatorNumAccumulated(Operation operation) { ) public static ResourceAccumulatorNumAccumulated create(Scope scope, Operand handle) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorNumAccumulated", scope.makeOpName("ResourceAccumulatorNumAccumulated")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorNumAccumulated")); opBuilder.addInput(handle.asOutput()); opBuilder = scope.apply(opBuilder); return new ResourceAccumulatorNumAccumulated(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java index 40567653231..893337bfdb4 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorSetGlobalStep.java @@ -54,7 +54,7 @@ private ResourceAccumulatorSetGlobalStep(Operation operation) { ) public static ResourceAccumulatorSetGlobalStep create(Scope scope, Operand handle, Operand newGlobalStep) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorSetGlobalStep", scope.makeOpName("ResourceAccumulatorSetGlobalStep")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorSetGlobalStep")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(newGlobalStep.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java index 7186d58b07e..48901d511ba 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceAccumulatorTakeGradient.java @@ -68,7 +68,7 @@ private ResourceAccumulatorTakeGradient(Operation operation) { ) public static ResourceAccumulatorTakeGradient create(Scope scope, Operand handle, Operand numRequired, Class dtype) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorTakeGradient", scope.makeOpName("ResourceAccumulatorTakeGradient")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceAccumulatorTakeGradient")); opBuilder.addInput(handle.asOutput()); opBuilder.addInput(numRequired.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java index c473ae1fd1e..c98a3596b83 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdaMax.java @@ -65,7 +65,7 @@ public static ResourceApplyAdaMax create(Scope scope, Operand var, Operand m, Operand v, Operand beta1Power, Operand lr, Operand beta1, Operand beta2, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAdaMax", scope.makeOpName("ResourceApplyAdaMax")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdaMax")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java index 30a3d40b670..075f4d1dfb2 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdadelta.java @@ -68,7 +68,7 @@ public static ResourceApplyAdadelta create(Scope scope, Operand var, Operand accum, Operand accumUpdate, Operand lr, Operand rho, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAdadelta", scope.makeOpName("ResourceApplyAdadelta")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdadelta")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(accumUpdate.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java index 9c579f6b8c4..74d8df3dd39 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagrad.java @@ -59,7 +59,7 @@ private ResourceApplyAdagrad(Operation operation) { public static ResourceApplyAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAdagradV2", scope.makeOpName("ResourceApplyAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java index 1566e1d3219..c356bbe4721 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdagradDa.java @@ -66,7 +66,7 @@ public static ResourceApplyAdagradDa create(Scope scope, Operand var, Operand gradientAccumulator, Operand gradientSquaredAccumulator, Operand grad, Operand lr, Operand l1, Operand l2, Operand globalStep, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAdagradDA", scope.makeOpName("ResourceApplyAdagradDa")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdagradDa")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(gradientAccumulator.asOutput()); opBuilder.addInput(gradientSquaredAccumulator.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java index 927023ea74c..2d11f7de847 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdam.java @@ -71,7 +71,7 @@ public static ResourceApplyAdam create(Scope scope, Operand var, Operand m, Operand v, Operand beta1Power, Operand beta2Power, Operand lr, Operand beta1, Operand beta2, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAdam", scope.makeOpName("ResourceApplyAdam")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdam")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java index b1a5400470b..585bd064b24 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAdamWithAmsgrad.java @@ -73,7 +73,7 @@ public static ResourceApplyAdamWithAmsgrad create(Scope scope, Operand var, Operand m, Operand v, Operand vhat, Operand beta1Power, Operand beta2Power, Operand lr, Operand beta1, Operand beta2, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAdamWithAmsgrad", scope.makeOpName("ResourceApplyAdamWithAmsgrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAdamWithAmsgrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(v.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java index 67742f1c152..67d32d5ce5c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyAddSign.java @@ -66,7 +66,7 @@ private ResourceApplyAddSign(Operation operation) { public static ResourceApplyAddSign create(Scope scope, Operand var, Operand m, Operand lr, Operand alpha, Operand signDecay, Operand beta, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyAddSign", scope.makeOpName("ResourceApplyAddSign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyAddSign")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java index 0b6b7f6edc0..80097dad1a0 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyCenteredRmsProp.java @@ -80,7 +80,7 @@ public static ResourceApplyCenteredRmsProp create(Scope scope, Operand var, Operand mg, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyCenteredRMSProp", scope.makeOpName("ResourceApplyCenteredRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyCenteredRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(mg.asOutput()); opBuilder.addInput(ms.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java index 82f325c9873..d9c9234275b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyFtrl.java @@ -73,7 +73,7 @@ public static ResourceApplyFtrl create(Scope scope, Operand var, Operand accum, Operand linear, Operand grad, Operand lr, Operand l1, Operand l2, Operand l2Shrinkage, Operand lrPower, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyFtrlV2", scope.makeOpName("ResourceApplyFtrl")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyFtrl")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(linear.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java index bb055fc76c6..75ecda0e653 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyGradientDescent.java @@ -58,7 +58,7 @@ private ResourceApplyGradientDescent(Operation operation) { ) public static ResourceApplyGradientDescent create(Scope scope, Operand var, Operand alpha, Operand delta, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyGradientDescent", scope.makeOpName("ResourceApplyGradientDescent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyGradientDescent")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(delta.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java index 0e947d6fe90..8047862ad11 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyKerasMomentum.java @@ -64,7 +64,7 @@ private ResourceApplyKerasMomentum(Operation operation) { public static ResourceApplyKerasMomentum create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand momentum, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyKerasMomentum", scope.makeOpName("ResourceApplyKerasMomentum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyKerasMomentum")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java index 51f14af776f..b996a588e1e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyMomentum.java @@ -64,7 +64,7 @@ private ResourceApplyMomentum(Operation operation) { public static ResourceApplyMomentum create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand momentum, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyMomentum", scope.makeOpName("ResourceApplyMomentum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyMomentum")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java index fa3567e9580..54eed271806 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyPowerSign.java @@ -66,7 +66,7 @@ private ResourceApplyPowerSign(Operation operation) { public static ResourceApplyPowerSign create(Scope scope, Operand var, Operand m, Operand lr, Operand logbase, Operand signDecay, Operand beta, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyPowerSign", scope.makeOpName("ResourceApplyPowerSign")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyPowerSign")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(m.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java index 95ccd7906fe..35aca767c42 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalAdagrad.java @@ -65,7 +65,7 @@ private ResourceApplyProximalAdagrad(Operation operation) { public static ResourceApplyProximalAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand l1, Operand l2, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyProximalAdagrad", scope.makeOpName("ResourceApplyProximalAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyProximalAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java index c870479aa0a..b3dfa606bb3 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyProximalGradientDescent.java @@ -63,7 +63,7 @@ private ResourceApplyProximalGradientDescent(Operation operation) { public static ResourceApplyProximalGradientDescent create(Scope scope, Operand var, Operand alpha, Operand l1, Operand l2, Operand delta, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyProximalGradientDescent", scope.makeOpName("ResourceApplyProximalGradientDescent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyProximalGradientDescent")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(l1.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java index 6b59b3896a4..af8279533aa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceApplyRmsProp.java @@ -73,7 +73,7 @@ public static ResourceApplyRmsProp create(Scope scope, Operand var, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyRMSProp", scope.makeOpName("ResourceApplyRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceApplyRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java index 6596c2c7b59..4c9bbc9249c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceConditionalAccumulator.java @@ -69,7 +69,7 @@ private ResourceConditionalAccumulator(Operation operation) { ) public static ResourceConditionalAccumulator create(Scope scope, Class dtype, Shape shape, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceConditionalAccumulator", scope.makeOpName("ResourceConditionalAccumulator")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceConditionalAccumulator")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java index dd35cff9bc7..3c8b09cb025 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdadelta.java @@ -66,7 +66,7 @@ public static ResourceSparseApplyAdadelta create(Scope scope, Operand var, Operand accum, Operand accumUpdate, Operand lr, Operand rho, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdadelta", scope.makeOpName("ResourceSparseApplyAdadelta")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdadelta")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(accumUpdate.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java index 34225335edf..321aeab094b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagrad.java @@ -65,7 +65,7 @@ private ResourceSparseApplyAdagrad(Operation operation) { public static ResourceSparseApplyAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdagrad", scope.makeOpName("ResourceSparseApplyAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java index a704cffcfef..39363dfe817 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradDa.java @@ -69,7 +69,7 @@ public static ResourceSparseApplyAdagradDa create(Scope scope, Operand gradientSquaredAccumulator, Operand grad, Operand indices, Operand lr, Operand l1, Operand l2, Operand globalStep, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdagradDA", scope.makeOpName("ResourceSparseApplyAdagradDa")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdagradDa")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(gradientAccumulator.asOutput()); opBuilder.addInput(gradientSquaredAccumulator.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java index e5d730c9fe0..5ab7b56ae68 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyAdagradV2.java @@ -62,7 +62,7 @@ private ResourceSparseApplyAdagradV2(Operation operation) { public static ResourceSparseApplyAdagradV2 create(Scope scope, Operand var, Operand accum, Operand lr, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyAdagradV2", scope.makeOpName("ResourceSparseApplyAdagradV2")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyAdagradV2")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java index dc6bb2f8533..edc5d692e0c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyCenteredRmsProp.java @@ -81,7 +81,7 @@ public static ResourceSparseApplyCenteredRmsProp create(Scope Operand var, Operand mg, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyCenteredRMSProp", scope.makeOpName("ResourceSparseApplyCenteredRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyCenteredRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(mg.asOutput()); opBuilder.addInput(ms.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java index b0864f79e68..1193b2dab3c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyFtrl.java @@ -76,7 +76,7 @@ public static ResourceSparseApplyFtrl create(Scope scope, Operand var, Operand accum, Operand linear, Operand grad, Operand indices, Operand lr, Operand l1, Operand l2, Operand l2Shrinkage, Operand lrPower, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyFtrlV2", scope.makeOpName("ResourceSparseApplyFtrl")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyFtrl")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(linear.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java index 6c4a59a3ee5..a4559f906bc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyKerasMomentum.java @@ -67,7 +67,7 @@ private ResourceSparseApplyKerasMomentum(Operation operation) { public static ResourceSparseApplyKerasMomentum create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand indices, Operand momentum, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyKerasMomentum", scope.makeOpName("ResourceSparseApplyKerasMomentum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyKerasMomentum")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java index 7731995c245..29805679b05 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyMomentum.java @@ -67,7 +67,7 @@ private ResourceSparseApplyMomentum(Operation operation) { public static ResourceSparseApplyMomentum create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand indices, Operand momentum, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyMomentum", scope.makeOpName("ResourceSparseApplyMomentum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyMomentum")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java index b1cb878b436..5f1fd5b5969 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalAdagrad.java @@ -69,7 +69,7 @@ private ResourceSparseApplyProximalAdagrad(Operation operation) { public static ResourceSparseApplyProximalAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand l1, Operand l2, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyProximalAdagrad", scope.makeOpName("ResourceSparseApplyProximalAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyProximalAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java index eb6df20428d..59c7f23f814 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyProximalGradientDescent.java @@ -66,7 +66,7 @@ private ResourceSparseApplyProximalGradientDescent(Operation operation) { public static ResourceSparseApplyProximalGradientDescent create(Scope scope, Operand var, Operand alpha, Operand l1, Operand l2, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyProximalGradientDescent", scope.makeOpName("ResourceSparseApplyProximalGradientDescent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyProximalGradientDescent")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(l1.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java index 434d1c6c042..ce8cd1552f6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/ResourceSparseApplyRmsProp.java @@ -75,7 +75,7 @@ public static ResourceSparseApplyRmsProp create(Scope scope, Operand var, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("ResourceSparseApplyRMSProp", scope.makeOpName("ResourceSparseApplyRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ResourceSparseApplyRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java index 21b540b041b..d08a97c9f7b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Restore.java @@ -85,7 +85,7 @@ private Restore(Operation operation) { ) public static Restore create(Scope scope, Operand prefix, Operand tensorNames, Operand shapeAndSlices, List> dtypes) { - OperationBuilder opBuilder = scope.env().opBuilder("RestoreV2", scope.makeOpName("Restore")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Restore")); opBuilder.addInput(prefix.asOutput()); opBuilder.addInput(tensorNames.asOutput()); opBuilder.addInput(shapeAndSlices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java index 4710481547c..75fad7a8d67 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/RestoreSlice.java @@ -77,7 +77,7 @@ private RestoreSlice(Operation operation) { public static RestoreSlice create(Scope scope, Operand filePattern, Operand tensorName, Operand shapeAndSlice, Class dt, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("RestoreSlice", scope.makeOpName("RestoreSlice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("RestoreSlice")); opBuilder.addInput(filePattern.asOutput()); opBuilder.addInput(tensorName.asOutput()); opBuilder.addInput(shapeAndSlice.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java index 9bd622da54f..377803d42dd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/Save.java @@ -63,7 +63,7 @@ private Save(Operation operation) { ) public static Save create(Scope scope, Operand prefix, Operand tensorNames, Operand shapeAndSlices, Iterable> tensors) { - OperationBuilder opBuilder = scope.env().opBuilder("SaveV2", scope.makeOpName("Save")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Save")); opBuilder.addInput(prefix.asOutput()); opBuilder.addInput(tensorNames.asOutput()); opBuilder.addInput(shapeAndSlices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java index e1db978c5d1..47155cdfafc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SaveSlices.java @@ -80,7 +80,7 @@ private SaveSlices(Operation operation) { ) public static SaveSlices create(Scope scope, Operand filename, Operand tensorNames, Operand shapesAndSlices, Iterable> data) { - OperationBuilder opBuilder = scope.env().opBuilder("SaveSlices", scope.makeOpName("SaveSlices")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SaveSlices")); opBuilder.addInput(filename.asOutput()); opBuilder.addInput(tensorNames.asOutput()); opBuilder.addInput(shapesAndSlices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java index 047615b901f..a0e4b452faa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaFprint.java @@ -59,7 +59,7 @@ private SdcaFprint(Operation operation) { describeByClass = true ) public static SdcaFprint create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("SdcaFprint", scope.makeOpName("SdcaFprint")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SdcaFprint")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new SdcaFprint(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java index e309842a2b0..45f17fe0497 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaOptimizer.java @@ -111,7 +111,7 @@ public static SdcaOptimizer create(Scope scope, Iterable> sparse Iterable> sparseIndices, Iterable> sparseWeights, Iterable> denseWeights, Operand exampleStateData, String lossType, Float l1, Float l2, Long numLossPartitions, Long numInnerIterations, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SdcaOptimizerV2", scope.makeOpName("SdcaOptimizer")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SdcaOptimizer")); opBuilder.addInputList(Operands.asOutputs(sparseExampleIndices)); opBuilder.addInputList(Operands.asOutputs(sparseFeatureIndices)); opBuilder.addInputList(Operands.asOutputs(sparseFeatureValues)); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java index ae6713ee6f0..1c68ed4e07c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SdcaShrinkL1.java @@ -58,7 +58,7 @@ private SdcaShrinkL1(Operation operation) { ) public static SdcaShrinkL1 create(Scope scope, Iterable> weights, Float l1, Float l2) { - OperationBuilder opBuilder = scope.env().opBuilder("SdcaShrinkL1", scope.makeOpName("SdcaShrinkL1")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SdcaShrinkL1")); opBuilder.addInputList(Operands.asOutputs(weights)); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("l1", l1); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java index 92b8c8d1152..0102cfcb1d6 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdadelta.java @@ -72,7 +72,7 @@ private SparseApplyAdadelta(Operation operation) { public static SparseApplyAdadelta create(Scope scope, Operand var, Operand accum, Operand accumUpdate, Operand lr, Operand rho, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyAdadelta", scope.makeOpName("SparseApplyAdadelta")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyAdadelta")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(accumUpdate.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java index da285feddfb..3b38f3694a7 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagrad.java @@ -69,7 +69,7 @@ private SparseApplyAdagrad(Operation operation) { public static SparseApplyAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyAdagradV2", scope.makeOpName("SparseApplyAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java index 2152c4bcabe..89b5a446e78 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyAdagradDa.java @@ -75,7 +75,7 @@ public static SparseApplyAdagradDa create(Scope scope, Oper Operand gradientAccumulator, Operand gradientSquaredAccumulator, Operand grad, Operand indices, Operand lr, Operand l1, Operand l2, Operand globalStep, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyAdagradDA", scope.makeOpName("SparseApplyAdagradDa")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyAdagradDa")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(gradientAccumulator.asOutput()); opBuilder.addInput(gradientSquaredAccumulator.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java index 0fc5b4dadf4..15c6d62c956 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyCenteredRmsProp.java @@ -88,7 +88,7 @@ public static SparseApplyCenteredRmsProp create(Scope scope Operand mg, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyCenteredRMSProp", scope.makeOpName("SparseApplyCenteredRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyCenteredRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(mg.asOutput()); opBuilder.addInput(ms.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java index 18d3a370873..165e3ac72dd 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyFtrl.java @@ -83,7 +83,7 @@ public static SparseApplyFtrl create(Scope scope, Operand accum, Operand linear, Operand grad, Operand indices, Operand lr, Operand l1, Operand l2, Operand l2Shrinkage, Operand lrPower, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyFtrlV2", scope.makeOpName("SparseApplyFtrl")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyFtrl")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(linear.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java index 79263d46e0f..5abaf6bd277 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyMomentum.java @@ -74,7 +74,7 @@ private SparseApplyMomentum(Operation operation) { public static SparseApplyMomentum create(Scope scope, Operand var, Operand accum, Operand lr, Operand grad, Operand indices, Operand momentum, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyMomentum", scope.makeOpName("SparseApplyMomentum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyMomentum")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java index 85631664327..4cb6d7ce765 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalAdagrad.java @@ -76,7 +76,7 @@ private SparseApplyProximalAdagrad(Operation operation) { public static SparseApplyProximalAdagrad create(Scope scope, Operand var, Operand accum, Operand lr, Operand l1, Operand l2, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyProximalAdagrad", scope.makeOpName("SparseApplyProximalAdagrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyProximalAdagrad")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(accum.asOutput()); opBuilder.addInput(lr.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java index 712dbebad5e..2086701eb0c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyProximalGradientDescent.java @@ -73,7 +73,7 @@ private SparseApplyProximalGradientDescent(Operation operation) { public static SparseApplyProximalGradientDescent create(Scope scope, Operand var, Operand alpha, Operand l1, Operand l2, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyProximalGradientDescent", scope.makeOpName("SparseApplyProximalGradientDescent")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyProximalGradientDescent")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(alpha.asOutput()); opBuilder.addInput(l1.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java index f175008ef44..717e40da997 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/SparseApplyRmsProp.java @@ -81,7 +81,7 @@ private SparseApplyRmsProp(Operation operation) { public static SparseApplyRmsProp create(Scope scope, Operand var, Operand ms, Operand mom, Operand lr, Operand rho, Operand momentum, Operand epsilon, Operand grad, Operand indices, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("SparseApplyRMSProp", scope.makeOpName("SparseApplyRmsProp")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SparseApplyRmsProp")); opBuilder.addInput(var.asOutput()); opBuilder.addInput(ms.asOutput()); opBuilder.addInput(mom.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java index 6bb4ef8dea5..4c1370d811b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/train/TileGrad.java @@ -67,7 +67,7 @@ private TileGrad(Operation operation) { ) public static TileGrad create(Scope scope, Operand input, Operand multiples) { - OperationBuilder opBuilder = scope.env().opBuilder("TileGrad", scope.makeOpName("TileGrad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("TileGrad")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(multiples.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java index 4e474a0360b..353db60eb03 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/BroadcastHelper.java @@ -71,7 +71,7 @@ private BroadcastHelper(Operation operation) { ) public static BroadcastHelper create(Scope scope, Operand lhs, Operand rhs, Operand broadcastDims) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaBroadcastHelper", scope.makeOpName("BroadcastHelper")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("BroadcastHelper")); opBuilder.addInput(lhs.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder.addInput(broadcastDims.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java index 17a5adef536..b2dcd06538d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ClusterOutput.java @@ -61,7 +61,7 @@ private ClusterOutput(Operation operation) { describeByClass = true ) public static ClusterOutput create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaClusterOutput", scope.makeOpName("ClusterOutput")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ClusterOutput")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new ClusterOutput<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java index b352153faee..1fe493c4223 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Conv.java @@ -76,7 +76,7 @@ public static Conv create(Scope scope, O Operand rhs, Operand windowStrides, Operand padding, Operand lhsDilation, Operand rhsDilation, Operand featureGroupCount, String dimensionNumbers, String precisionConfig) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaConv", scope.makeOpName("Conv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Conv")); opBuilder.addInput(lhs.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder.addInput(windowStrides.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java index 5f3f1b625c9..6ced962c063 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dequantize.java @@ -66,7 +66,7 @@ private Dequantize(Operation operation) { ) public static Dequantize create(Scope scope, Operand input, Float minRange, Float maxRange, String mode, Boolean transposeOutput) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaDequantize", scope.makeOpName("Dequantize")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dequantize")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("min_range", minRange); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java index db734e6ef69..3de0491e718 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Dot.java @@ -67,7 +67,7 @@ private Dot(Operation operation) { ) public static Dot create(Scope scope, Operand lhs, Operand rhs, String dimensionNumbers, String precisionConfig) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaDot", scope.makeOpName("Dot")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Dot")); opBuilder.addInput(lhs.asOutput()); opBuilder.addInput(rhs.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java index c7f7407d6e0..52b632adcff 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicSlice.java @@ -76,7 +76,7 @@ private DynamicSlice(Operation operation) { ) public static DynamicSlice create(Scope scope, Operand input, Operand startIndices, Operand sizeIndices) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaDynamicSlice", scope.makeOpName("DynamicSlice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicSlice")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(startIndices.asOutput()); opBuilder.addInput(sizeIndices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java index 8dee468d397..7beece641f8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/DynamicUpdateSlice.java @@ -73,7 +73,7 @@ private DynamicUpdateSlice(Operation operation) { ) public static DynamicUpdateSlice create(Scope scope, Operand input, Operand update, Operand indices) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaDynamicUpdateSlice", scope.makeOpName("DynamicUpdateSlice")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("DynamicUpdateSlice")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(update.asOutput()); opBuilder.addInput(indices.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java index eed296226c9..b9f68a068f8 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Einsum.java @@ -66,7 +66,7 @@ private Einsum(Operation operation) { ) public static Einsum create(Scope scope, Operand a, Operand b, String equation) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaEinsum", scope.makeOpName("Einsum")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Einsum")); opBuilder.addInput(a.asOutput()); opBuilder.addInput(b.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java index 626cebdf108..152020b8b01 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Gather.java @@ -70,7 +70,7 @@ private Gather(Operation operation) { public static Gather create(Scope scope, Operand operand, Operand startIndices, Operand sliceSizes, String dimensionNumbers, Boolean indicesAreSorted) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaGather", scope.makeOpName("Gather")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Gather")); opBuilder.addInput(operand.asOutput()); opBuilder.addInput(startIndices.asOutput()); opBuilder.addInput(sliceSizes.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java index 41ed8f23428..a6572ae3b5e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/KeyValueSort.java @@ -73,7 +73,7 @@ private KeyValueSort(Operation operation) { ) public static KeyValueSort create(Scope scope, Operand keys, Operand values) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaKeyValueSort", scope.makeOpName("KeyValueSort")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("KeyValueSort")); opBuilder.addInput(keys.asOutput()); opBuilder.addInput(values.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java index 78bf07d3a42..f0122134568 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Pad.java @@ -75,7 +75,7 @@ private Pad(Operation operation) { public static Pad create(Scope scope, Operand input, Operand paddingValue, Operand paddingLow, Operand paddingHigh, Operand paddingInterior) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaPad", scope.makeOpName("Pad")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Pad")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(paddingValue.asOutput()); opBuilder.addInput(paddingLow.asOutput()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java index bfd24e0a20d..c81c6994186 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Recv.java @@ -68,7 +68,7 @@ private Recv(Operation operation) { ) public static Recv create(Scope scope, Class dtype, String tensorName, Shape shape) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaRecv", scope.makeOpName("Recv")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Recv")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("dtype", Operands.toDataType(dtype)); opBuilder.setAttr("tensor_name", tensorName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java index 22cf5cdb5c8..7b990fd7c3b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/ReplicaId.java @@ -57,7 +57,7 @@ private ReplicaId(Operation operation) { describeByClass = true ) public static ReplicaId create(Scope scope) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaReplicaId", scope.makeOpName("ReplicaId")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("ReplicaId")); opBuilder = scope.apply(opBuilder); return new ReplicaId(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java index 7e552eb5bc4..c9f43898c11 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/SelfAdjointEig.java @@ -76,7 +76,7 @@ private SelfAdjointEig(Operation operation) { ) public static SelfAdjointEig create(Scope scope, Operand a, Boolean lower, Long maxIter, Float epsilon) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSelfAdjointEig", scope.makeOpName("SelfAdjointEig")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("SelfAdjointEig")); opBuilder.addInput(a.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("lower", lower); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java index 55e766b9cd8..8ad5e93eb8f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Send.java @@ -56,7 +56,7 @@ private Send(Operation operation) { describeByClass = true ) public static Send create(Scope scope, Operand tensor, String tensorName) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSend", scope.makeOpName("Send")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Send")); opBuilder.addInput(tensor.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("tensor_name", tensorName); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java index bf5e754d5a7..90921b3a594 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sharding.java @@ -63,7 +63,7 @@ private Sharding(Operation operation) { ) public static Sharding create(Scope scope, Operand input, Options... options) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSharding", scope.makeOpName("Sharding")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sharding")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); if (options != null) { diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java index e04b43bdbfa..62fccc9d61d 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Sort.java @@ -64,7 +64,7 @@ private Sort(Operation operation) { describeByClass = true ) public static Sort create(Scope scope, Operand input) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSort", scope.makeOpName("Sort")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Sort")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); return new Sort<>(opBuilder.build()); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java index ddcb4f9c2d7..f124d84e379 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/Svd.java @@ -77,7 +77,7 @@ private Svd(Operation operation) { ) public static Svd create(Scope scope, Operand a, Long maxIter, Float epsilon, String precisionConfig) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSvd", scope.makeOpName("Svd")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("Svd")); opBuilder.addInput(a.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("max_iter", maxIter); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java index 17064728c67..aa5e274885c 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaRecvFromHost.java @@ -70,7 +70,7 @@ private XlaRecvFromHost(Operation operation) { ) public static XlaRecvFromHost create(Scope scope, Class Toutput, Shape shape, String key) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaRecvFromHost", scope.makeOpName("XlaRecvFromHost")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaRecvFromHost")); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("Toutput", Operands.toDataType(Toutput)); opBuilder.setAttr("shape", shape); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java index d996d1e9e95..6ddcf5b977b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSendToHost.java @@ -57,7 +57,7 @@ private XlaSendToHost(Operation operation) { describeByClass = true ) public static XlaSendToHost create(Scope scope, Operand input, String key) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSendToHost", scope.makeOpName("XlaSendToHost")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSendToHost")); opBuilder.addInput(input.asOutput()); opBuilder = scope.apply(opBuilder); opBuilder.setAttr("key", key); diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java index 35262eb9f3a..6303be12289 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/xla/XlaSetBound.java @@ -62,7 +62,7 @@ private XlaSetBound(Operation operation) { describeByClass = true ) public static XlaSetBound create(Scope scope, Operand input, Operand bound) { - OperationBuilder opBuilder = scope.env().opBuilder("XlaSetBound", scope.makeOpName("XlaSetBound")); + OperationBuilder opBuilder = scope.env().opBuilder(OP_NAME, scope.makeOpName("XlaSetBound")); opBuilder.addInput(input.asOutput()); opBuilder.addInput(bound.asOutput()); opBuilder = scope.apply(opBuilder); diff --git a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/op/generator/ClassGenerator.java b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/op/generator/ClassGenerator.java index 20e5edf4989..be6d0a32392 100644 --- a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/op/generator/ClassGenerator.java +++ b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/op/generator/ClassGenerator.java @@ -1,19 +1,18 @@ -/* - Copyright 2021 The TensorFlow Authors. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============================================================================== - */ +/* Copyright 2021 The TensorFlow Authors. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +======================================================================= +*/ package org.tensorflow.op.generator; import static org.tensorflow.op.generator.GeneratorUtils.javaizeMemberName; @@ -52,106 +51,85 @@ import org.tensorflow.proto.framework.OpDef.ArgDef; import org.tensorflow.proto.framework.OpDef.AttrDef; -/** - * A generator to generate a op class - */ +/** A generator to generate a op class */ final class ClassGenerator { - /** - * Return true if we can generate the operation class for {@code op}. - */ + /** Return true if we can generate the operation class for {@code op}. */ static boolean canGenerateOp(OpDef op, ApiDef apiDef) { return apiDef.getVisibility() != Visibility.SKIP && !op.getAttrList().stream().anyMatch(x -> x.getType().contains("func")) - && !op.getName().startsWith("_"); //TODO do I want this? Some interesting ops like _XlaCompile + && !op.getName() + .startsWith("_"); // TODO do I want this? Some interesting ops like _XlaCompile } + private static final String OP_NAME_FIELD_NAME = "OP_NAME"; + enum RenderMode { - DEFAULT, LIST_OPERAND, OPERAND; + DEFAULT, + LIST_OPERAND, + OPERAND; } - /** - * The in-progress class builder for the top level op class. - */ + /** The in-progress class builder for the top level op class. */ private final TypeSpec.Builder builder; - /** - * The op to build. - */ + /** The op to build. */ private final OpDef op; - /** - * The api definition for the current op. - */ + /** The api definition for the current op. */ private final ApiDef apiDef; - /** - * A type resolver for the current op. - */ + /** A type resolver for the current op. */ private final TypeResolver resolver; - /** - * The full package of the class. - */ + /** The full package of the class. */ private final String fullPackage; - /** - * The base package for this op generation run. - */ + /** The base package for this op generation run. */ private final String basePackage; - /** - * The group of this op. - */ + /** The group of this op. */ private final String group; - /** - * The class name for this op. - */ + /** The class name for this op. */ private final String className; - /** - * The endpoint being generated in this class. - */ + /** The endpoint being generated in this class. */ private final Endpoint endpoint; /** - * The generated options class, or null if it doesn't have one or {@link #buildOptionsClass()} has not been ran. + * The generated options class, or null if it doesn't have one or {@link #buildOptionsClass()} has + * not been ran. */ private TypeSpec optionsClass = null; - /** - * What type of op this is. - */ + /** What type of op this is. */ private RenderMode mode = RenderMode.DEFAULT; - /** - * The required attributes of this op. - */ + /** The required attributes of this op. */ private final List requiredAttributes = new ArrayList<>(); - /** - * The optional attributes of this op. - */ + /** The optional attributes of this op. */ private final List optionalAttributes = new ArrayList<>(); - /** - * The class's type parameters, initialized in {@link #buildClass()}. - */ + /** The class's type parameters, initialized in {@link #buildClass()}. */ private final Set typeParams = new LinkedHashSet<>(); - /** - * The api defs for the arguments. - */ + /** The api defs for the arguments. */ private final Map argApis = new HashMap<>(); - /** - * The api defs for the attributes. - */ + /** The api defs for the attributes. */ private final Map attrApis = new HashMap<>(); - ClassGenerator(Builder builder, OpDef op, ApiDef apiDef, - String basePackage, String fullPackage, String group, String className, Endpoint endpoint) { + ClassGenerator( + Builder builder, + OpDef op, + ApiDef apiDef, + String basePackage, + String fullPackage, + String group, + String className, + Endpoint endpoint) { this.builder = builder; this.op = op; @@ -163,32 +141,44 @@ enum RenderMode { this.className = className; this.endpoint = endpoint; - op.getAttrList().forEach(attr -> { - if (attr.hasDefaultValue() && !attr.getType().contains("type")) { - optionalAttributes.add(attr); - } else { - requiredAttributes.add(attr); - } - }); + op.getAttrList() + .forEach( + attr -> { + if (attr.hasDefaultValue() && !attr.getType().contains("type")) { + optionalAttributes.add(attr); + } else { + requiredAttributes.add(attr); + } + }); for (AttrDef attr : op.getAttrList()) { - ApiDef.Attr api = apiDef.getAttrList().stream().filter(x -> x.getName().equals(attr.getName())).findFirst().get(); + ApiDef.Attr api = + apiDef.getAttrList().stream() + .filter(x -> x.getName().equals(attr.getName())) + .findFirst() + .get(); attrApis.put(attr, api); } for (ArgDef arg : op.getInputArgList()) { - ApiDef.Arg api = apiDef.getInArgList().stream().filter(x -> x.getName().equals(arg.getName())).findFirst().get(); + ApiDef.Arg api = + apiDef.getInArgList().stream() + .filter(x -> x.getName().equals(arg.getName())) + .findFirst() + .get(); argApis.put(arg, api); } for (ArgDef arg : op.getOutputArgList()) { - ApiDef.Arg api = apiDef.getOutArgList().stream().filter(x -> x.getName().equals(arg.getName())).findFirst().get(); + ApiDef.Arg api = + apiDef.getOutArgList().stream() + .filter(x -> x.getName().equals(arg.getName())) + .findFirst() + .get(); argApis.put(arg, api); } } - /** - * Get the Java variable name for an argument. - */ + /** Get the Java variable name for an argument. */ private String getJavaName(ArgDef arg) { String name = arg.getName(); String rename = argApis.get(arg).getRenameTo(); @@ -199,9 +189,7 @@ private String getJavaName(ArgDef arg) { } } - /** - * Get the Java variable name for an attribute. - */ + /** Get the Java variable name for an attribute. */ private String getJavaName(AttrDef arg) { String name = arg.getName(); String rename = attrApis.get(arg).getRenameTo(); @@ -212,16 +200,12 @@ private String getJavaName(AttrDef arg) { } } - /** - * Get the fully qualified name of the class being generated. - */ + /** Get the fully qualified name of the class being generated. */ private String fullClassName() { return fullPackage + "." + className; } - /** - * Build the class. - */ + /** Build the class. */ void buildClass() { builder.addModifiers(Modifier.PUBLIC, Modifier.FINAL); builder.superclass(Names.RawOp); @@ -244,13 +228,13 @@ void buildClass() { ResolvedType rType = resolver.typeOf(output); TypeName type = rType.unwrapArg(); boolean iterable = rType.iterable; - TypeName operandTypeParam = - type instanceof WildcardTypeName ? Names.TType : type; + TypeName operandTypeParam = type instanceof WildcardTypeName ? Names.TType : type; TypeName operandType = ParameterizedTypeName.get(Names.Operand, operandTypeParam); if (iterable) { mode = RenderMode.LIST_OPERAND; - builder.addSuperinterface(ParameterizedTypeName.get(ClassName.get(Iterable.class), operandType)); + builder.addSuperinterface( + ParameterizedTypeName.get(ClassName.get(Iterable.class), operandType)); } else { mode = RenderMode.OPERAND; builder.addSuperinterface(operandType); @@ -304,8 +288,13 @@ void buildClass() { } // add op name field - builder - .addField(FieldSpec.builder(TypeResolver.STRING, "OP_NAME", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL) + builder.addField( + FieldSpec.builder( + TypeResolver.STRING, + OP_NAME_FIELD_NAME, + Modifier.PUBLIC, + Modifier.STATIC, + Modifier.FINAL) .addJavadoc("$L", "The name of this op, as known by TensorFlow core engine") .initializer("$S", op.getName()) .build()); @@ -313,24 +302,25 @@ void buildClass() { // add output fields if (op.getOutputArgCount() > 0) { for (ArgDef output : op.getOutputArgList()) { - builder - .addField(resolver.typeOf(output).listIfIterable().javaType, getJavaName(output), Modifier.PRIVATE); + builder.addField( + resolver.typeOf(output).listIfIterable().javaType, + getJavaName(output), + Modifier.PRIVATE); } } buildConstructor(); } - /** - * Add a nested class for Options - */ + /** Add a nested class for Options */ private void buildOptionsClass() { if (optionalAttributes.isEmpty()) { return; } - TypeSpec.Builder optionsBuilder = TypeSpec.classBuilder("Options").addModifiers(Modifier.PUBLIC, Modifier.STATIC); + TypeSpec.Builder optionsBuilder = + TypeSpec.classBuilder("Options").addModifiers(Modifier.PUBLIC, Modifier.STATIC); optionsBuilder.addJavadoc("$L", "Optional attributes for {@link " + fullClassName() + "}"); ClassName optionsClassName = ClassName.get(fullPackage, className, "Options"); @@ -387,37 +377,46 @@ private void buildOptionsClass() { } // add the field - optionsBuilder.addField(type.classIfGeneric().listIfIterable().javaType, name, Modifier.PRIVATE); + optionsBuilder.addField( + type.classIfGeneric().listIfIterable().javaType, name, Modifier.PRIVATE); } // add a private constructor - optionsBuilder.addMethod(MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE).build()); + optionsBuilder.addMethod( + MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE).build()); optionsClass = optionsBuilder.build(); builder.addType(optionsClass); } /** - * Write statements to set an attribute in an OperationBuilder. Meant to be used in {@link #buildFactoryMethods()} + * Write statements to set an attribute in an OperationBuilder. Meant to be used in {@link + * #buildFactoryMethods()} * * @param body the body to write to * @param attr the attribute to set * @param type the type of the attribute, or null to get it ourselves * @param optional whether the attribute is optional */ - private void writeSetAttr(CodeBlock.Builder body, AttrDef attr, ResolvedType type, boolean optional) { + private void writeSetAttr( + CodeBlock.Builder body, AttrDef attr, ResolvedType type, boolean optional) { String varName = optional ? "opts." + getJavaName(attr) : getJavaName(attr); if (type == null) { type = resolver.typeOf(attr); } if (type.jniType.equals(ClassName.get(DataType.class))) { - body.addStatement("opBuilder.setAttr($S, $T.$L($L))", attr.getName(), - Names.Operands, type.iterable ? "toDataTypes" : "toDataType", varName); + body.addStatement( + "opBuilder.setAttr($S, $T.$L($L))", + attr.getName(), + Names.Operands, + type.iterable ? "toDataTypes" : "toDataType", + varName); } else { if (type.iterable) { String arrayName = javaizeMemberName(attr.getName()) + "Array"; - body.addStatement("$T[] $L = new $T[$L.size()]", type.jniType, arrayName, type.jniType, varName); + body.addStatement( + "$T[] $L = new $T[$L.size()]", type.jniType, arrayName, type.jniType, varName); body.beginControlFlow("for (int i = 0 ; i < $L.length ; i++)", arrayName); @@ -432,39 +431,39 @@ private void writeSetAttr(CodeBlock.Builder body, AttrDef attr, ResolvedType typ } } - /** - * Add the {@code create} factory methods. - */ + /** Add the {@code create} factory methods. */ private void buildFactoryMethods() { - MethodSpec.Builder factoryBuilder = MethodSpec.methodBuilder("create") - .addModifiers(Modifier.PUBLIC, Modifier.STATIC); + MethodSpec.Builder factoryBuilder = + MethodSpec.methodBuilder("create").addModifiers(Modifier.PUBLIC, Modifier.STATIC); // the main creator will inherit any class type params TypeName returnType = ClassName.get(fullPackage, className); if (!typeParams.isEmpty()) { - returnType = ParameterizedTypeName.get((ClassName) returnType, typeParams.toArray(new TypeName[0])); + returnType = + ParameterizedTypeName.get((ClassName) returnType, typeParams.toArray(new TypeName[0])); } factoryBuilder.returns(returnType); factoryBuilder.addAnnotation( - AnnotationSpec.builder(Names.Endpoint).addMember("describeByClass", "true") - .build()); + AnnotationSpec.builder(Names.Endpoint).addMember("describeByClass", "true").build()); - factoryBuilder.addJavadoc("Factory method to create a class wrapping a new $L operation.\n", op.getName()); + factoryBuilder.addJavadoc( + "Factory method to create a class wrapping a new $L operation.\n", op.getName()); // we're going to build the body as add arguments CodeBlock.Builder body = CodeBlock.builder(); Map paramTags = new LinkedHashMap<>(); - factoryBuilder - .addParameter(ParameterSpec.builder(Names.Scope, "scope").build()); + factoryBuilder.addParameter(ParameterSpec.builder(Names.Scope, "scope").build()); paramTags.put("scope", CodeBlock.of("current scope")); Set typeVars = new LinkedHashSet<>(typeParams); - body.addStatement("$T opBuilder = scope.env().opBuilder($S, scope.makeOpName($S))", - Names.OperationBuilder, op.getName(), + body.addStatement( + "$T opBuilder = scope.env().opBuilder($L, scope.makeOpName($S))", + Names.OperationBuilder, + OP_NAME_FIELD_NAME, className); // add the inputs as parameters, and add them to the op builder @@ -488,12 +487,12 @@ private void buildFactoryMethods() { } else { body.addStatement("opBuilder.addInput($L.asOutput())", name); } - } body.addStatement("opBuilder = scope.apply(opBuilder)"); - // add the required attribute params, and build the default type maps for use in the secondary factory + // add the required attribute params, and build the default type maps for use in the secondary + // factory Map defaultTypes = new HashMap<>(); Map defaultTypeVars = new HashMap<>(); for (AttrDef attr : requiredAttributes) { @@ -504,8 +503,8 @@ private void buildFactoryMethods() { ResolvedType type = resolver.typeOf(attr); ApiDef.Attr apiAttr = attrApis.get(attr); - ParameterSpec.Builder builder = ParameterSpec - .builder(type.classIfGeneric().listIfIterable().javaType, getJavaName(attr)); + ParameterSpec.Builder builder = + ParameterSpec.builder(type.classIfGeneric().listIfIterable().javaType, getJavaName(attr)); String javaName = getJavaName(attr); String description = @@ -533,7 +532,9 @@ private void buildFactoryMethods() { // add optional attributes if (optionsClass != null) { factoryBuilder.addParameter( - ParameterSpec.builder(ArrayTypeName.of(ClassName.get(fullPackage, className, "Options")), "options").build()); + ParameterSpec.builder( + ArrayTypeName.of(ClassName.get(fullPackage, className, "Options")), "options") + .build()); paramTags.put("options", CodeBlock.of("$L", "carries optional attribute values")); factoryBuilder.varargs(); @@ -551,18 +552,17 @@ private void buildFactoryMethods() { body.endControlFlow(); body.endControlFlow(); - } - body.addStatement("return new $L(opBuilder.build())", typeParams.isEmpty() ? className : (className + "<>")); + body.addStatement( + "return new $L(opBuilder.build())", typeParams.isEmpty() ? className : (className + "<>")); factoryBuilder.addCode(body.build()); paramTags.forEach( (param, doc) -> { String description = doc.toString(); if (description.isEmpty() || description.equals("\n")) { - factoryBuilder.addJavadoc( - "\n@param $L the $L property", param, param); + factoryBuilder.addJavadoc("\n@param $L the $L property", param, param); } else { factoryBuilder.addJavadoc("\n@param $L $L", param, doc); } @@ -586,20 +586,26 @@ private void buildFactoryMethods() { } } - /** - * Add a secondary factory method with the provided default type maps - */ - private void buildSecondaryFactory(Map defaultTypes, Map defaultTypeVars, - MethodSpec mainFactory, Map paramTags) { - MethodSpec.Builder factoryBuilder = MethodSpec.methodBuilder(mainFactory.name) - .addModifiers(mainFactory.modifiers) - .returns(ParameterizedTypeName.get(ClassName.get(fullPackage, className), typeParams.stream() - .map(x -> defaultTypeVars.getOrDefault(x.name, x)).toArray(TypeName[]::new))); + /** Add a secondary factory method with the provided default type maps */ + private void buildSecondaryFactory( + Map defaultTypes, + Map defaultTypeVars, + MethodSpec mainFactory, + Map paramTags) { + MethodSpec.Builder factoryBuilder = + MethodSpec.methodBuilder(mainFactory.name) + .addModifiers(mainFactory.modifiers) + .returns( + ParameterizedTypeName.get( + ClassName.get(fullPackage, className), + typeParams.stream() + .map(x -> defaultTypeVars.getOrDefault(x.name, x)) + .toArray(TypeName[]::new))); factoryBuilder.addAnnotations(mainFactory.annotations); - factoryBuilder - .addJavadoc("Factory method to create a class wrapping a new $L operation, with the default output types.\n", - op.getName()); + factoryBuilder.addJavadoc( + "Factory method to create a class wrapping a new $L operation, with the default output types.\n", + op.getName()); CodeBlock.Builder body = CodeBlock.builder(); body.add("return create("); @@ -614,9 +620,14 @@ private void buildSecondaryFactory(Map defaultTypes, Map getJavaName(x).equals(param.name)).findFirst() - .orElse(null); - if (attr != null && resolver.typeOf(attr).shouldWrapInClass() && defaultTypes.containsKey(attr)) { + AttrDef attr = + op.getAttrList().stream() + .filter(x -> getJavaName(x).equals(param.name)) + .findFirst() + .orElse(null); + if (attr != null + && resolver.typeOf(attr).shouldWrapInClass() + && defaultTypes.containsKey(attr)) { body.add("$T.class", defaultTypes.get(attr)); } else { factoryBuilder.addParameter(param); @@ -638,7 +649,8 @@ private void buildSecondaryFactory(Map defaultTypes, Map Date: Sat, 19 Jun 2021 16:09:06 -0400 Subject: [PATCH 6/7] Redo metrics to add Ops parameter to updateState resetStates and result. Also removed Ops from CTORs. Also reworked variable assignment so that there is no need to initialize the variables as I added logic to use a tf.assign on the first pass rather than a tf.assignAdd. --- .../org/tensorflow/framework/metrics/AUC.java | 829 ++++++------------ .../framework/metrics/Accuracy.java | 44 +- .../framework/metrics/BinaryAccuracy.java | 60 +- .../framework/metrics/BinaryCrossentropy.java | 30 +- .../metrics/CategoricalAccuracy.java | 38 +- .../metrics/CategoricalCrossentropy.java | 49 +- .../framework/metrics/CategoricalHinge.java | 23 +- .../framework/metrics/CosineSimilarity.java | 53 +- .../framework/metrics/FalseNegatives.java | 100 +-- .../framework/metrics/FalsePositives.java | 100 +-- .../tensorflow/framework/metrics/Hinge.java | 25 +- .../framework/metrics/KLDivergence.java | 26 +- .../framework/metrics/LogCoshError.java | 25 +- .../tensorflow/framework/metrics/Mean.java | 14 +- .../framework/metrics/MeanAbsoluteError.java | 25 +- .../metrics/MeanAbsolutePercentageError.java | 25 +- .../tensorflow/framework/metrics/MeanIoU.java | 132 +-- .../framework/metrics/MeanRelativeError.java | 103 +-- .../framework/metrics/MeanSquaredError.java | 25 +- .../metrics/MeanSquaredLogarithmicError.java | 25 +- .../framework/metrics/MeanTensor.java | 112 +-- .../tensorflow/framework/metrics/Metric.java | 146 ++- .../tensorflow/framework/metrics/Poisson.java | 25 +- .../framework/metrics/Precision.java | 291 ++---- .../framework/metrics/PrecisionAtRecall.java | 103 +-- .../tensorflow/framework/metrics/Recall.java | 330 ++----- .../framework/metrics/RecallAtPrecision.java | 114 +-- .../metrics/RootMeanSquaredError.java | 41 +- .../metrics/SensitivityAtSpecificity.java | 109 +-- .../metrics/SparseCategoricalAccuracy.java | 47 +- .../SparseCategoricalCrossentropy.java | 31 +- .../SparseTopKCategoricalAccuracy.java | 43 +- .../metrics/SpecificityAtSensitivity.java | 110 +-- .../framework/metrics/SquaredHinge.java | 25 +- .../org/tensorflow/framework/metrics/Sum.java | 27 - .../metrics/TopKCategoricalAccuracy.java | 39 +- .../framework/metrics/TrueNegatives.java | 100 +-- .../framework/metrics/TruePositives.java | 100 +-- .../impl/ConfusionMatrixConditionCount.java | 144 +-- .../framework/metrics/impl/LossMetric.java | 5 +- .../metrics/impl/MeanMetricWrapper.java | 25 +- .../metrics/impl/MetricInterface.java | 78 ++ .../framework/metrics/impl/MetricsHelper.java | 47 +- .../framework/metrics/impl/Reduce.java | 103 +-- .../impl/SensitivitySpecificityBase.java | 131 ++- .../tensorflow/framework/metrics/AUCTest.java | 307 +------ .../framework/metrics/AccuracyTest.java | 108 +-- .../framework/metrics/BinaryAccuracyTest.java | 130 +-- .../metrics/BinaryCrossentropyTest.java | 59 +- .../metrics/CategoricalAccuracyTest.java | 64 +- .../metrics/CategoricalCrossentropyTest.java | 64 +- .../metrics/CategoricalHingeTest.java | 37 +- .../metrics/CosineSimilarityTest.java | 45 +- .../framework/metrics/FalseNegativesTest.java | 53 +- .../framework/metrics/FalsePositivesTest.java | 53 +- .../framework/metrics/HingeTest.java | 36 +- .../framework/metrics/KLDivergenceTest.java | 37 +- .../framework/metrics/LogCoshErrorTest.java | 37 +- .../metrics/MeanAbsoluteErrorTest.java | 59 +- .../MeanAbsolutePercentageErrorTest.java | 57 +- .../framework/metrics/MeanIoUTest.java | 58 +- .../metrics/MeanRelativeErrorTest.java | 49 +- .../metrics/MeanSquaredErrorTest.java | 81 +- .../MeanSquaredLogarithmicErrorTest.java | 51 +- .../framework/metrics/MeanTensorTest.java | 57 +- .../framework/metrics/PoissonTest.java | 37 +- .../metrics/PrecisionAtRecallTest.java | 69 +- .../framework/metrics/PrecisionTest.java | 128 ++- .../metrics/RecallAtPrecisionTest.java | 76 +- .../framework/metrics/RecallTest.java | 132 ++- .../metrics/RootMeanSquaredErrorTest.java | 37 +- .../metrics/SensitivityAtSpecificityTest.java | 65 +- .../SparseCategoricalCrossentropyTest.java | 58 +- .../metrics/SpecificityAtSensitivityTest.java | 75 +- .../framework/metrics/SquaredHingeTest.java | 37 +- .../tensorflow/framework/metrics/SumTest.java | 73 +- .../metrics/TopKCategoricalAccuracyTest.java | 53 +- .../framework/metrics/TrueNegativesTest.java | 52 +- .../framework/metrics/TruePositivesTest.java | 52 +- 79 files changed, 1956 insertions(+), 4507 deletions(-) create mode 100644 tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java index d94c9117132..9f92ed658f1 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/AUC.java @@ -93,12 +93,16 @@ public class AUC extends Metric { /** Default Fuzz factor. */ public static final float EPSILON = 1e-7f; + /** Name for the true positives variable */ public static final String TRUE_POSITIVES = "TRUE_POSITIVES"; + /** Name for the false positives variable */ public static final String FALSE_POSITIVES = "FALSE_POSITIVES"; + /** Name for the true negatives variable */ public static final String TRUE_NEGATIVES = "TRUE_NEGATIVES"; + /** Name for the false negatives variable */ public static final String FALSE_NEGATIVES = "FALSE_NEGATIVES"; + /** The default number of thresholds if thresholds are not provided */ public static final int DEFAULT_NUM_THRESHOLDS = 200; - public static final String DEFAULT_NAME = "auc"; private final int numThresholds; private final AUCCurve curve; @@ -110,7 +114,6 @@ public class AUC extends Metric { private final String trueNegativesName; private final String falseNegativesName; private final Map> initializers = new HashMap<>(); - private final Class type; /** The size of the label dimension. */ private Integer numLabels; @@ -152,16 +155,16 @@ public class AUC extends Metric { private boolean initialized; /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link #DEFAULT_NUM_THRESHOLDS} for the numThresholds, {@link AUCCurve#ROC} for the curve type, - * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, - * {@code false} for multiLabel, and {@code null} for labelWeights. + * Creates an AUC (Area under the curve) metric using {@link Class#getSimpleName()} for the metric + * name, {@link #DEFAULT_NUM_THRESHOLDS} for the numThresholds, {@link AUCCurve#ROC} for the curve + * type, {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for + * thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. * * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(long seed, Class type) { + public AUC(long seed, Class resultType) { this( null, DEFAULT_NUM_THRESHOLDS, @@ -171,7 +174,7 @@ public AUC(long seed, Class type) { false, null, seed, - type); + resultType); } /** @@ -180,12 +183,12 @@ public AUC(long seed, Class type) { * AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, {@code * false} for multiLabel, and {@code null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(String name, long seed, Class type) { + public AUC(String name, long seed, Class resultType) { this( name, DEFAULT_NUM_THRESHOLDS, @@ -195,12 +198,12 @@ public AUC(String name, long seed, Class type) { false, null, seed, - type); + resultType); } /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the + * Creates an AUC (Area under the curve) metric using {@link Class#getSimpleName()} for the metric + * name, {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the * summation method, {@code null} for thresholds, {@code false} for multiLabel, and {@code null} * for labelWeights. * @@ -208,9 +211,9 @@ public AUC(String name, long seed, Class type) { * must be > 1. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(int numThresholds, long seed, Class type) { + public AUC(int numThresholds, long seed, Class resultType) { this( null, numThresholds, @@ -220,12 +223,12 @@ public AUC(int numThresholds, long seed, Class type) { false, null, seed, - type); + resultType); } /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the + * Creates an AUC (Area under the curve) metric using {@link Class#getSimpleName()} for the metric + * name, {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the * summation method, {@code null} for numThresholds, {@code false} for multiLabel, and {@code * null} for labelWeights. * @@ -233,9 +236,9 @@ public AUC(int numThresholds, long seed, Class type) { * the numThresholds parameter is ignored. Values should be in [0, 1]. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(float[] thresholds, long seed, Class type) { + public AUC(float[] thresholds, long seed, Class resultType) { this( null, DEFAULT_NUM_THRESHOLDS, @@ -245,7 +248,7 @@ public AUC(float[] thresholds, long seed, Class type) { false, null, seed, - type); + resultType); } /** @@ -253,14 +256,14 @@ public AUC(float[] thresholds, long seed, Class type) { * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, * {@code false} for multiLabel, and {@code null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values * must be > 1. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(String name, int numThresholds, long seed, Class type) { + public AUC(String name, int numThresholds, long seed, Class resultType) { this( name, numThresholds, @@ -270,7 +273,7 @@ public AUC(String name, int numThresholds, long seed, Class type) { false, null, seed, - type); + resultType); } /** @@ -279,14 +282,14 @@ public AUC(String name, int numThresholds, long seed, Class type) { * method, {@link #DEFAULT_NUM_THRESHOLDS} num thresholds, {@code false} for multiLabel, and * {@code null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, * the numThresholds parameter is ignored. Values should be in [0, 1]. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(String name, float[] thresholds, long seed, Class type) { + public AUC(String name, float[] thresholds, long seed, Class resultType) { this( name, DEFAULT_NUM_THRESHOLDS, @@ -296,7 +299,7 @@ public AUC(String name, float[] thresholds, long seed, Class type) { false, null, seed, - type); + resultType); } /** @@ -304,16 +307,16 @@ public AUC(String name, float[] thresholds, long seed, Class type) { * the summation method, {@code null} for thresholds, {@code false} for multiLabel, and {@code * null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values * must be > 1. * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link * AUCCurve#PR} for the Precision-Recall-curve. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(String name, int numThresholds, AUCCurve curve, long seed, Class type) { + public AUC(String name, int numThresholds, AUCCurve curve, long seed, Class resultType) { this( name, numThresholds, @@ -323,7 +326,7 @@ public AUC(String name, int numThresholds, AUCCurve curve, long seed, Class t false, null, seed, - type); + resultType); } /** @@ -331,16 +334,16 @@ public AUC(String name, int numThresholds, AUCCurve curve, long seed, Class t * AUCSummationMethod#INTERPOLATION} for the summation method, {@link #DEFAULT_NUM_THRESHOLDS} num * thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, * the numThresholds parameter is ignored. Values should be in [0, 1]. * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link * AUCCurve#PR} for the Precision-Recall-curve. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(String name, float[] thresholds, AUCCurve curve, long seed, Class type) { + public AUC(String name, float[] thresholds, AUCCurve curve, long seed, Class resultType) { this( name, DEFAULT_NUM_THRESHOLDS, @@ -350,13 +353,13 @@ public AUC(String name, float[] thresholds, AUCCurve curve, long seed, Class false, null, seed, - type); + resultType); } /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, - * {@code false} for multiLabel, and {@code null} for labelWeights. + * Creates an AUC (Area under the curve) metric using {@link Class#getSimpleName()} for the metric + * name, {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for + * thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. * * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values * must be > 1. @@ -364,9 +367,9 @@ public AUC(String name, float[] thresholds, AUCCurve curve, long seed, Class * AUCCurve#PR} for the Precision-Recall-curve. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(int numThresholds, AUCCurve curve, long seed, Class type) { + public AUC(int numThresholds, AUCCurve curve, long seed, Class resultType) { this( null, numThresholds, @@ -376,7 +379,7 @@ public AUC(int numThresholds, AUCCurve curve, long seed, Class type) { false, null, seed, - type); + resultType); } /** @@ -390,9 +393,9 @@ public AUC(int numThresholds, AUCCurve curve, long seed, Class type) { * AUCCurve#PR} for the Precision-Recall-curve. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ - public AUC(float[] thresholds, AUCCurve curve, long seed, Class type) { + public AUC(float[] thresholds, AUCCurve curve, long seed, Class resultType) { this( null, DEFAULT_NUM_THRESHOLDS, @@ -402,12 +405,13 @@ public AUC(float[] thresholds, AUCCurve curve, long seed, Class type) { false, null, seed, - type); + resultType); } /** - * Creates an AUC (Area under the curve) metric. using {@link #DEFAULT_NAME} for the metric name,, - * {@code null} for thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. + * Creates an AUC (Area under the curve) metric. using {@link Class#getSimpleName()} for the + * metric name,, {@code null} for thresholds, {@code false} for multiLabel, and {@code null} for + * labelWeights. * * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values * must be > 1. @@ -416,20 +420,20 @@ public AUC(float[] thresholds, AUCCurve curve, long seed, Class type) { * @param summationMethod Specifies the Riemann summation method used * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ public AUC( int numThresholds, AUCCurve curve, AUCSummationMethod summationMethod, long seed, - Class type) { - this(null, numThresholds, curve, summationMethod, null, false, null, seed, type); + Class resultType) { + this(null, numThresholds, curve, summationMethod, null, false, null, seed, resultType); } /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@code null} for numThresholds, {@code false} for multiLabel, and {@code null} for + * Creates an AUC (Area under the curve) metric using {@link Class#getSimpleName()} for the metric + * name, {@code null} for numThresholds, {@code false} for multiLabel, and {@code null} for * labelWeights. * * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, @@ -439,22 +443,31 @@ public AUC( * @param summationMethod Specifies the Riemann summation method used * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ public AUC( float[] thresholds, AUCCurve curve, AUCSummationMethod summationMethod, long seed, - Class type) { - this(null, DEFAULT_NUM_THRESHOLDS, curve, summationMethod, thresholds, false, null, seed, type); + Class resultType) { + this( + null, + DEFAULT_NUM_THRESHOLDS, + curve, + summationMethod, + thresholds, + false, + null, + seed, + resultType); } /** * Creates an AUC (Area under the curve) metric. using {@code null} for thresholds, {@code false} * for multiLabel, and {@code null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values * must be > 1. * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link @@ -462,7 +475,7 @@ public AUC( * @param summationMethod Specifies the Riemann summation method used, * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ public AUC( String name, @@ -470,15 +483,15 @@ public AUC( AUCCurve curve, AUCSummationMethod summationMethod, long seed, - Class type) { - this(name, numThresholds, curve, summationMethod, null, false, null, seed, type); + Class resultType) { + this(name, numThresholds, curve, summationMethod, null, false, null, seed, resultType); } /** * Creates an AUC (Area under the curve) metric. using {@code null} for the numThresholds, {@code * false} for multiLabel, and {@code null} for labelWeights. * - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} + * @param name the name of the metric, if {@code null} defaults to {@link Class#getSimpleName()} * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, * the numThresholds parameter is ignored. Values should be in [0, 1]. * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link @@ -486,7 +499,7 @@ public AUC( * @param summationMethod Specifies the Riemann summation method used. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. */ public AUC( String name, @@ -494,14 +507,23 @@ public AUC( AUCCurve curve, AUCSummationMethod summationMethod, long seed, - Class type) { - this(name, DEFAULT_NUM_THRESHOLDS, curve, summationMethod, thresholds, false, null, seed, type); + Class resultType) { + this( + name, + DEFAULT_NUM_THRESHOLDS, + curve, + summationMethod, + thresholds, + false, + null, + seed, + resultType); } /** * Creates an AUC (Area under the curve) metric. * - * @param name the name of the metric, if name is null then use {@link #DEFAULT_NAME}. + * @param name the name of the metric, if name is null then use {@link Class#getSimpleName()}. * @param numThresholds the number of thresholds to use when discretizing the roc curve. This * includes the bracketing 0 and 1 thresholds, so the value must be ≥ 2. * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link @@ -522,7 +544,7 @@ public AUC( * individual label predictions in computing the confusion matrix on the flattened data. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. + * @param resultType the data type for the metric result and the confusion matrix variables. * @throws IllegalArgumentException if numThresholds is less than 2 and thresholds is null, or if * a threshold value is less than 0 or greater than 1. */ @@ -535,15 +557,14 @@ public AUC( boolean multiLabel, Operand labelWeights, long seed, - Class type) { - super(name == null ? DEFAULT_NAME : name, seed); + Class resultType) { + super(name, seed, resultType); truePositivesName = getVariableName(TRUE_POSITIVES); falsePositivesName = getVariableName(FALSE_POSITIVES); trueNegativesName = getVariableName(TRUE_NEGATIVES); falseNegativesName = getVariableName(FALSE_NEGATIVES); this.curve = curve; this.summationMethod = summationMethod; - this.type = type; this.multiLabel = multiLabel; @@ -586,476 +607,31 @@ public AUC( } } - /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link #DEFAULT_NUM_THRESHOLDS} for the numThresholds, {@link AUCCurve#ROC} for the curve type, - * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, - * {@code false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, long seed, Class type) { - this( - tf, - null, - DEFAULT_NUM_THRESHOLDS, - AUCCurve.ROC, - AUCSummationMethod.INTERPOLATION, - null, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NUM_THRESHOLDS} for the - * numThresholds, {@link AUCCurve#ROC} for the curve type, {@link - * AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, {@code - * false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, String name, long seed, Class type) { - this( - tf, - name, - DEFAULT_NUM_THRESHOLDS, - AUCCurve.ROC, - AUCSummationMethod.INTERPOLATION, - null, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the - * summation method, {@code null} for thresholds, {@code false} for multiLabel, and {@code null} - * for labelWeights. - * - * @param tf The TensorFlow Ops - * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values - * must be > 1. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, int numThresholds, long seed, Class type) { - this( - tf, - null, - numThresholds, - AUCCurve.ROC, - AUCSummationMethod.INTERPOLATION, - null, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the - * summation method, {@code null} for numThresholds, {@code false} for multiLabel, and {@code - * null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, float[] thresholds, long seed, Class type) { - this( - tf, - null, - DEFAULT_NUM_THRESHOLDS, - AUCCurve.ROC, - AUCSummationMethod.INTERPOLATION, - thresholds, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric. using {@link AUCCurve#ROC} for the curve type, - * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, - * {@code false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values - * must be > 1. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, String name, int numThresholds, long seed, Class type) { - this( - tf, - name, - numThresholds, - AUCCurve.ROC, - AUCSummationMethod.INTERPOLATION, - null, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@code null} for numThresholds, {@link - * AUCCurve#ROC} for the curve type, {@link AUCSummationMethod#INTERPOLATION} for the summation - * method, {@link #DEFAULT_NUM_THRESHOLDS} num thresholds, {@code false} for multiLabel, and - * {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, String name, float[] thresholds, long seed, Class type) { - this( - tf, - name, - DEFAULT_NUM_THRESHOLDS, - AUCCurve.ROC, - AUCSummationMethod.INTERPOLATION, - thresholds, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@link AUCSummationMethod#INTERPOLATION} for - * the summation method, {@code null} for thresholds, {@code false} for multiLabel, and {@code - * null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values - * must be > 1. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, String name, int numThresholds, AUCCurve curve, long seed, Class type) { - this( - tf, - name, - numThresholds, - curve, - AUCSummationMethod.INTERPOLATION, - null, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@code null} for numThresholds, {@link - * AUCSummationMethod#INTERPOLATION} for the summation method, {@link #DEFAULT_NUM_THRESHOLDS} num - * thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, String name, float[] thresholds, AUCCurve curve, long seed, Class type) { - this( - tf, - name, - DEFAULT_NUM_THRESHOLDS, - curve, - AUCSummationMethod.INTERPOLATION, - thresholds, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@link AUCSummationMethod#INTERPOLATION} for the summation method, {@code null} for thresholds, - * {@code false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values - * must be > 1. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, int numThresholds, AUCCurve curve, long seed, Class type) { - this( - tf, - null, - numThresholds, - curve, - AUCSummationMethod.INTERPOLATION, - null, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@code null} for numThresholds, {@link - * AUCSummationMethod#INTERPOLATION} for the summation method, {@code false} for multiLabel, and - * {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC(Ops tf, float[] thresholds, AUCCurve curve, long seed, Class type) { - this( - tf, - null, - DEFAULT_NUM_THRESHOLDS, - curve, - AUCSummationMethod.INTERPOLATION, - thresholds, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric. using {@link #DEFAULT_NAME} for the metric name,, - * {@code null} for thresholds, {@code false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values - * must be > 1. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param summationMethod Specifies the Riemann summation method used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC( - Ops tf, - int numThresholds, - AUCCurve curve, - AUCSummationMethod summationMethod, - long seed, - Class type) { - this(tf, null, numThresholds, curve, summationMethod, null, false, null, seed, type); - } - - /** - * Creates an AUC (Area under the curve) metric using {@link #DEFAULT_NAME} for the metric name, - * {@code null} for numThresholds, {@code false} for multiLabel, and {@code null} for - * labelWeights. - * - * @param tf The TensorFlow Ops - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param summationMethod Specifies the Riemann summation method used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC( - Ops tf, - float[] thresholds, - AUCCurve curve, - AUCSummationMethod summationMethod, - long seed, - Class type) { - this( - tf, - null, - DEFAULT_NUM_THRESHOLDS, - curve, - summationMethod, - thresholds, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric. using {@code null} for thresholds, {@code false} - * for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param numThresholds the number of thresholds to use when discretizing the roc curve. Values - * must be > 1. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param summationMethod Specifies the Riemann summation method used, - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC( - Ops tf, - String name, - int numThresholds, - AUCCurve curve, - AUCSummationMethod summationMethod, - long seed, - Class type) { - this(tf, name, numThresholds, curve, summationMethod, null, false, null, seed, type); - } - - /** - * Creates an AUC (Area under the curve) metric. using {@code null} for the numThresholds, {@code - * false} for multiLabel, and {@code null} for labelWeights. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if {@code null} defaults to {@link #DEFAULT_NAME} - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param summationMethod Specifies the Riemann summation method used. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - */ - public AUC( - Ops tf, - String name, - float[] thresholds, - AUCCurve curve, - AUCSummationMethod summationMethod, - long seed, - Class type) { - this( - tf, - name, - DEFAULT_NUM_THRESHOLDS, - curve, - summationMethod, - thresholds, - false, - null, - seed, - type); - } - - /** - * Creates an AUC (Area under the curve) metric. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if name is null then use {@link #DEFAULT_NAME}. - * @param numThresholds the number of thresholds to use when discretizing the roc curve. This - * includes the bracketing 0 and 1 thresholds, so the value must be ≥ 2. - * @param curve specifies the type of the curve to be computed, {@link AUCCurve#ROC} or {@link - * AUCCurve#PR} for the Precision-Recall-curve. - * @param summationMethod Specifies the Riemann summation method used - * @param thresholds Optional values to use as the thresholds for discretizing the curve. If set, - * the numThresholds parameter is ignored. Values should be in [0, 1]. This method - * automatically brackets the provided {@code thresholds} with a (-{@link #EPSILON}) below and - * a (1 + {@link #EPSILON}) above. - * @param multiLabel boolean indicating whether multilabel data should be treated as such, wherein - * AUC is computed separately for each label and then averaged across labels, or (when false) - * if the data should be flattened into a single label before AUC computation. In the latter - * case, when multilabel data is passed to AUC, each label-prediction pair is treated as an - * individual data point. Should be set to {@code false} for multi-class data. - * @param labelWeights non-negative weights used to compute AUCs for multilabel data. When {@code - * multiLabel} is true, the weights are applied to the individual label AUCs when they are - * averaged to produce the multi-label AUC. When it's false, they are used to weight the - * individual label predictions in computing the confusion matrix on the flattened data. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the confusion matrix variables. - * @throws IllegalArgumentException if numThresholds is less than 2 and thresholds is null, or if - * a threshold value is less than 0 or greater than 1. - */ - public AUC( - Ops tf, - String name, - int numThresholds, - AUCCurve curve, - AUCSummationMethod summationMethod, - float[] thresholds, - boolean multiLabel, - Operand labelWeights, - long seed, - Class type) { - this( - name, - numThresholds, - curve, - summationMethod, - thresholds, - multiLabel, - labelWeights, - seed, - type); - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - setTensorFlowOps(tf); - if (labelWeights != null) { - // assert that labelWeights are non-negative. - Op checks = - getTF() - .withSubScope("AUC") - .assertThat( - getTF() - .math - .greaterEqual(labelWeights, cast(tf, tf.constant(0), labelWeights.type())), - Collections.singletonList( - tf.constant("All values of labelWeights must be non-negative."))); - - Ops ltf = - tf.withSubScope("updateState").withControlDependencies(Collections.singletonList(checks)); - - this.labelWeights = ltf.identity(this.labelWeights); + if (this.tf == null) { + setTensorFlowOps(tf); + if (labelWeights != null) { + // assert that labelWeights are non-negative. + Op checks = + getTF() + .withSubScope("AUC") + .assertThat( + getTF() + .math + .greaterEqual(labelWeights, cast(tf, tf.constant(0), labelWeights.type())), + Collections.singletonList( + tf.constant("All values of labelWeights must be non-negative."))); + + Ops ltf = + tf.withSubScope("updateState") + .withControlDependencies(Collections.singletonList(checks)); + + this.labelWeights = ltf.identity(this.labelWeights); + } + applyOnInit(); } - applyOnInit(); return getTF(); } @@ -1090,23 +666,27 @@ private Map> build(Shape shape) { // Create metric variables Zeros zeros = new Zeros<>(); - Operand zero = zeros.call(tf, tf.constant(variableShape), type); + Operand zero = zeros.call(tf, tf.constant(variableShape), getResultType()); if (truePositives == null) { + variablesNeedAssign = true; truePositives = tf.withName(getTruePositivesName()).variable(zero); initializers.put(ConfusionMatrixEnum.TRUE_POSITIVES, tf.assign(truePositives, zero)); } if (falsePositives == null) { + variablesNeedAssign = true; falsePositives = tf.withName(getFalsePositivesName()).variable(zero); initializers.put(ConfusionMatrixEnum.FALSE_POSITIVES, tf.assign(falsePositives, zero)); } if (trueNegatives == null) { + variablesNeedAssign = true; trueNegatives = tf.withName(getTrueNegativesName()).variable(zero); initializers.put(ConfusionMatrixEnum.TRUE_NEGATIVES, tf.assign(trueNegatives, zero)); } if (falseNegatives == null) { + variablesNeedAssign = true; falseNegatives = tf.withName(getFalseNegativesName()).variable(zero); initializers.put(ConfusionMatrixEnum.FALSE_NEGATIVES, tf.assign(falseNegatives, zero)); } @@ -1130,13 +710,15 @@ private Map> build(Shape shape) { @Override @SuppressWarnings("unchecked") public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, type); - Operand tPredictions = cast(tf, predictions, type); - Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + Operand tSampleWeights = + sampleWeights != null ? cast(getTF(), sampleWeights, getResultType()) : null; List updateOperations = new ArrayList<>(); Map> varInitializers = Collections.EMPTY_MAP; if (!initialized) { @@ -1158,7 +740,7 @@ public List updateStateList( symbols.add(new SymbolicShape<>(getLabelWeights(), "L")); } updateOperations.addAll( - MetricsHelper.assertShapes(tf, symbols, "Number of labels is not consistent.")); + MetricsHelper.assertShapes(getTF(), symbols, "Number of labels is not consistent.")); } Map> confusionMatrix = new HashMap<>(); @@ -1172,17 +754,19 @@ public List updateStateList( // handled in AUC.result updateOperations.addAll( MetricsHelper.updateConfusionMatrixVariables( - tf, + getTF(), + variablesNeedAssign, confusionMatrix, varInitializers, tLabels, tPredictions, - tf.constant(thresholds), + getTF().constant(thresholds), null, null, tSampleWeights, isMultiLabel(), isMultiLabel() ? null : getLabelWeights())); + variablesNeedAssign = false; return updateOperations; } @@ -1321,8 +905,15 @@ private Operand interpolatePRAuc() { /** {@inheritDoc} */ @Override - public Operand result() { - Ops tf = checkTF(); + public Operand result(Ops tf) { + init(tf); + if (truePositives == null + || falsePositives == null + || trueNegatives == null + || falseNegatives == null + || variablesNeedAssign) { + return getResultZero(); + } if (getCurve() == AUCCurve.PR && getSummationMethod() == AUCSummationMethod.INTERPOLATION) { // This use case is different and is handled separately. return interpolatePRAuc(); @@ -1330,15 +921,16 @@ public Operand result() { Operand x; Operand y; - Operand recall = tf.math.divNoNan(truePositives, tf.math.add(truePositives, falseNegatives)); + Operand recall = + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falseNegatives)); switch (getCurve()) { case ROC: - x = tf.math.divNoNan(falsePositives, tf.math.add(falsePositives, trueNegatives)); + x = getTF().math.divNoNan(falsePositives, getTF().math.add(falsePositives, trueNegatives)); y = recall; break; case PR: - y = tf.math.divNoNan(truePositives, tf.math.add(truePositives, falsePositives)); + y = getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falsePositives)); x = recall; break; default: @@ -1354,13 +946,18 @@ public Operand result() { Operand heights; switch (getSummationMethod()) { case INTERPOLATION: - heights = tf.math.div(tf.math.add(ySlice1, ySlice2), cast(tf, tf.constant(2), y.type())); + heights = + getTF() + .math + .div( + getTF().math.add(ySlice1, ySlice2), + cast(getTF(), getTF().constant(2), y.type())); break; case MINORING: - heights = tf.math.minimum(ySlice1, ySlice2); + heights = getTF().math.minimum(ySlice1, ySlice2); break; case MAJORING: - heights = tf.math.maximum(ySlice1, ySlice2); + heights = getTF().math.maximum(ySlice1, ySlice2); break; default: throw new IllegalArgumentException( @@ -1369,112 +966,182 @@ public Operand result() { if (isMultiLabel()) { Operand riemannTerms = - tf.math.mul(tf.math.sub(slice(x, 0, getNumThresholds() - 1), slice(x, 1, -1)), heights); - Operand byLabelAuc = tf.reduceSum(riemannTerms, tf.constant(0)); + getTF() + .math + .mul(getTF().math.sub(slice(x, 0, getNumThresholds() - 1), slice(x, 1, -1)), heights); + Operand byLabelAuc = getTF().reduceSum(riemannTerms, getTF().constant(0)); if (getLabelWeights() == null) { - return MetricsHelper.mean(tf, byLabelAuc); + return MetricsHelper.mean(getTF(), byLabelAuc); } else { // Weighted average of the label AUCs. - return tf.math.divNoNan( - tf.reduceSum( - tf.math.mul(byLabelAuc, getLabelWeights()), allAxes(tf, getLabelWeights())), - tf.reduceSum(getLabelWeights(), allAxes(tf, getLabelWeights()))); + return getTF() + .math + .divNoNan( + getTF() + .reduceSum( + getTF().math.mul(byLabelAuc, getLabelWeights()), + allAxes(getTF(), getLabelWeights())), + getTF().reduceSum(getLabelWeights(), allAxes(getTF(), getLabelWeights()))); } } else { Operand slice1 = slice(x, 0, getNumThresholds() - 1); Operand slice2 = slice(x, 1, -1); - Operand sub = tf.math.sub(slice1, slice2); - Operand operand = tf.math.mul(sub, heights); - return tf.reduceSum(operand, allAxes(tf, operand)); + Operand sub = getTF().math.sub(slice1, slice2); + Operand operand = getTF().math.mul(sub, heights); + return getTF().reduceSum(operand, allAxes(tf, operand)); } } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); List updateOperations = new ArrayList<>(initializers.values()); return checkTF().withSubScope("resetStates").withControlDependencies(updateOperations).noOp(); } - /** @return the numThresholds */ + /** + * Gets the numThresholds + * + * @return the numThresholds + */ public int getNumThresholds() { return numThresholds; } - /** @return the curve */ + /** + * Gets the AUC curve + * + * @return the AUC curve + */ public AUCCurve getCurve() { return curve; } - /** @return the summationMethod */ + /** + * Gets the summationMethod + * + * @return the summationMethod + */ public AUCSummationMethod getSummationMethod() { return summationMethod; } - /** @return the thresholds */ + /** + * Gets the thresholds + * + * @return the thresholds + */ public float[] getThresholds() { return thresholds; } - /** @return the multiLabel */ + /** + * Gets the multiLabel indicator + * + * @return the multiLabel indicator + */ public boolean isMultiLabel() { return multiLabel; } - /** @return the numLabels */ + /** + * Gets the number of Labels + * + * @return the numLabels + */ public Integer getNumLabels() { return numLabels; } - /** @param numLabels the numLabels to set */ + /** + * Set the number of Labels + * + * @param numLabels the numLabels to set + */ public void setNumLabels(Integer numLabels) { this.numLabels = numLabels; } - /** @return the labelWeights */ + /** + * Gets the labelWeights + * + * @return the labelWeights + */ public Operand getLabelWeights() { return labelWeights; } - /** @return the truePositives */ + /** + * Gets the truePositives variable + * + * @return the truePositives variable + */ public Variable getTruePositives() { return truePositives; } - /** @return the falsePositives */ + /** + * Gets the falsePositives variable + * + * @return the falsePositives variable + */ public Variable getFalsePositives() { return falsePositives; } - /** @return the trueNegatives */ + /** + * Gets the trueNegatives variable + * + * @return the trueNegatives variable + */ public Variable getTrueNegatives() { return trueNegatives; } - /** @return the falseNegatives */ + /** + * Gets the falseNegatives variable + * + * @return the falseNegatives variable + */ public Variable getFalseNegatives() { return falseNegatives; } - /** @return the truePositivesName */ + /** + * Gets the truePositives variable name + * + * @return the truePositivesName + */ public String getTruePositivesName() { return truePositivesName; } - /** @return the falsePositivesName */ + /** + * Gets the falsePositives variable name + * + * @return the falsePositivesName + */ public String getFalsePositivesName() { return falsePositivesName; } - /** @return the trueNegativesName */ + /** + * Gets the trueNegatives variable name + * + * @return the trueNegativesName + */ public String getTrueNegativesName() { return trueNegativesName; } - /** @return the falseNegativesName */ + /** + * Gets the falseNegative variable name + * + * @return the falseNegativesName + */ public String getFalseNegativesName() { return falseNegativesName; } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java index 2e0d79aa47f..5a067b289e9 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Accuracy.java @@ -43,10 +43,10 @@ public class Accuracy extends MeanMetricWrapper implements * * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables + * @param type the data type for the metric result and the metric variables */ public Accuracy(long seed, Class type) { - this((String) null, seed, type); + this(null, seed, type); } /** @@ -55,39 +55,13 @@ public Accuracy(long seed, Class type) { * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables + * @param type resultType the data type for the metric result and the metric variables */ public Accuracy(String name, long seed, Class type) { super(name, seed, type); setLoss(this); } - /** - * Creates an Accuracy Metric using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Accuracy(Ops tf, long seed, Class type) { - this(tf, null, seed, type); - } - - /** - * Creates an Accuracy Metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Accuracy(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); - } - /** * Calculates how often predictions equals labels. {@code labels} and {@code predictions} must * have compatible shapes, see {@link Shape @isCompatibleWith}. @@ -99,12 +73,12 @@ public Accuracy(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); LossTuple tuple = - MetricsHelper.raggedAssertCompatibleAndGetFlatValues(tf, tLabels, tPredictions); + MetricsHelper.raggedAssertCompatibleAndGetFlatValues(getTF(), tLabels, tPredictions); tLabels = tuple.getLabels(); tPredictions = tuple.getTarget(); @@ -116,6 +90,6 @@ public Operand call( } // cast TBool to result type - return cast(tf, tf.math.equal(tLabels, tPredictions), getResultType()); + return cast(getTF(), getTF().math.equal(tLabels, tPredictions), getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java index 3b072393468..5495184ee6b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryAccuracy.java @@ -50,7 +50,7 @@ public class BinaryAccuracy extends MeanMetricWrapper * @param type the data type for the variables */ public BinaryAccuracy(long seed, Class type) { - this((String) null, DEFAULT_THRESHOLD, seed, type); + this(null, DEFAULT_THRESHOLD, seed, type); } /** @@ -62,7 +62,7 @@ public BinaryAccuracy(long seed, Class type) { * @param type the data type for the variables */ public BinaryAccuracy(float threshold, long seed, Class type) { - this((String) null, threshold, seed, type); + this(null, threshold, seed, type); } /** @@ -80,47 +80,6 @@ public BinaryAccuracy(String name, float threshold, long seed, Class type) { setLoss(this); } - /** - * Creates a BinaryAccuracy Metric using {@link Class#getSimpleName()} for the metric name and - * {@link #DEFAULT_THRESHOLD} for the threshold value. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public BinaryAccuracy(Ops tf, long seed, Class type) { - this(tf, null, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a BinaryAccuracy Metric using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param threshold a threshold for deciding whether prediction values are 1 or 0 - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public BinaryAccuracy(Ops tf, float threshold, long seed, Class type) { - this(tf, null, threshold, seed, type); - } - - /** - * Creates a BinaryAccuracy Metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param threshold a threshold for deciding whether prediction values are 1 or 0 - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public BinaryAccuracy(Ops tf, String name, float threshold, long seed, Class type) { - this(name, threshold, seed, type); - init(tf); - } - /** * Calculates how often predictions match binary labels. * @@ -130,12 +89,13 @@ public BinaryAccuracy(Ops tf, String name, float threshold, long seed, Class */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tPredictions = cast(tf, predictions, getResultType()); - Operand thresholdCast = cast(tf, getTF().constant(threshold), getResultType()); - tPredictions = cast(tf, tf.math.greater(tPredictions, thresholdCast), getResultType()); - Operand tLabels = cast(tf, labels, getResultType()); - return cast(tf, tf.math.equal(tLabels, tPredictions), getResultType()); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + Operand thresholdCast = cast(getTF(), getTF().constant(threshold), getResultType()); + tPredictions = + cast(getTF(), getTF().math.greater(tPredictions, thresholdCast), getResultType()); + Operand tLabels = cast(getTF(), labels, getResultType()); + return cast(getTF(), getTF().math.equal(tLabels, tPredictions), getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java index d575ca6bc83..a740d130ebd 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/BinaryCrossentropy.java @@ -38,9 +38,8 @@ public class BinaryCrossentropy extends MeanMetricWrapper private final float labelSmoothing; /** - * Creates a BinaryCrossentropy metric + * Creates a BinaryCrossentropy metric using {@link Class#getSimpleName()} for the metric name * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. * @param labelSmoothing value used to smooth labels, When 0, no smoothing occurs. When > 0, @@ -51,18 +50,13 @@ public class BinaryCrossentropy extends MeanMetricWrapper * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public BinaryCrossentropy( - String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { - super(name, seed, type); - setLoss(this); - this.fromLogits = fromLogits; - this.labelSmoothing = labelSmoothing; + public BinaryCrossentropy(boolean fromLogits, float labelSmoothing, long seed, Class type) { + this(null, fromLogits, labelSmoothing, seed, type); } /** * Creates a BinaryCrossentropy metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. @@ -75,9 +69,11 @@ public BinaryCrossentropy( * @param type the type for the variables and result */ public BinaryCrossentropy( - Ops tf, String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { - this(name, fromLogits, labelSmoothing, seed, type); - init(tf); + String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { + super(name, seed, type); + setLoss(this); + this.fromLogits = fromLogits; + this.labelSmoothing = labelSmoothing; } /** @@ -90,10 +86,10 @@ public BinaryCrossentropy( */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.binaryCrossentropy(tf, tLabels, tPredictions, fromLogits, labelSmoothing); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.binaryCrossentropy(getTF(), tLabels, tPredictions, fromLogits, labelSmoothing); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java index 0d6ff86b41a..15361194479 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalAccuracy.java @@ -54,7 +54,7 @@ public class CategoricalAccuracy extends MeanMetricWrapper * @param type the data type for the variables */ public CategoricalAccuracy(long seed, Class type) { - this((String) null, seed, type); + this(null, seed, type); } /** @@ -70,32 +70,6 @@ public CategoricalAccuracy(String name, long seed, Class type) { super.setLoss(this); } - /** - * Creates a CategoricalAccuracy metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public CategoricalAccuracy(Ops tf, long seed, Class type) { - this(tf, null, seed, type); - } - - /** - * Creates a CategoricalAccuracy metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public CategoricalAccuracy(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); - } - /** * Computes the categorical crossentropy loss. * @@ -109,11 +83,11 @@ public CategoricalAccuracy(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand trueMax = tf.math.argMax(labels, tf.constant(-1)); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand trueMax = getTF().math.argMax(labels, getTF().constant(-1)); - Operand predMax = tf.math.argMax(predictions, tf.constant(-1)); - return cast(tf, tf.math.equal(trueMax, predMax), getResultType()); + Operand predMax = getTF().math.argMax(predictions, getTF().constant(-1)); + return cast(getTF(), getTF().math.equal(trueMax, predMax), getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java index 27c281f5d51..2a08a3271b1 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalCrossentropy.java @@ -42,11 +42,10 @@ public class CategoricalCrossentropy extends MeanMetricWrappe /** * Creates a CategoricalCrossentropy metric that computes the crossentropy metric between the - * labels and predictions. + * labels and predictions using a metric name based on {@link Class#getSimpleName()}. * *

Uses a {@link Losses#CHANNELS_LAST} for the channel axis. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values oras opposed to * a probability distribution. * @param labelSmoothing value used to smooth labels, When > 0, label values are smoothed, @@ -58,15 +57,14 @@ public class CategoricalCrossentropy extends MeanMetricWrappe * @param type the type for the variables and result */ public CategoricalCrossentropy( - String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { - this(name, fromLogits, labelSmoothing, Losses.CHANNELS_LAST, seed, type); + boolean fromLogits, float labelSmoothing, long seed, Class type) { + this(null, fromLogits, labelSmoothing, Losses.CHANNELS_LAST, seed, type); } /** * Creates a CategoricalCrossentropy metric that computes the crossentropy metric between the - * labels and predictions. + * labels and predictions using a metric name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. * @param labelSmoothing value used to smooth labels, When > 0, label values are smoothed, @@ -81,12 +79,8 @@ public CategoricalCrossentropy( * @param type the type for the variables and result */ public CategoricalCrossentropy( - String name, boolean fromLogits, float labelSmoothing, int axis, long seed, Class type) { - super(name, seed, type); - setLoss(this); - this.fromLogits = fromLogits; - this.labelSmoothing = labelSmoothing; - this.axis = axis; + boolean fromLogits, float labelSmoothing, int axis, long seed, Class type) { + this(null, fromLogits, labelSmoothing, axis, seed, type); } /** @@ -95,7 +89,6 @@ public CategoricalCrossentropy( * *

Uses a {@link Losses#CHANNELS_LAST} for the channel axis. * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values oras opposed to * a probability distribution. @@ -108,15 +101,14 @@ public CategoricalCrossentropy( * @param type the type for the variables and result */ public CategoricalCrossentropy( - Ops tf, String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { - this(tf, name, fromLogits, labelSmoothing, Losses.CHANNELS_LAST, seed, type); + String name, boolean fromLogits, float labelSmoothing, long seed, Class type) { + this(name, fromLogits, labelSmoothing, Losses.CHANNELS_LAST, seed, type); } /** * Creates a CategoricalCrossentropy metric that computes the crossentropy metric between the * labels and predictions. * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. @@ -132,15 +124,12 @@ public CategoricalCrossentropy( * @param type the type for the variables and result */ public CategoricalCrossentropy( - Ops tf, - String name, - boolean fromLogits, - float labelSmoothing, - int axis, - long seed, - Class type) { - this(name, fromLogits, labelSmoothing, axis, seed, type); - init(tf); + String name, boolean fromLogits, float labelSmoothing, int axis, long seed, Class type) { + super(name, seed, type); + setLoss(this); + this.fromLogits = fromLogits; + this.labelSmoothing = labelSmoothing; + this.axis = axis; } /** @@ -152,11 +141,11 @@ public CategoricalCrossentropy( */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); return Losses.categoricalCrossentropy( - tf, tLabels, tPredictions, fromLogits, labelSmoothing, axis); + getTF(), tLabels, tPredictions, fromLogits, labelSmoothing, axis); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java index ed6bf3f1670..e5e6cdf1d5f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CategoricalHinge.java @@ -32,30 +32,27 @@ public class CategoricalHinge extends MeanMetricWrapper implements LossMetric { /** - * Creates a CategoricalHinge metric + * Creates a CategoricalHinge metric using an name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CategoricalHinge(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public CategoricalHinge(long seed, Class type) { + this(null, seed, type); } /** * Creates a CategoricalHinge metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CategoricalHinge(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public CategoricalHinge(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -67,10 +64,10 @@ public CategoricalHinge(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); + Ops tf, Operand labels, Operand predictions) { + init(tf); Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.categoricalHinge(tf, tLabels, tPredictions); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.categoricalHinge(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java index 6cb6704966f..2f3f215733d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/CosineSimilarity.java @@ -48,84 +48,77 @@ public class CosineSimilarity extends MeanMetricWrapper /** * Creates a metric that computes the cosine similarity metric between labels and predictions with - * a default axis, {@link #DEFAULT_AXIS} + * a default axis, {@link #DEFAULT_AXIS} and using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CosineSimilarity(String name, long seed, Class type) { - this(name, DEFAULT_AXIS, seed, type); + public CosineSimilarity(long seed, Class type) { + this(null, DEFAULT_AXIS, seed, type); } /** - * Creates a metric that computes the cosine similarity metric between labels and predictions. + * Creates a metric that computes the cosine similarity metric between labels and predictions + * using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param axis The dimension along which the cosine similarity is computed. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CosineSimilarity(String name, int axis, long seed, Class type) { - this(name, new int[] {axis}, seed, type); + public CosineSimilarity(int axis, long seed, Class type) { + this(null, new int[] {axis}, seed, type); } /** - * Creates a CosineSimilarity metric + * Creates a CosineSimilarity metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param axis The dimension along which the cosine similarity is computed. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CosineSimilarity(String name, int[] axis, long seed, Class type) { - super(name, seed, type); - this.axis = axis; - setLoss(this); + public CosineSimilarity(int[] axis, long seed, Class type) { + this(null, axis, seed, type); } - /** * Creates a metric that computes the cosine similarity metric between labels and predictions with * a default axis, {@link #DEFAULT_AXIS} * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CosineSimilarity(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_AXIS, seed, type); + public CosineSimilarity(String name, long seed, Class type) { + this(name, DEFAULT_AXIS, seed, type); } /** * Creates a metric that computes the cosine similarity metric between labels and predictions. * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param axis The dimension along which the cosine similarity is computed. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CosineSimilarity(Ops tf, String name, int axis, long seed, Class type) { - this(tf, name, new int[] {axis}, seed, type); + public CosineSimilarity(String name, int axis, long seed, Class type) { + this(name, new int[] {axis}, seed, type); } /** * Creates a CosineSimilarity metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param axis The dimension along which the cosine similarity is computed. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public CosineSimilarity(Ops tf, String name, int[] axis, long seed, Class type) { - this(name, axis, seed, type); - init(tf); + public CosineSimilarity(String name, int[] axis, long seed, Class type) { + super(name, seed, type); + this.axis = axis; + setLoss(this); } /** @@ -137,12 +130,12 @@ public CosineSimilarity(Ops tf, String name, int[] axis, long seed, Class typ */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); + Ops tf, Operand labels, Operand predictions) { + init(tf); // NOTE: metrics.CosineSimilarity is Losses.cosineSimilarity, // while losses.CosineSimilarity is the negative of Losses.cosineSimilarity - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.cosineSimilarity(tf, tLabels, tPredictions, axis); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.cosineSimilarity(getTF(), tLabels, tPredictions, axis); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java index 6592e011377..6f121fd307f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalseNegatives.java @@ -16,7 +16,6 @@ import org.tensorflow.framework.metrics.impl.ConfusionMatrixConditionCount; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; -import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -42,7 +41,7 @@ public class FalseNegatives extends ConfusionMatrixConditionC * @param type the data type for the variables */ public FalseNegatives(long seed, Class type) { - this((String) null, DEFAULT_THRESHOLD, seed, type); + this(null, DEFAULT_THRESHOLD, seed, type); } /** @@ -57,7 +56,7 @@ public FalseNegatives(long seed, Class type) { * @param type the data type for the variables */ public FalseNegatives(float threshold, long seed, Class type) { - this((String) null, new float[] {threshold}, seed, type); + this(null, new float[] {threshold}, seed, type); } /** @@ -72,7 +71,7 @@ public FalseNegatives(float threshold, long seed, Class type) { * @param type the data type for the variables */ public FalseNegatives(float[] thresholds, long seed, Class type) { - this((String) null, thresholds, seed, type); + this(null, thresholds, seed, type); } /** @@ -118,97 +117,4 @@ public FalseNegatives(String name, float threshold, long seed, Class type) { public FalseNegatives(String name, float[] thresholds, long seed, Class type) { super(name, ConfusionMatrixEnum.FALSE_NEGATIVES, thresholds, seed, type); } - - /** - * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name and a - * default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalseNegatives(Ops tf, long seed, Class type) { - this(tf, null, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalseNegatives(Ops tf, float threshold, long seed, Class type) { - this(tf, null, new float[] {threshold}, seed, type); - } - - /** - * Creates a FalseNegatives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalseNegatives(Ops tf, float[] thresholds, long seed, Class type) { - this(tf, null, thresholds, seed, type); - } - - /** - * Creates a FalseNegatives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalseNegatives(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a FalseNegatives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalseNegatives(Ops tf, String name, float threshold, long seed, Class type) { - this(tf, name, new float[] {threshold}, seed, type); - } - - /** - * Creates a FalseNegatives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalseNegatives(Ops tf, String name, float[] thresholds, long seed, Class type) { - this(name, thresholds, seed, type); - init(tf); - } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java index f24922a8d20..a072c53fced 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/FalsePositives.java @@ -16,7 +16,6 @@ import org.tensorflow.framework.metrics.impl.ConfusionMatrixConditionCount; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; -import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -42,7 +41,7 @@ public class FalsePositives extends ConfusionMatrixConditionC * @param type the data type for the variables */ public FalsePositives(long seed, Class type) { - this((String) null, DEFAULT_THRESHOLD, seed, type); + this(null, DEFAULT_THRESHOLD, seed, type); } /** @@ -57,7 +56,7 @@ public FalsePositives(long seed, Class type) { * @param type the data type for the variables */ public FalsePositives(float threshold, long seed, Class type) { - this((String) null, new float[] {threshold}, seed, type); + this(null, new float[] {threshold}, seed, type); } /** @@ -72,7 +71,7 @@ public FalsePositives(float threshold, long seed, Class type) { * @param type the data type for the variables */ public FalsePositives(float[] thresholds, long seed, Class type) { - this((String) null, thresholds, seed, type); + this(null, thresholds, seed, type); } /** @@ -118,97 +117,4 @@ public FalsePositives(String name, float threshold, long seed, Class type) { public FalsePositives(String name, float[] thresholds, long seed, Class type) { super(name, ConfusionMatrixEnum.FALSE_POSITIVES, thresholds, seed, type); } - - /** - * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name and a - * default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalsePositives(Ops tf, long seed, Class type) { - this(tf, null, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalsePositives(Ops tf, float threshold, long seed, Class type) { - this(tf, null, new float[] {threshold}, seed, type); - } - - /** - * Creates a FalsePositives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalsePositives(Ops tf, float[] thresholds, long seed, Class type) { - this(tf, null, thresholds, seed, type); - } - - /** - * Creates a FalsePositives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalsePositives(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a FalsePositives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalsePositives(Ops tf, String name, float threshold, long seed, Class type) { - this(tf, name, new float[] {threshold}, seed, type); - } - - /** - * Creates a FalsePositives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public FalsePositives(Ops tf, String name, float[] thresholds, long seed, Class type) { - this(name, thresholds, seed, type); - init(tf); - } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java index 41abecccd06..8986a8a7775 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Hinge.java @@ -31,30 +31,27 @@ public class Hinge extends MeanMetricWrapper implements LossMetric { /** - * Creates a Hinge metric + * Creates a Hinge metric using an name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public Hinge(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public Hinge(long seed, Class type) { + this(null, seed, type); } /** * Creates a Hinge metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public Hinge(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public Hinge(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -66,10 +63,10 @@ public Hinge(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.hinge(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.hinge(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java index d1e46d32e05..c9075e12ca2 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/KLDivergence.java @@ -32,30 +32,26 @@ public class KLDivergence extends MeanMetricWrapper implements LossMetric { /** - * Creates a KLDivergence metric + * Creates a KLDivergence metric using an name based on @link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public KLDivergence(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public KLDivergence(long seed, Class type) { + this(null, seed, type); } - /** * Creates a KLDivergence metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public KLDivergence(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public KLDivergence(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -67,10 +63,10 @@ public KLDivergence(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.kullbackLeiblerDivergence(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.kullbackLeiblerDivergence(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java index b5bb709ec9b..bbc2b3cbcb7 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/LogCoshError.java @@ -32,30 +32,27 @@ public class LogCoshError extends MeanMetricWrapper implements LossMetric { /** - * Creates a LogCoshError metric + * Creates a LogCoshError metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public LogCoshError(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public LogCoshError(long seed, Class type) { + this(null, seed, type); } /** * Creates a LogCoshError metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public LogCoshError(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public LogCoshError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -67,10 +64,10 @@ public LogCoshError(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.logCosh(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.logCosh(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java index 789204e6ce0..77ec085d11f 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Mean.java @@ -15,7 +15,6 @@ package org.tensorflow.framework.metrics; import org.tensorflow.framework.metrics.impl.Reduce; -import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -26,27 +25,26 @@ public class Mean extends Reduce { /** - * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} + * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} using name + * based on {@link Class#getSimpleName()}. * - * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - protected Mean(String name, long seed, Class type) { - super(name, MetricReduction.WEIGHTED_MEAN, seed, type); + protected Mean(long seed, Class type) { + this(null, seed, type); } /** * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} * - * @param tf the TensorFlow Ops * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - protected Mean(Ops tf, String name, long seed, Class type) { - super(tf, name, MetricReduction.WEIGHTED_MEAN, seed, type); + protected Mean(String name, long seed, Class type) { + super(name, MetricReduction.WEIGHTED_MEAN, seed, type); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java index 8cdf60d4ffe..c4b6fb7967a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsoluteError.java @@ -32,30 +32,27 @@ public class MeanAbsoluteError extends MeanMetricWrapper implements LossMetric { /** - * Creates a Mean Absolute Error metric + * Creates a Mean Absolute Error metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanAbsoluteError(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public MeanAbsoluteError(long seed, Class type) { + this(null, seed, type); } /** * Creates a Mean Absolute Error metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanAbsoluteError(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public MeanAbsoluteError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -67,10 +64,10 @@ public MeanAbsoluteError(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.meanAbsoluteError(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.meanAbsoluteError(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java index e17eeba2e0f..1c87b50a574 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageError.java @@ -32,30 +32,27 @@ public class MeanAbsolutePercentageError extends MeanMetricWr implements LossMetric { /** - * Creates a Mean Absolute Error metric + * Creates a Mean Absolute Error metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanAbsolutePercentageError(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public MeanAbsolutePercentageError(long seed, Class type) { + this(null, seed, type); } /** * Creates a Mean Absolute Error metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanAbsolutePercentageError(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public MeanAbsolutePercentageError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -67,10 +64,10 @@ public MeanAbsolutePercentageError(Ops tf, String name, long seed, Class type */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.meanAbsolutePercentageError(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.meanAbsolutePercentageError(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java index ed885f62623..50e9c6a1c43 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanIoU.java @@ -45,9 +45,10 @@ */ public class MeanIoU extends Metric { + /** Tname of the totalConfusionMatrix variable */ public static final String TOTAL_CONFUSION_MATRIX = "TOTAL_CONFUSION_MATRIX"; + private final String totalCMName; - private final Class type; /** * The possible number of labels the prediction task can have. This value must be provided, since * a confusion matrix of dimension = [numClasses, numClasses] will be allocated. @@ -66,7 +67,7 @@ public class MeanIoU extends Metric { * @param type the data type for the variables */ protected MeanIoU(long numClasses, long seed, Class type) { - this((String) null, numClasses, seed, type); + this(null, numClasses, seed, type); } /** @@ -79,65 +80,40 @@ protected MeanIoU(long numClasses, long seed, Class type) { * @param type the data type for the variables */ protected MeanIoU(String name, long numClasses, long seed, Class type) { - super(name, seed); - this.type = type; + super(name, seed, type); this.totalCMName = this.getVariableName(TOTAL_CONFUSION_MATRIX); this.numClasses = numClasses; } - /** - * Creates a metric MeanIoU, using name as {@link Class#getSimpleName()} - * - * @param tf the TensorFlow Ops - * @param numClasses The possible number of labels the prediction task can have - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - protected MeanIoU(Ops tf, long numClasses, long seed, Class type) { - this(tf, null, numClasses, seed, type); - } - - /** - * Creates a MeanIoU metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param numClasses The possible number of labels the prediction task can have - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - protected MeanIoU(Ops tf, String name, long numClasses, long seed, Class type) { - this(name, numClasses, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - setTensorFlowOps(tf); - Shape variableShape = Shape.of(numClasses, numClasses); - - if (totalConfusionMatrix == null) { - Zeros zeros = new Zeros<>(); - totalConfusionMatrix = - getTF() - .withName(totalCMName) - .variable(zeros.call(getTF(), getTF().constant(variableShape), type)); - initializer = - getTF() - .assign( - totalConfusionMatrix, zeros.call(getTF(), getTF().constant(variableShape), type)); + if (this.tf == null) { + setTensorFlowOps(tf); + Shape variableShape = Shape.of(numClasses, numClasses); + + if (totalConfusionMatrix == null) { + variablesNeedAssign = true; + Zeros zeros = new Zeros<>(); + totalConfusionMatrix = + getTF() + .withName(totalCMName) + .variable(zeros.call(getTF(), getTF().constant(variableShape), getResultType())); + initializer = + getTF() + .assign( + totalConfusionMatrix, + zeros.call(getTF(), getTF().constant(variableShape), getResultType())); + } + applyOnInit(); } - applyOnInit(); return getTF(); } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); return initializer; } @@ -163,9 +139,11 @@ public Assign getInitializer() { */ @Override public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { + init(tf); if (sampleWeights != null) { long weightsRank = sampleWeights.shape().numDimensions(); long labelsRank = labels.shape().numDimensions(); @@ -188,15 +166,16 @@ public List updateStateList( labelsSize, predictionsSize)); } - Operand tLabels = cast(getTF(), labels, type); + Operand tLabels = cast(getTF(), labels, getResultType()); if (tLabels.shape().numDimensions() > 1) { tLabels = getTF().shape.flatten(tLabels); } - Operand tPredictions = cast(getTF(), predictions, type); + Operand tPredictions = cast(getTF(), predictions, getResultType()); if (tPredictions.shape().numDimensions() > 1) { tPredictions = getTF().shape.flatten(tPredictions); } - Operand tSampleWeights = sampleWeights != null ? cast(getTF(), sampleWeights, type) : null; + Operand tSampleWeights = + sampleWeights != null ? cast(getTF(), sampleWeights, getResultType()) : null; if (tSampleWeights != null && tSampleWeights.shape().numDimensions() > 1) { tSampleWeights = getTF().shape.flatten(tSampleWeights); } @@ -204,31 +183,52 @@ public List updateStateList( // Accumulate the prediction to current confusion matrix. Operand currentCM = MetricsHelper.confusionMatrix( - getTF(), tLabels, tPredictions, getTF().constant(numClasses), tSampleWeights, type); - return Collections.singletonList(getTF().assignAdd(totalConfusionMatrix, currentCM)); + getTF(), + tLabels, + tPredictions, + getTF().constant(numClasses), + tSampleWeights, + getResultType()); + Operand assign = + variablesNeedAssign + ? getTF().assign(totalConfusionMatrix, currentCM) + : getTF().assignAdd(totalConfusionMatrix, currentCM); + variablesNeedAssign = false; + return Collections.singletonList(assign); } /** {@inheritDoc} */ @Override - public Operand result() { - Ops tf = getTF(); - Operand sumOverRow = tf.reduceSum(totalConfusionMatrix, tf.constant(0)); - Operand sumOverCol = tf.reduceSum(totalConfusionMatrix, tf.constant(1)); + public Operand result(Ops tf) { + init(tf); + if (totalConfusionMatrix == null || variablesNeedAssign) { + return getResultZero(); + } + Operand sumOverRow = getTF().reduceSum(totalConfusionMatrix, tf.constant(0)); + Operand sumOverCol = getTF().reduceSum(totalConfusionMatrix, tf.constant(1)); Operand truePositives = - tf.linalg.matrixDiagPart( - totalConfusionMatrix, - tf.constant(0), - cast(tf, tf.constant(0), totalConfusionMatrix.type())); + getTF() + .linalg + .matrixDiagPart( + totalConfusionMatrix, + getTF().constant(0), + cast(tf, tf.constant(0), totalConfusionMatrix.type())); // for each class, the total predictions + total labels - true positives // Observe that total predictions = tp + fp // total labels = tp + fn // So this is 2*tp + fp + fn - tp = tp + fp + fn - Operand denominator = tf.math.add(sumOverRow, tf.math.sub(sumOverCol, truePositives)); + Operand denominator = getTF().math.add(sumOverRow, tf.math.sub(sumOverCol, truePositives)); Operand numValidEntries = - tf.reduceSum( - tf.dtypes.cast( - tf.math.notEqual(denominator, cast(tf, tf.constant(0), denominator.type())), type), - allAxes(tf, denominator)); + getTF() + .reduceSum( + getTF() + .dtypes + .cast( + getTF() + .math + .notEqual(denominator, cast(tf, tf.constant(0), denominator.type())), + getResultType()), + allAxes(getTF(), denominator)); Operand iou = tf.math.divNoNan(truePositives, denominator); Operand iouSum = tf.reduceSum(iou, allAxes(tf, iou)); diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java index 817b019c949..c7caa7c545b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanRelativeError.java @@ -54,7 +54,7 @@ public class MeanRelativeError extends Mean { * @param type the type for the variables and result */ protected MeanRelativeError(float[] normalizer, long seed, Class type) { - this((String) null, normalizer, seed, type); + this(null, normalizer, seed, type); } /** @@ -83,7 +83,7 @@ protected MeanRelativeError(String name, float[] normalizer, long seed, Class * @param type the type for the variables and result */ protected MeanRelativeError(double[] normalizer, long seed, Class type) { - this((String) null, normalizer, seed, type); + this(null, normalizer, seed, type); } /** @@ -123,7 +123,7 @@ protected MeanRelativeError( * @param type the type for the variables and result */ protected MeanRelativeError(Operand normalizer, long seed, Class type) { - this((String) null, normalizer, seed, type); + this(null, normalizer, seed, type); } /** @@ -140,96 +140,15 @@ protected MeanRelativeError(String name, Operand normalizer, long seed, Class this.normalizer = normalizer; } - /** - * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name - * - * @param tf the TensorFlow Ops - * @param normalizer The normalizer values with same shape as predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanRelativeError(Ops tf, float[] normalizer, long seed, Class type) { - this(tf, null, cast(tf, tf.constant(normalizer), type), seed, type); - } - - /** - * Creates a MeanRelativeError metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param normalizer The normalizer values with same shape as predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanRelativeError(Ops tf, String name, float[] normalizer, long seed, Class type) { - this(tf, name, cast(tf, tf.constant(normalizer), type), seed, type); - } - - /** - * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name - * - * @param tf the TensorFlow Ops - * @param normalizer The normalizer values with same shape as predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanRelativeError(Ops tf, double[] normalizer, long seed, Class type) { - this(tf, null, cast(tf, tf.constant(normalizer), type), seed, type); - } - - /** - * Creates a MeanRelativeError metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param normalizer The normalizer values with same shape as predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanRelativeError(Ops tf, String name, double[] normalizer, long seed, Class type) { - this(tf, name, cast(tf, tf.constant(normalizer), type), seed, type); - } - - /** - * Creates a MeanRelativeError metric using {@link Class#getSimpleName()} as the name - * - * @param tf the TensorFlow Ops - * @param normalizer The normalizer values with same shape as predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanRelativeError(Ops tf, Operand normalizer, long seed, Class type) { - this(tf, null, normalizer, seed, type); - } - - /** - * Creates a MeanRelativeError metric - * - * @param tf the TensorFlow ops - * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param normalizer The normalizer values with same shape as predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanRelativeError( - Ops tf, String name, Operand normalizer, long seed, Class type) { - this(name, normalizer, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - super.init(tf); - if (normalizer == null) { - if (normalizerArray != null) { - normalizer = cast(getTF(), getTF().constant(normalizerArray), getResultType()); + if (this.tf == null) { + super.init(tf); + if (normalizer == null) { + if (normalizerArray != null) { + normalizer = cast(getTF(), getTF().constant(normalizerArray), getResultType()); + } } } return getTF(); @@ -247,9 +166,11 @@ public Ops init(Ops tf) { */ @Override public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { + init(tf); Operand tLabels = cast(getTF(), labels, getResultType()); Operand tPredictions = cast(getTF(), predictions, getResultType()); Operand tSampleWeights = @@ -275,7 +196,7 @@ public List updateStateList( .divNoNan( getTF().math.abs(getTF().math.sub(tLabels, tPredictions)), this.getNormalizer()); - return super.updateStateList(relativeErrors, tSampleWeights); + return super.updateStateList(getTF(), relativeErrors, tSampleWeights); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java index b23636a3d75..3a1d9f32a1a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredError.java @@ -45,30 +45,27 @@ public class MeanSquaredError extends MeanMetricWrapper implements LossMetric { /** - * Creates a Mean Absolute Error metric + * Creates a Mean Absolute Error metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanSquaredError(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public MeanSquaredError(long seed, Class type) { + this(null, seed, type); } /** * Creates a Mean Absolute Error metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanSquaredError(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public MeanSquaredError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -80,10 +77,10 @@ public MeanSquaredError(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.meanSquaredError(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.meanSquaredError(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java index 5a2c8526628..e41f55c6169 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicError.java @@ -32,30 +32,27 @@ public class MeanSquaredLogarithmicError extends MeanMetricWr implements LossMetric { /** - * Creates a Mean Absolute Error metric + * Creates a Mean Absolute Error metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanSquaredLogarithmicError(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public MeanSquaredLogarithmicError(long seed, Class type) { + this(null, seed, type); } /** * Creates a Mean Absolute Error metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public MeanSquaredLogarithmicError(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public MeanSquaredLogarithmicError(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -67,10 +64,10 @@ public MeanSquaredLogarithmicError(Ops tf, String name, long seed, Class type */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.meanSquaredLogarithmicError(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.meanSquaredLogarithmicError(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java index 1350a1e8bc9..69a8750572d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/MeanTensor.java @@ -36,11 +36,13 @@ * @param The data type for the metric result */ public class MeanTensor extends Metric { + /** The name of the total variable */ public static final String TOTAL = "total"; + /** The name of the count variable */ public static final String COUNT = "count"; + private final String totalName; private final String countName; - private final Class type; private Shape shape; private Variable total; private Variable count; @@ -56,7 +58,7 @@ public class MeanTensor extends Metric { * @param type the data type for the variables */ public MeanTensor(long seed, Class type) { - this((String) null, seed, type); + this(null, seed, type); } /** * Creates a MeanTensor metric @@ -67,61 +69,33 @@ public MeanTensor(long seed, Class type) { * @param type the data type for the variables */ public MeanTensor(String name, long seed, Class type) { - super(name, seed); - this.type = type; + super(name, seed, type); this.totalName = this.getVariableName(TOTAL); this.countName = this.getVariableName(COUNT); } - /** - * Creates a MeanTensor metric, using {@link Class#getSimpleName()} as the name - * - * @param tf the TensorFlow ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public MeanTensor(Ops tf, long seed, Class type) { - this(tf, null, seed, type); - } - /** - * Creates a MeanTensor metric - * - * @param tf the TensorFlow ops - * @param name the name of this metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public MeanTensor(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); - } - /** * Creates the Operations that initialize the total and count variables. * * @param shape the shape of the variables - * @return true if the variables need initialization, otherwise false; */ - private boolean init(Shape shape) { + private void init(Shape shape) { if (!initialized) { this.shape = shape; Zeros zeros = new Zeros<>(); - Operand zero = zeros.call(getTF(), getTF().constant(shape), type); + Operand zero = zeros.call(getTF(), getTF().constant(shape), getResultType()); if (total == null) { + variablesNeedAssign = true; total = getTF().withName(totalName).variable(zero); totalInitializer = getTF().assign(total, zero); } if (count == null) { + variablesNeedAssign = true; count = getTF().withName(countName).variable(zero); countInitializer = getTF().assign(count, zero); } this.initialized = true; - return true; - } else { - return false; } } @@ -136,13 +110,14 @@ private boolean init(Shape shape) { */ @Override public List updateStateList( - Operand values, Operand sampleWeights) { - Ops tf = getTF(); - Operand tValues = cast(tf, values, type); - Operand tSampleWeights = sampleWeights == null ? null : cast(tf, sampleWeights, type); + Ops tf, Operand values, Operand sampleWeights) { + init(tf); + Operand tValues = cast(getTF(), values, getResultType()); + Operand tSampleWeights = + sampleWeights == null ? null : cast(getTF(), sampleWeights, getResultType()); // update the shape if it is the first call. - boolean needsInitialization = init(values.shape()); + init(values.shape()); if (!this.shape.equals(values.shape())) { throw new IllegalArgumentException( @@ -151,16 +126,16 @@ public List updateStateList( this.shape.toString(), values.shape().toString())); } - Operand numValues = tf.onesLike(tValues); + Operand numValues = getTF().onesLike(tValues); if (tSampleWeights != null) { // Update dimensions of weights to match with values if possible. LossTuple tuple = - LossesHelper.squeezeOrExpandDimensions(tf, null, tValues, tSampleWeights); + LossesHelper.squeezeOrExpandDimensions(getTF(), null, tValues, tSampleWeights); tValues = tuple.getTarget(); tSampleWeights = tuple.getSampleWeights(); try { // Broadcast weights if possible. - tSampleWeights = WeightsBroadcastOps.broadcastWeights(tf, tSampleWeights, tValues); + tSampleWeights = WeightsBroadcastOps.broadcastWeights(getTF(), tSampleWeights, tValues); } catch (IllegalArgumentException ex) { // sampleWeights cannot be broadcast to values // Reduce values to same ndim as weight array @@ -170,49 +145,58 @@ public List updateStateList( for (int i = weightNdim; i < ndim; i++) { range[i] = i; } - tValues = tf.math.mean(tValues, tf.constant(range)); + tValues = getTF().math.mean(tValues, getTF().constant(range)); } - numValues = tf.math.mul(numValues, tSampleWeights); - tValues = tf.math.mul(tValues, tSampleWeights); + numValues = getTF().math.mul(numValues, tSampleWeights); + tValues = getTF().math.mul(tValues, tSampleWeights); } - List controlOpsPre = new ArrayList<>(); - if (needsInitialization) { - controlOpsPre.add(countInitializer); - controlOpsPre.add(totalInitializer); - } - Ops tf1 = tf.withSubScope("variables").withControlDependencies(controlOpsPre); - List controlOps = new ArrayList<>(); - controlOps.add(tf1.assignAdd(this.count, numValues)); - controlOps.add(tf1.assignAdd(this.total, tValues)); + controlOps.add( + variablesNeedAssign + ? getTF().assign(this.count, numValues) + : getTF().assignAdd(this.count, numValues)); + controlOps.add( + variablesNeedAssign + ? getTF().assign(this.total, tValues) + : getTF().assignAdd(this.total, tValues)); + variablesNeedAssign = false; return controlOps; } /** {@inheritDoc} */ @Override - public Operand result() { - if (!this.initialized) { - throw new IllegalStateException( - "MeanTensor does not have any result yet. Please use `.update_state(value)` before retrieving the result."); + public Operand result(Ops tf) { + init(tf); + if (total == null || count == null || variablesNeedAssign) { + return getResultZero(); + } else { + return getTF().math.divNoNan(total, count); } - return getTF().math.divNoNan(total, count); } - /** @return the total */ + /** + * Gets the total variable + * + * @return the total + */ public Variable getTotal() { return total; } - /** @return the count */ + /** + * Gets the count count variable + * + * @return the count variable + */ public Variable getCount() { return count; } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); if (countInitializer != null && totalInitializer != null) { List controlOpsPre = new ArrayList<>(); controlOpsPre.add(countInitializer); diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java index 7ef5bb6a8ee..c8a7887dc97 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Metric.java @@ -14,12 +14,15 @@ =======================================================================*/ package org.tensorflow.framework.metrics; +import static org.tensorflow.framework.utils.CastHelper.cast; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.Consumer; import org.tensorflow.Operand; import org.tensorflow.framework.metrics.impl.Initializable; +import org.tensorflow.framework.metrics.impl.MetricInterface; import org.tensorflow.op.Op; import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; @@ -27,27 +30,34 @@ /** * Base class for Metrics * - * @param The data type for the metric result + * @param The data resultType for the metric result */ -public abstract class Metric implements Initializable { +public abstract class Metric implements Initializable, MetricInterface { /** The seed for random number generation */ private final long seed; /** The name for this metric. Defaults to {@link Class#getSimpleName()}. */ private final String name; + + private final Class resultType; /** The TensorFlow Ops */ protected Ops tf; + /** Stores the list of registered functions to be invoked up initialization */ protected List> onInits; + /** indicator whether the metric's variables need to be initialized with an assing operation */ + protected boolean variablesNeedAssign; + /** * Creates a Metric with a name of {@link Class#getSimpleName()} * * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. + * will always produce the same random tensor for a given shape and data resultType. + * @param resultType the data type of the metric result */ - protected Metric(long seed) { - this((String) null, seed); + protected Metric(long seed, Class resultType) { + this(null, seed, resultType); } /** @@ -55,44 +65,23 @@ protected Metric(long seed) { * * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. + * will always produce the same random tensor for a given shape and data resultType. + * @param resultType the data type of the metric result */ - protected Metric(String name, long seed) { + protected Metric(String name, long seed, Class resultType) { this.seed = seed; + this.resultType = resultType; this.name = name != null ? name : this.getClass().getSimpleName(); } - /** - * Creates a Metric with a name of {@link Class#getSimpleName()} - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - */ - protected Metric(Ops tf, long seed) { - this(tf, null, seed); - } - - /** - * Creates a Metric - * - * @param tf the TensorFlow Ops - * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - */ - protected Metric(Ops tf, String name, long seed) { - this(name, seed); - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - if (this.tf == null) { - setTensorFlowOps(tf); - applyOnInit(); + if (this.tf == null) { + setTensorFlowOps(tf); + applyOnInit(); + } } return this.tf; } @@ -116,7 +105,7 @@ protected Ops setTensorFlowOps(Ops tf) { if (!tf.scope().env().isGraph()) { throw new IllegalArgumentException("Metrics are required to execute in Graph mode."); } - this.tf = this.tf = tf.withName(this.getClass().getSimpleName()); + this.tf = tf.withName(this.getClass().getSimpleName()); return this.tf; } @@ -149,45 +138,45 @@ protected Ops checkTF() { } /** - * Creates a List of Operations to update the metric state based on input values. + * Creates a List of Operations to update the metric state based on labels and predictions. * - *

This is an empty implementation that should be overridden in a subclass, if needed. + *

This is an empty implementation that should be overridden in a sub class, if needed. * - * @param values the inputs to be passed to update state, this may not be null + * @param tf the TensorFlow Ops + * @param labels the labels + * @param predictions the predictions * @param sampleWeights sample weights to be applied to values, may be null. * @return a List of Operations to update the metric state - * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link - * #init(Ops)}. */ - @SuppressWarnings({"unused"}) public List updateStateList( - Operand values, Operand sampleWeights) { + Ops tf, + Operand labels, + Operand predictions, + Operand sampleWeights) { return Collections.emptyList(); } /** - * Creates a List of Operations to update the metric state based on labels and predictions. + * Creates a List of Operations to update the metric state based on input values. * - *

This is an empty implementation that should be overridden in a sub class, if needed. + *

This is an empty implementation that should be overridden in a subclass, if needed. * - * @param labels the labels - * @param predictions the predictions + * @param tf the TensorFlow Ops + * @param values the inputs to be passed to update state, this may not be null * @param sampleWeights sample weights to be applied to values, may be null. * @return a List of Operations to update the metric state * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link - * #init(Ops)}. + * Initializable#init(Ops)}. */ - @SuppressWarnings({"unused"}) public List updateStateList( - Operand labels, - Operand predictions, - Operand sampleWeights) { + Ops tf, Operand values, Operand sampleWeights) { return Collections.emptyList(); } /** * Creates a NoOp Operation with control dependencies to update the metric state * + * @param tf the TensorFlow Ops * @param values the inputs to be passed to update state, this may not be null * @param sampleWeights sample weights to be applied to values, may be null. * @return the Operation to update the metric state @@ -195,14 +184,15 @@ public List updateStateList( * #init(Ops)}. */ public final Op updateState( - Operand values, Operand sampleWeights) { - List controlOps = updateStateList(values, sampleWeights); + Ops tf, Operand values, Operand sampleWeights) { + List controlOps = updateStateList(tf, values, sampleWeights); return checkTF().withSubScope("updateState").withControlDependencies(controlOps).noOp(); } /** * Creates a NoOp Operation with control dependencies to update the metric state * + * @param tf the TensorFlow Ops * @param labels the labels * @param predictions the predictions * @param sampleWeights sample weights to be applied to values, may be null. @@ -211,34 +201,19 @@ public final Op updateState( * #init(Ops)}. */ public final Op updateState( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { - List controlOps = updateStateList(labels, predictions, sampleWeights); + + List controlOps = updateStateList(tf, labels, predictions, sampleWeights); return checkTF().withSubScope("updateState").withControlDependencies(controlOps).noOp(); } - /** - * Gets the current result of the metric - * - * @return the result, possibly with control dependencies - * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link - * #init(Ops)}. - */ - public abstract Operand result(); - - /** - * Resets any state variables to their initial values - * - * @return the control operation for doing the reset - * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link - * #init(Ops)}. - */ - public abstract Op resetStates(); - /** * Calls update state once, followed by a call to get the result * + * @param tf the TensorFlow Ops * @param values the inputs to be passed to update state, this may not be null * @param sampleWeights sample weights to be applied to values, may be null. * @return the result, possibly with control dependencies @@ -246,10 +221,11 @@ public final Op updateState( * #init(Ops)}. */ public final Operand callOnce( - Operand values, Operand sampleWeights) { - List controlOps = updateStateList(values, sampleWeights); - Ops ltf = checkTF().withSubScope("callOnce").withControlDependencies(controlOps); - return ltf.identity(result()); + Ops tf, Operand values, Operand sampleWeights) { + init(tf); + List controlOps = updateStateList(tf, values, sampleWeights); + Ops ltf = getTF().withSubScope("callOnce").withControlDependencies(controlOps); + return ltf.identity(cast(getTF(), result(getTF()), getResultType())); } /** @@ -288,4 +264,22 @@ public String getName() { public long getSeed() { return seed; } + + /** + * Gets the result type + * + * @return the result type + */ + public Class getResultType() { + return resultType; + } + + /** + * Gets a result of zero, primarily for conditions where variables have not yet been assigned. + * + * @return a result of zero. + */ + protected Operand getResultZero() { + return cast(tf, tf.constant(0), resultType); + } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java index 44ed5c4f0d5..fe7e26443f0 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Poisson.java @@ -31,30 +31,27 @@ public class Poisson extends MeanMetricWrapper implements LossMetric { /** - * Creates a Poisson metric + * Creates a Poisson metric using a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public Poisson(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public Poisson(long seed, Class type) { + this(null, seed, type); } /** * Creates a Poisson metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public Poisson(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public Poisson(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -66,10 +63,10 @@ public Poisson(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.poisson(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.poisson(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java index e62a4b74915..640bd3da15b 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Precision.java @@ -55,8 +55,11 @@ * @param The data type for the metric result */ public class Precision extends Metric { + /** The name of the truePositives variable */ public static final String TRUE_POSITIVES = "TRUE_POSITIVES"; + /** The name of the falsePositives variable */ public static final String FALSE_POSITIVES = "FALSE_POSITIVES"; + /** The default threshold value to calculate the precision */ public static final float DEFAULT_THRESHOLD = 0.5f; private final float[] thresholds; @@ -64,7 +67,6 @@ public class Precision extends Metric { private final Integer classId; private final String truePositivesName; private final String falsePositivesName; - private final Class type; private final List initializers = new ArrayList<>(); private Variable truePositives; private Variable falsePositives; @@ -78,7 +80,7 @@ public class Precision extends Metric { * @param type the data type for the variables */ public Precision(long seed, Class type) { - this((String) null, null, null, null, seed, type); + this(null, null, null, null, seed, type); } /** @@ -107,7 +109,7 @@ public Precision(String name, long seed, Class type) { * @param type the data type for the variables */ public Precision(float threshold, long seed, Class type) { - this((String) null, new float[] {threshold}, null, null, seed, type); + this(null, new float[] {threshold}, null, null, seed, type); } /** @@ -123,7 +125,7 @@ public Precision(float threshold, long seed, Class type) { * @param type the data type for the variables */ public Precision(float[] thresholds, long seed, Class type) { - this((String) null, thresholds, null, null, seed, type); + this(null, thresholds, null, null, seed, type); } /** @@ -174,7 +176,7 @@ public Precision(String name, float[] thresholds, long seed, Class type) { * @param type the data type for the variables */ public Precision(float threshold, Integer topK, Integer classId, long seed, Class type) { - this((String) null, new float[] {threshold}, topK, classId, seed, type); + this(null, new float[] {threshold}, topK, classId, seed, type); } /** @@ -193,7 +195,7 @@ public Precision(float threshold, Integer topK, Integer classId, long seed, Clas * @param type the data type for the variables */ public Precision(float[] thresholds, Integer topK, Integer classId, long seed, Class type) { - this((String) null, thresholds, topK, classId, seed, type); + this(null, thresholds, topK, classId, seed, type); } /** @@ -236,8 +238,7 @@ public Precision( */ public Precision( String name, float[] thresholds, Integer topK, Integer classId, long seed, Class type) { - super(name, seed); - this.type = type; + super(name, seed, type); this.truePositivesName = this.getVariableName(TRUE_POSITIVES); this.falsePositivesName = this.getVariableName(FALSE_POSITIVES); float defaultThreshold = topK == null ? DEFAULT_THRESHOLD : MetricsHelper.NEG_INF; @@ -246,218 +247,27 @@ public Precision( this.classId = classId; } - /** - * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId - * values and with a threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision(Ops tf, long seed, Class type) { - this(tf, null, null, null, null, seed, type); - } - - /** - * Creates a Precision Metric with no topK or classId values with a threshold of {@link - * #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision(Ops tf, String name, long seed, Class type) { - this(tf, name, null, null, null, seed, type); - } - - /** - * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId - * values. - * - * @param tf the TensorFlow Ops - * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared - * with prediction values to determine the truth value of predictions (i.e., above the - * threshold is true, below is false). One metric value is generated for each threshold value. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision(Ops tf, float threshold, long seed, Class type) { - this(tf, null, new float[] {threshold}, null, null, seed, type); - } - - /** - * Creates a Precision Metric with a name of {@link Class#getSimpleName()} and no topK or classId - * values. - * - * @param tf the TensorFlow Ops - * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is - * compared with prediction values to determine the truth value of predictions (i.e., above - * the threshold is true, below is false). One metric value is generated for each threshold - * value. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision(Ops tf, float[] thresholds, long seed, Class type) { - this(tf, null, thresholds, null, null, seed, type); - } - - /** - * Creates a Precision Metric with no topK or classId values. - * - * @param tf the TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared - * with prediction values to determine the truth value of predictions (i.e., above the - * threshold is true, below is false). One metric value is generated for each threshold value. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision(Ops tf, String name, float threshold, long seed, Class type) { - this(tf, name, new float[] {threshold}, null, null, seed, type); - } - - /** - * Creates a Precision Metric with no topK or classId values. - * - * @param tf the TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is - * compared with prediction values to determine the truth value of predictions (i.e., above - * the threshold is true, below is false). One metric value is generated for each threshold - * value. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision(Ops tf, String name, float[] thresholds, long seed, Class type) { - this(tf, name, thresholds, null, null, seed, type); - } - - /** - * Creates a Precision Metric with a name of {@link Class#getSimpleName()} - * - * @param tf the TensorFlow Ops - * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared - * with prediction values to determine the truth value of predictions (i.e., above the - * threshold is true, below is false). One metric value is generated for each threshold value. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision( - Ops tf, float threshold, Integer topK, Integer classId, long seed, Class type) { - this(tf, null, new float[] {threshold}, topK, classId, seed, type); - } - - /** - * Creates a Precision Metric with a name of {@link Class#getSimpleName()} - * - * @param tf the TensorFlow Ops - * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is - * compared with prediction values to determine the truth value of predictions (i.e., above - * the threshold is true, below is false). One metric value is generated for each threshold - * value. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision( - Ops tf, float[] thresholds, Integer topK, Integer classId, long seed, Class type) { - this(tf, null, thresholds, topK, classId, seed, type); - } - - /** - * Creates a Precision Metric. - * - * @param tf the TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param threshold Optional threshold value in the range {@code [0, 1]}. A threshold is compared - * with prediction values to determine the truth value of predictions (i.e., above the - * threshold is true, below is false). One metric value is generated for each threshold value. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision( - Ops tf, - String name, - float threshold, - Integer topK, - Integer classId, - long seed, - Class type) { - this(tf, name, new float[] {threshold}, topK, classId, seed, type); - } - - /** - * Creates a Precision Metric. - * - * @param tf the TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param thresholds Optional threshold values in the range {@code [0, 1]}. A threshold is - * compared with prediction values to determine the truth value of predictions (i.e., above - * the threshold is true, below is false). One metric value is generated for each threshold - * value. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Precision( - Ops tf, - String name, - float[] thresholds, - Integer topK, - Integer classId, - long seed, - Class type) { - this(name, thresholds, topK, classId, seed, type); - - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - setTensorFlowOps(tf); - Zeros zeros = new Zeros<>(); - Operand zero = zeros.call(getTF(), getTF().constant(Shape.of(thresholds.length)), type); - - if (this.truePositives == null) { - this.truePositives = getTF().withName(truePositivesName).variable(zero); - initializers.add(getTF().assign(truePositives, zero)); - } - if (this.falsePositives == null) { - this.falsePositives = getTF().withName(falsePositivesName).variable(zero); - initializers.add(getTF().assign(falsePositives, zero)); + if (this.tf == null) { + setTensorFlowOps(tf); + Zeros zeros = new Zeros<>(); + Operand zero = + zeros.call(getTF(), getTF().constant(Shape.of(thresholds.length)), getResultType()); + + if (this.truePositives == null) { + variablesNeedAssign = true; + this.truePositives = getTF().withName(truePositivesName).variable(zero); + initializers.add(getTF().assign(truePositives, zero)); + } + if (this.falsePositives == null) { + variablesNeedAssign = true; + this.falsePositives = getTF().withName(falsePositivesName).variable(zero); + initializers.add(getTF().assign(falsePositives, zero)); + } + applyOnInit(); } - applyOnInit(); return getTF(); } @@ -474,52 +284,63 @@ public Ops init(Ops tf) { @Override @SuppressWarnings("unchecked") public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = getTF(); + init(tf); Map> confusionMatrix = new HashMap<>(); confusionMatrix.put(ConfusionMatrixEnum.TRUE_POSITIVES, truePositives); confusionMatrix.put(ConfusionMatrixEnum.FALSE_POSITIVES, falsePositives); - Operand tPredictions = cast(tf, predictions, type); - Operand tLabels = cast(tf, labels, type); - Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; + Operand tPredictions = cast(getTF(), predictions, getResultType()); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tSampleWeights = + sampleWeights != null ? cast(getTF(), sampleWeights, getResultType()) : null; - return new ArrayList( + List result = MetricsHelper.updateConfusionMatrixVariables( - tf, + getTF(), + variablesNeedAssign, confusionMatrix, Collections.EMPTY_MAP, tLabels, tPredictions, - tf.constant(thresholds), + getTF().constant(thresholds), topK, classId, tSampleWeights, false, - null)); + null); + variablesNeedAssign = false; + return result; } /** {@inheritDoc} */ @Override - public Operand result() { - Ops tf = getTF(); - Operand result = tf.math.divNoNan(truePositives, tf.math.add(truePositives, falsePositives)); + public Operand result(Ops tf) { + init(tf); + if (truePositives == null || falsePositives == null || variablesNeedAssign) { + return getResultZero(); + } + Operand result = + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falsePositives)); return thresholds.length == 1 - ? tf.reshape( - tf.slice( - result, - tf.expandDims(tf.constant(0), tf.constant(0)), - tf.expandDims(tf.constant(1), tf.constant(0))), - tf.constant(Shape.scalar())) + ? getTF() + .reshape( + getTF() + .slice( + result, + getTF().expandDims(getTF().constant(0), getTF().constant(0)), + getTF().expandDims(getTF().constant(1), getTF().constant(0))), + getTF().constant(Shape.scalar())) : result; } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); return getTF().withSubScope("resetStates").withControlDependencies(initializers).noOp(); } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java index 2c3d24bb730..c6dd7b3ea92 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/PrecisionAtRecall.java @@ -50,7 +50,7 @@ public class PrecisionAtRecall extends SensitivitySpecificity * [0-1]. */ public PrecisionAtRecall(float recall, long seed, Class type) { - this((String) null, recall, DEFAULT_NUM_THRESHOLDS, seed, type); + this(null, recall, DEFAULT_NUM_THRESHOLDS, seed, type); } /** @@ -82,7 +82,7 @@ public PrecisionAtRecall(String name, float recall, long seed, Class type) { * [0-1]. */ public PrecisionAtRecall(float recall, int numThresholds, long seed, Class type) { - this((String) null, recall, numThresholds, seed, type); + this(null, recall, numThresholds, seed, type); } /** @@ -105,89 +105,26 @@ public PrecisionAtRecall(String name, float recall, int numThresholds, long seed this.recall = recall; } - /** - * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()} and {@link - * #DEFAULT_NUM_THRESHOLDS} for the number of thresholds - * - * @param tf The TensorFlow Ops - * @param recall the recall. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public PrecisionAtRecall(Ops tf, float recall, long seed, Class type) { - this(tf, null, recall, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a PrecisionRecall metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number of - * thresholds - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param recall the recall. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public PrecisionAtRecall(Ops tf, String name, float recall, long seed, Class type) { - this(tf, name, recall, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. - * - * @param tf The TensorFlow Ops - * @param recall the recall. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * recall. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public PrecisionAtRecall(Ops tf, float recall, int numThresholds, long seed, Class type) { - this(tf, null, recall, numThresholds, seed, type); - } - - /** - * Creates a PrecisionRecall metric. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param recall the recall. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * recall. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public PrecisionAtRecall( - Ops tf, String name, float recall, int numThresholds, long seed, Class type) { - this(name, recall, numThresholds, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override - public Operand result() { - Ops tf = getTF(); - - Operand div = tf.math.divNoNan(truePositives, tf.math.add(truePositives, falseNegatives)); - Operand sub = tf.math.sub(div, cast(tf, tf.constant(recall), getType())); - Operand minIndex = tf.math.argMin(tf.math.abs(sub), tf.constant(0), TInt32.class); - minIndex = tf.expandDims(minIndex, tf.constant(0)); - - Operand trueSlice = tf.slice(truePositives, minIndex, tf.constant(new int[] {1})); - Operand falseSlice = tf.slice(falsePositives, minIndex, tf.constant(new int[] {1})); - return tf.math.divNoNan(trueSlice, tf.math.add(trueSlice, falseSlice)); + public Operand result(Ops tf) { + init(tf); + if (truePositives == null || falsePositives == null || variablesNeedAssign) { + return getResultZero(); + } + + Operand div = + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falseNegatives)); + Operand sub = + getTF().math.sub(div, cast(getTF(), getTF().constant(recall), getResultType())); + Operand minIndex = + getTF().math.argMin(getTF().math.abs(sub), getTF().constant(0), TInt32.class); + minIndex = getTF().expandDims(minIndex, getTF().constant(0)); + + Operand trueSlice = getTF().slice(truePositives, minIndex, getTF().constant(new int[] {1})); + Operand falseSlice = + getTF().slice(falsePositives, minIndex, getTF().constant(new int[] {1})); + return getTF().math.divNoNan(trueSlice, getTF().math.add(trueSlice, falseSlice)); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java index 4117f8bef1a..cd8262d1fde 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Recall.java @@ -53,8 +53,11 @@ * @param The data type for the metric result */ public class Recall extends Metric { + /** The default threshold value to calculate the precision */ public static final float DEFAULT_THRESHOLD = 0.5f; + /** The name of the truePositives variable */ public static final String TRUE_POSITIVES = "TRUE_POSITIVES"; + /** The name of the falseNegatives variable */ public static final String FALSE_NEGATIVES = "FALSE_NEGATIVES"; private final float[] thresholds; @@ -76,7 +79,7 @@ public class Recall extends Metric { * @param type the data type for the variables */ public Recall(long seed, Class type) { - this((String) null, null, null, null, seed, type); + this(null, null, null, null, seed, type); } /** @@ -105,7 +108,7 @@ public Recall(String name, long seed, Class type) { * @param type the data type for the variables */ public Recall(float threshold, long seed, Class type) { - this((String) null, threshold, null, null, seed, type); + this(null, threshold, null, null, seed, type); } /** @@ -120,7 +123,7 @@ public Recall(float threshold, long seed, Class type) { * @param type the data type for the variables */ public Recall(float[] thresholds, long seed, Class type) { - this((String) null, thresholds, null, null, seed, type); + this(null, thresholds, null, null, seed, type); } /** @@ -168,7 +171,7 @@ public Recall(String name, float[] thresholds, long seed, Class type) { * @param type the data type for the variables */ public Recall(Integer topK, Integer classId, long seed, Class type) { - this((String) null, null, topK, classId, seed, type); + this(null, null, topK, classId, seed, type); } /** @@ -203,7 +206,7 @@ public Recall(String name, Integer topK, Integer classId, long seed, Class ty * @param type the data type for the variables */ public Recall(float threshold, Integer topK, Integer classId, long seed, Class type) { - this((String) null, new float[] {threshold}, topK, classId, seed, type); + this(null, new float[] {threshold}, topK, classId, seed, type); } /** @@ -221,7 +224,7 @@ public Recall(float threshold, Integer topK, Integer classId, long seed, Class type) { - this((String) null, thresholds, topK, classId, seed, type); + this(null, thresholds, topK, classId, seed, type); } /** @@ -263,7 +266,7 @@ public Recall( */ public Recall( String name, float[] thresholds, Integer topK, Integer classId, long seed, Class type) { - super(name, seed); + super(name, seed, type); this.type = type; this.truePositivesName = this.getVariableName(TRUE_POSITIVES); this.falseNegativesName = this.getVariableName(FALSE_NEGATIVES); @@ -274,257 +277,34 @@ public Recall( this.classId = classId; } - /** - * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set - * to null, and thresholds set to {@link #DEFAULT_THRESHOLD} - * - * @param tf The TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, long seed, Class type) { - this(tf, null, null, null, null, seed, type); - } - - /** - * Creates a Recall metric with topK and classId set to null and thresholds set to {@link - * #DEFAULT_THRESHOLD}. - * - * @param tf The TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, String name, long seed, Class type) { - this(tf, name, null, null, null, seed, type); - } - - /** - * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set - * to null. - * - * @param tf The TensorFlow Ops - * @param threshold A threshold is compared with prediction values to determine the truth value of - * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to - * {@link #DEFAULT_THRESHOLD}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, float threshold, long seed, Class type) { - this(tf, null, threshold, null, null, seed, type); - } - - /** - * Creates a Recall metric with a name of {@link Class#getSimpleName()}, and topK and classId set - * to null. - * - * @param tf The TensorFlow Ops - * @param thresholds A threshold is compared with prediction values to determine the truth value - * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults - * to {@link #DEFAULT_THRESHOLD}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, float[] thresholds, long seed, Class type) { - this(tf, null, thresholds, null, null, seed, type); - } - - /** - * Creates a Recall metric with topK and classId set to null. - * - * @param tf The TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param threshold A threshold is compared with prediction values to determine the truth value of - * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to - * {@link #DEFAULT_THRESHOLD}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, String name, float threshold, long seed, Class type) { - this(tf, name, threshold, null, null, seed, type); - } - - /** - * Creates a Recall metric with topK and classId set to null. - * - * @param tf The TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param thresholds A threshold is compared with prediction values to determine the truth value - * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults - * to {@link #DEFAULT_THRESHOLD}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, String name, float[] thresholds, long seed, Class type) { - this(tf, name, thresholds, null, null, seed, type); - } - - /** - * Creates a Recall metric with a name of {@link Class#getSimpleName()} and using a threshold - * value of {@link #DEFAULT_THRESHOLD}. - * - * @param tf The TensorFlow Ops - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, Integer topK, Integer classId, long seed, Class type) { - this(tf, null, null, topK, classId, seed, type); - } - - /** - * Creates a Recall metric using a threshold value of {@link #DEFAULT_THRESHOLD}. - * - * @param tf The TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, String name, Integer topK, Integer classId, long seed, Class type) { - this(tf, name, null, topK, classId, seed, type); - } - - /** - * Creates a Recall metric with a name of {@link Class#getSimpleName()} - * - * @param tf The TensorFlow Ops - * @param threshold A threshold is compared with prediction values to determine the truth value of - * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to - * {@link #DEFAULT_THRESHOLD}. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall(Ops tf, float threshold, Integer topK, Integer classId, long seed, Class type) { - this(tf, null, new float[] {threshold}, topK, classId, seed, type); - } - - /** - * Creates a Recall metric with a name of {@link Class#getSimpleName()} - * - * @param tf The TensorFlow Ops - * @param thresholds A threshold is compared with prediction values to determine the truth value - * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults - * to {@link #DEFAULT_THRESHOLD}. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall( - Ops tf, float[] thresholds, Integer topK, Integer classId, long seed, Class type) { - this(tf, null, thresholds, topK, classId, seed, type); - } - - /** - * Creates a Recall metric. - * - * @param tf The TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param threshold A threshold is compared with prediction values to determine the truth value of - * predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults to - * {@link #DEFAULT_THRESHOLD}. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall( - Ops tf, - String name, - float threshold, - Integer topK, - Integer classId, - long seed, - Class type) { - this(tf, name, new float[] {threshold}, topK, classId, seed, type); - } - - /** - * Creates a Recall metric. - * - * @param tf The TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param thresholds A threshold is compared with prediction values to determine the truth value - * of predictions (i.e., above the threshold is `true`, below is `false`). If null, defaults - * to {@link #DEFAULT_THRESHOLD}. - * @param topK An optional value specifying the top-k predictions to consider when calculating - * precision. - * @param classId Optional Integer class ID for which we want binary metrics. This must be in the - * half-open interval [0, numClasses], where numClasses is the last dimension of predictions. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public Recall( - Ops tf, - String name, - float[] thresholds, - Integer topK, - Integer classId, - long seed, - Class type) { - this(name, thresholds, topK, classId, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - setTensorFlowOps(tf); - - Zeros zeros = new Zeros<>(); - Operand zero = zeros.call(tf, tf.constant(Shape.of(this.thresholds.length)), type); - if (truePositives == null) { - - truePositives = getTF().withName(truePositivesName).variable(zero); - initializers.add(getTF().assign(truePositives, zero)); - } - - if (this.falseNegatives == null) { - - falseNegatives = getTF().withName(falseNegativesName).variable(zero); - initializers.add(getTF().assign(falseNegatives, zero)); + if (this.tf == null) { + setTensorFlowOps(tf); + + Zeros zeros = new Zeros<>(); + Operand zero = zeros.call(tf, tf.constant(Shape.of(this.thresholds.length)), type); + if (truePositives == null) { + variablesNeedAssign = true; + truePositives = getTF().withName(truePositivesName).variable(zero); + initializers.add(getTF().assign(truePositives, zero)); + } + + if (this.falseNegatives == null) { + variablesNeedAssign = true; + falseNegatives = getTF().withName(falseNegativesName).variable(zero); + initializers.add(getTF().assign(falseNegatives, zero)); + } + applyOnInit(); } - applyOnInit(); return getTF(); } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); return getTF().withSubScope("resetStates").withControlDependencies(initializers).noOp(); } @@ -541,39 +321,47 @@ public Op resetStates() { @Override @SuppressWarnings("unchecked") public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = getTF(); + init(tf); Map> confusionMatrix = new HashMap<>(); confusionMatrix.put(ConfusionMatrixEnum.TRUE_POSITIVES, this.truePositives); confusionMatrix.put(ConfusionMatrixEnum.FALSE_NEGATIVES, this.falseNegatives); - Operand tPredictions = cast(tf, predictions, type); - Operand tLabels = cast(tf, labels, type); - Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; - - return MetricsHelper.updateConfusionMatrixVariables( - tf, - confusionMatrix, - Collections.EMPTY_MAP, - tLabels, - tPredictions, - tf.constant(thresholds), - topK, - classId, - tSampleWeights, - false, - null); + Operand tPredictions = cast(getTF(), predictions, type); + Operand tLabels = cast(getTF(), labels, type); + Operand tSampleWeights = sampleWeights != null ? cast(getTF(), sampleWeights, type) : null; + + List result = + MetricsHelper.updateConfusionMatrixVariables( + getTF(), + variablesNeedAssign, + confusionMatrix, + Collections.EMPTY_MAP, + tLabels, + tPredictions, + getTF().constant(thresholds), + topK, + classId, + tSampleWeights, + false, + null); + variablesNeedAssign = false; + return result; } @Override - public Operand result() { - Ops tf = getTF(); + public Operand result(Ops tf) { + init(tf); + if (truePositives == null || falseNegatives == null || variablesNeedAssign) { + return getResultZero(); + } Operand result = - tf.math.divNoNan(this.truePositives, tf.math.add(this.truePositives, this.falseNegatives)); - return this.thresholds.length == 1 - ? tf.slice(result, tf.constant(new int[] {0}), tf.constant(new int[1])) + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falseNegatives)); + return thresholds.length == 1 + ? getTF().slice(result, getTF().constant(new int[] {0}), getTF().constant(new int[1])) : result; } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java index 20e70e48749..6be81fd14ba 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RecallAtPrecision.java @@ -55,7 +55,7 @@ public class RecallAtPrecision extends SensitivitySpecificity * [0-1]. */ public RecallAtPrecision(float precision, long seed, Class type) { - this((String) null, precision, DEFAULT_NUM_THRESHOLDS, seed, type); + this(null, precision, DEFAULT_NUM_THRESHOLDS, seed, type); } /** @@ -87,7 +87,7 @@ public RecallAtPrecision(String name, float precision, long seed, Class type) * [0-1]. */ public RecallAtPrecision(float precision, int numThresholds, long seed, Class type) { - this((String) null, precision, numThresholds, seed, type); + this(null, precision, numThresholds, seed, type); } /** @@ -111,95 +111,39 @@ public RecallAtPrecision( this.precision = precision; } - /** - * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()} and {@link - * #DEFAULT_NUM_THRESHOLDS} for the number of thresholds - * - * @param tf The TensorFlow Ops - * @param precision the precision. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public RecallAtPrecision(Ops tf, float precision, long seed, Class type) { - this(tf, null, precision, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a PrecisionRecall metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number of - * thresholds - * - * @param tf The TensorFlow Ops - * @param name the name of the metric. If null, defaults to {@link Class#getSimpleName()} - * @param precision the precision. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public RecallAtPrecision(Ops tf, String name, float precision, long seed, Class type) { - this(tf, name, precision, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. - * - * @param tf The TensorFlow Ops - * @param precision the precision. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * recall. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public RecallAtPrecision(Ops tf, float precision, int numThresholds, long seed, Class type) { - this(tf, null, precision, numThresholds, seed, type); - } - - /** - * Creates a PrecisionRecall metric. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param precision the precision. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * recall. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if recall is not in the range - * [0-1]. - */ - public RecallAtPrecision( - Ops tf, String name, float precision, int numThresholds, long seed, Class type) { - this(name, precision, numThresholds, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override - public Operand result() { - Ops tf = getTF(); + public Operand result(Ops tf) { + init(tf); + if (truePositives == null + || falsePositives == null + || trueNegatives == null + || falseNegatives == null + || variablesNeedAssign) { + return getResultZero(); + } Operand precisions = - tf.math.divNoNan(truePositives, tf.math.add(truePositives, falsePositives)); + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falsePositives)); Operand recalls = - tf.math.divNoNan(truePositives, tf.math.add(truePositives, falseNegatives)); + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falseNegatives)); Operand isFeasible = - tf.math.greaterEqual(precisions, cast(tf, tf.constant(precision), getType())); - Where feasible = tf.where(isFeasible); - Operand feasibleExists = tf.math.greater(tf.size(feasible), tf.constant(0)); - - Operand gather = tf.expandDims(tf.gather(recalls, feasible, tf.constant(0)), tf.constant(0)); - return tf.select( - feasibleExists, - tf.reduceMax(gather, allAxes(tf, gather)), - cast(tf, tf.constant(0), getType())); + getTF() + .math + .greaterEqual(precisions, cast(getTF(), getTF().constant(precision), getResultType())); + Where feasible = getTF().where(isFeasible); + Operand feasibleExists = + getTF().math.greater(getTF().size(feasible), getTF().constant(0)); + + Operand gather = + getTF() + .expandDims( + getTF().gather(recalls, feasible, getTF().constant(0)), getTF().constant(0)); + return getTF() + .select( + feasibleExists, + getTF().reduceMax(gather, allAxes(getTF(), gather)), + cast(getTF(), getTF().constant(0), getResultType())); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java index cd1a46e5c85..8ccad9487ee 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/RootMeanSquaredError.java @@ -40,7 +40,7 @@ public class RootMeanSquaredError extends Mean { * @param type the data type for the variables */ public RootMeanSquaredError(long seed, Class type) { - this((String) null, seed, type); + this(null, seed, type); } /** @@ -56,33 +56,6 @@ public RootMeanSquaredError(String name, long seed, Class type) { super(name, seed, type); } - /** - * Creates a RootMeanSquaredError metric with a name of {@link Class#getSimpleName()} - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public RootMeanSquaredError(Ops tf, long seed, Class type) { - this(tf, null, seed, type); - } - - /** - * Creates a RootMeanSquaredError metric - * - * @param tf the TensorFlow Ops - * @param name name of the metric instance. If null, name defaults to {@link - * Class#getSimpleName()}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public RootMeanSquaredError(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); - } - /** * Accumulates root mean squared error statistics. * @@ -94,9 +67,11 @@ public RootMeanSquaredError(Ops tf, String name, long seed, Class type) { */ @Override public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { + init(tf); Operand tLabels = cast(getTF(), labels, getResultType()); Operand tPredictions = cast(getTF(), predictions, getResultType()); @@ -110,12 +85,16 @@ public List updateStateList( Operand errorSquared = cast(getTF(), getTF().math.squaredDifference(tPredictions, tLabels), getResultType()); - return super.updateStateList(errorSquared, tSampleWeights); + return super.updateStateList(getTF(), errorSquared, tSampleWeights); } /** {@inheritDoc} */ @Override - public Operand result() { - return getTF().math.sqrt(getTF().math.divNoNan(this.total, this.count)); + public Operand result(Ops tf) { + init(tf); + if (total == null || count == null || variablesNeedAssign) { + return getResultZero(); + } + return getTF().math.sqrt(getTF().math.divNoNan(total, count)); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java index b855dc929c5..160cebf3399 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SensitivityAtSpecificity.java @@ -59,7 +59,7 @@ public class SensitivityAtSpecificity extends SensitivitySpec * [0-1]. */ public SensitivityAtSpecificity(float specificity, long seed, Class type) { - this((String) null, specificity, DEFAULT_NUM_THRESHOLDS, seed, type); + this(null, specificity, DEFAULT_NUM_THRESHOLDS, seed, type); } /** @@ -91,7 +91,7 @@ public SensitivityAtSpecificity(String name, float specificity, long seed, Class * [0-1]. */ public SensitivityAtSpecificity(float specificity, int numThresholds, long seed, Class type) { - this((String) null, specificity, numThresholds, seed, type); + this(null, specificity, numThresholds, seed, type); } /** @@ -115,91 +115,32 @@ public SensitivityAtSpecificity( this.specificity = specificity; } - /** - * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()} and - * {@link #DEFAULT_NUM_THRESHOLDS} for the number of thresholds - * - * @param tf The TensorFlow Ops - * @param specificity the specificity. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range - * [0-1]. - */ - public SensitivityAtSpecificity(Ops tf, float specificity, long seed, Class type) { - this(tf, null, specificity, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a SpecificityAtSensitivity metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number - * of thresholds - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param specificity the specificity. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range - * [0-1]. - */ - public SensitivityAtSpecificity( - Ops tf, String name, float specificity, long seed, Class type) { - this(tf, name, specificity, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a PrecisionRecall metric with a name of {@link Class#getSimpleName()}. - * - * @param tf The TensorFlow Ops - * @param specificity the specificity. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * specificity. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range - * [0-1]. - */ - public SensitivityAtSpecificity( - Ops tf, float specificity, int numThresholds, long seed, Class type) { - this(tf, null, specificity, numThresholds, seed, type); - } - - /** - * Creates a PrecisionRecall metric. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param specificity the specificity. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * specificity. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if specificity is not in the range - * [0-1]. - */ - public SensitivityAtSpecificity( - Ops tf, String name, float specificity, int numThresholds, long seed, Class type) { - this(name, specificity, numThresholds, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override - public Operand result() { - Ops tf = getTF(); - Operand specificities = - tf.math.divNoNan(trueNegatives, tf.math.add(trueNegatives, falsePositives)); - Operand sub = tf.math.sub(specificities, cast(tf, tf.constant(specificity), getType())); - Operand minIndex = tf.math.argMin(tf.math.abs(sub), tf.constant(0), TInt32.class); - minIndex = tf.expandDims(minIndex, tf.constant(0)); + public Operand result(Ops tf) { + init(tf); + if (trueNegatives == null + || falsePositives == null + || truePositives == null + || trueNegatives == null + || variablesNeedAssign) { + return getResultZero(); + } - Operand trueSlice = tf.slice(truePositives, minIndex, tf.constant(new int[] {1})); - Operand falseSlice = tf.slice(falseNegatives, minIndex, tf.constant(new int[] {1})); - return tf.math.divNoNan(trueSlice, tf.math.add(trueSlice, falseSlice)); + Operand specificities = + getTF().math.divNoNan(trueNegatives, getTF().math.add(trueNegatives, falsePositives)); + Operand sub = + getTF() + .math + .sub(specificities, cast(getTF(), getTF().constant(specificity), getResultType())); + Operand minIndex = + getTF().math.argMin(getTF().math.abs(sub), getTF().constant(0), TInt32.class); + minIndex = getTF().expandDims(minIndex, getTF().constant(0)); + + Operand trueSlice = getTF().slice(truePositives, minIndex, getTF().constant(new int[] {1})); + Operand falseSlice = + getTF().slice(falseNegatives, minIndex, getTF().constant(new int[] {1})); + return getTF().math.divNoNan(trueSlice, getTF().math.add(trueSlice, falseSlice)); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java index 6cfb3c47d62..e448482f843 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalAccuracy.java @@ -75,7 +75,7 @@ public class SparseCategoricalAccuracy extends MeanMetricWrap * @param type The data type for the metric result */ public SparseCategoricalAccuracy(long seed, Class type) { - this((String) null, seed, type); + this(null, seed, type); } /** @@ -91,32 +91,6 @@ public SparseCategoricalAccuracy(String name, long seed, Class type) { super.setLoss(this); } - /** - * Creates a SparseCategoricalAccuracy metric, using name of {@link Class#getSimpleName()}. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type The data type for the metric result - */ - public SparseCategoricalAccuracy(Ops tf, long seed, Class type) { - this(tf, null, seed, type); - } - - /** - * Creates a SparseCategoricalAccuracy metric. - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null use {@link Class#getSimpleName()} - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type of the metric result. - */ - public SparseCategoricalAccuracy(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); - } - /** * Calculates how often predictions matches integer labels. * @@ -126,10 +100,10 @@ public SparseCategoricalAccuracy(Ops tf, String name, long seed, Class type) */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); Shape predShape = predictions.asOutput().shape(); Shape labelsShape = labels.asOutput().shape(); long predictionsRank = predShape.numDimensions(); @@ -139,12 +113,15 @@ public Operand call( if (predictionsRank != Shape.UNKNOWN_SIZE && labelsRank != Shape.UNKNOWN_SIZE && labelsShape.size((int) labelsRank - 1) == 1) { - tLabels = tf.squeeze(tLabels, Squeeze.axis(Collections.singletonList(labelsRank - 1L))); + tLabels = getTF().squeeze(tLabels, Squeeze.axis(Collections.singletonList(labelsRank - 1L))); } Operand argMaxPred = - cast(tf, tf.math.argMax(tPredictions, tf.constant(-1L), TInt64.class), getResultType()); + cast( + getTF(), + getTF().math.argMax(tPredictions, getTF().constant(-1L), TInt64.class), + getResultType()); - Equal equals = tf.math.equal(tLabels, argMaxPred); - return tf.dtypes.cast(equals, getResultType()); + Equal equals = getTF().math.equal(tLabels, argMaxPred); + return cast(getTF(), equals, getResultType()); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java index d66501408e3..70df6d381fc 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropy.java @@ -39,9 +39,9 @@ public class SparseCategoricalCrossentropy extends MeanMetric private final int axis; /** - * Creates a SparseCategoricalCrossentropy metric + * Creates a SparseCategoricalCrossentropy metric using a name based on {@link + * Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. * @param axis The dimension along which the entropy is computed. @@ -49,18 +49,13 @@ public class SparseCategoricalCrossentropy extends MeanMetric * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public SparseCategoricalCrossentropy( - String name, boolean fromLogits, int axis, long seed, Class type) { - super(name, seed, type); - setLoss(this); - this.fromLogits = fromLogits; - this.axis = axis; + public SparseCategoricalCrossentropy(boolean fromLogits, int axis, long seed, Class type) { + this(null, fromLogits, axis, seed, type); } /** * Creates a SparseCategoricalCrossentropy metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param fromLogits Whether to interpret predictions as a tensor of logit values as opposed to a * probability distribution. @@ -70,9 +65,11 @@ public SparseCategoricalCrossentropy( * @param type the type for the variables and result */ public SparseCategoricalCrossentropy( - Ops tf, String name, boolean fromLogits, int axis, long seed, Class type) { - this(name, fromLogits, axis, seed, type); - init(tf); + String name, boolean fromLogits, int axis, long seed, Class type) { + super(name, seed, type); + setLoss(this); + this.fromLogits = fromLogits; + this.axis = axis; } /** @@ -84,10 +81,10 @@ public SparseCategoricalCrossentropy( */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.sparseCategoricalCrossentropy(tf, tLabels, tPredictions, fromLogits, axis); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.sparseCategoricalCrossentropy(getTF(), tLabels, tPredictions, fromLogits, axis); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java index 023ac90656d..3297aae6fac 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SparseTopKCategoricalAccuracy.java @@ -29,65 +29,62 @@ */ public class SparseTopKCategoricalAccuracy extends MeanMetricWrapper implements LossMetric { + + /** The default Number of top elements to look at for computing accuracy. */ public static final int DEFAULT_K = 5; /** Number of top elements to look at for computing accuracy. */ private final int k; /** * Creates a SparseTopKCategoricalAccuracy metric using {@link #DEFAULT_K} for the number of top - * elements. + * elements with a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the date type for the result */ - public SparseTopKCategoricalAccuracy(String name, long seed, Class type) { - this(name, DEFAULT_K, seed, type); + public SparseTopKCategoricalAccuracy(long seed, Class type) { + this(null, DEFAULT_K, seed, type); } /** - * Creates a SparseTopKCategoricalAccuracy metric. + * Creates a SparseTopKCategoricalAccuracy metric with a name based on {@link + * Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param k Number of top elements to look at for computing accuracy. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the date type for the result */ - public SparseTopKCategoricalAccuracy(String name, int k, long seed, Class type) { - super(name, seed, type); - this.k = k; - setLoss(this); + public SparseTopKCategoricalAccuracy(int k, long seed, Class type) { + this(null, k, seed, type); } - /** * Creates a SparseTopKCategoricalAccuracy metric using {@link #DEFAULT_K} for the number of top * elements. * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the date type for the result */ - public SparseTopKCategoricalAccuracy(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_K, seed, type); + public SparseTopKCategoricalAccuracy(String name, long seed, Class type) { + this(name, DEFAULT_K, seed, type); } /** * Creates a SparseTopKCategoricalAccuracy metric. * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param k Number of top elements to look at for computing accuracy. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the date type for the result */ - public SparseTopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Class type) { - this(name, k, seed, type); - init(tf); + public SparseTopKCategoricalAccuracy(String name, int k, long seed, Class type) { + super(name, seed, type); + this.k = k; + setLoss(this); } /** @@ -99,10 +96,10 @@ public SparseTopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Clas */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Metrics.sparseTopKCategoricalAccuracy(tf, tLabels, tPredictions, k); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Metrics.sparseTopKCategoricalAccuracy(getTF(), tLabels, tPredictions, k); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java index 3255ba0224d..79cf0b93873 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SpecificityAtSensitivity.java @@ -58,7 +58,7 @@ public class SpecificityAtSensitivity extends SensitivitySpec * [0-1]. */ public SpecificityAtSensitivity(float sensitivity, long seed, Class type) { - this((String) null, sensitivity, DEFAULT_NUM_THRESHOLDS, seed, type); + this(null, sensitivity, DEFAULT_NUM_THRESHOLDS, seed, type); } /** @@ -90,7 +90,7 @@ public SpecificityAtSensitivity(String name, float sensitivity, long seed, Class * [0-1]. */ public SpecificityAtSensitivity(float sensitivity, int numThresholds, long seed, Class type) { - this((String) null, sensitivity, numThresholds, seed, type); + this(null, sensitivity, numThresholds, seed, type); } /** @@ -114,93 +114,31 @@ public SpecificityAtSensitivity( this.sensitivity = sensitivity; } - /** - * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()} and - * {@link #DEFAULT_NUM_THRESHOLDS} for the number of thresholds - * - * @param tf The TensorFlow Ops - * @param sensitivity the sensitivity. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range - * [0-1]. - */ - public SpecificityAtSensitivity(Ops tf, float sensitivity, long seed, Class type) { - this(tf, null, sensitivity, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a SpecificityAtSensitivity metric with {@link #DEFAULT_NUM_THRESHOLDS} for the number - * of thresholds - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param sensitivity the sensitivity. A scalar value in range [0, 1] - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range - * [0-1]. - */ - public SpecificityAtSensitivity( - Ops tf, String name, float sensitivity, long seed, Class type) { - this(tf, name, sensitivity, DEFAULT_NUM_THRESHOLDS, seed, type); - } - - /** - * Creates a SpecificityAtSensitivity metric with a name of {@link Class#getSimpleName()}. - * - * @param tf The TensorFlow Ops - * @param sensitivity the sensitivity. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * sensitivity. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range - * [0-1]. - */ - public SpecificityAtSensitivity( - Ops tf, float sensitivity, int numThresholds, long seed, Class type) { - this(tf, null, sensitivity, numThresholds, seed, type); - } - - /** - * Creates a SpecificityAtSensitivity metric. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric, if null defaults to {@link Class#getSimpleName()} - * @param sensitivity the sensitivity. A scalar value in range [0, 1] - * @param numThresholds Defaults to 200. The number of thresholds to use for matching the given - * sensitivity. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0 or if sensitivity is not in the range - * [0-1]. - */ - public SpecificityAtSensitivity( - Ops tf, String name, float sensitivity, int numThresholds, long seed, Class type) { - this(name, sensitivity, numThresholds, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override - public Operand result() { - - Ops tf = getTF(); - + public Operand result(Ops tf) { + init(tf); + if (trueNegatives == null + || falsePositives == null + || truePositives == null + || trueNegatives == null + || variablesNeedAssign) { + return getResultZero(); + } Operand sensitivities = - tf.math.divNoNan(truePositives, tf.math.add(truePositives, falseNegatives)); - Operand sub = tf.math.sub(sensitivities, cast(tf, tf.constant(sensitivity), getType())); - Operand minIndex = tf.math.argMin(tf.math.abs(sub), tf.constant(0), TInt32.class); - minIndex = tf.expandDims(minIndex, tf.constant(0)); - - Operand trueSlice = tf.slice(trueNegatives, minIndex, tf.constant(new int[] {1})); - Operand falseSlice = tf.slice(falsePositives, minIndex, tf.constant(new int[] {1})); - return tf.math.divNoNan(trueSlice, tf.math.add(trueSlice, falseSlice)); + getTF().math.divNoNan(truePositives, getTF().math.add(truePositives, falseNegatives)); + Operand sub = + getTF() + .math + .sub(sensitivities, cast(getTF(), getTF().constant(sensitivity), getResultType())); + Operand minIndex = + getTF().math.argMin(getTF().math.abs(sub), getTF().constant(0), TInt32.class); + minIndex = getTF().expandDims(minIndex, getTF().constant(0)); + + Operand trueSlice = getTF().slice(trueNegatives, minIndex, getTF().constant(new int[] {1})); + Operand falseSlice = + getTF().slice(falsePositives, minIndex, getTF().constant(new int[] {1})); + return getTF().math.divNoNan(trueSlice, getTF().math.add(trueSlice, falseSlice)); } /** diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java index 9337ab6f86e..3c0f3c8efe1 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/SquaredHinge.java @@ -31,30 +31,27 @@ public class SquaredHinge extends MeanMetricWrapper implements LossMetric { /** - * Creates a SquaredHinge metric + * Creates a SquaredHinge metric with a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public SquaredHinge(String name, long seed, Class type) { - super(name, seed, type); - setLoss(this); + public SquaredHinge(long seed, Class type) { + this(null, seed, type); } /** * Creates a SquaredHinge metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type the type for the variables and result */ - public SquaredHinge(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); + public SquaredHinge(String name, long seed, Class type) { + super(name, seed, type); + setLoss(this); } /** @@ -68,10 +65,10 @@ public SquaredHinge(Ops tf, String name, long seed, Class type) { */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Losses.squaredHinge(tf, tLabels, tPredictions); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Losses.squaredHinge(getTF(), tLabels, tPredictions); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java index 8647c2c491e..4010e760d1c 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/Sum.java @@ -15,7 +15,6 @@ package org.tensorflow.framework.metrics; import org.tensorflow.framework.metrics.impl.Reduce; -import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -53,30 +52,4 @@ public Sum(long seed, Class type) { public Sum(String name, long seed, Class type) { super(name, MetricReduction.SUM, seed, type); } - - /** - * Creates a Sum metric with a name of {@link Class#getSimpleName()} - * - * @param tf The TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - public Sum(Ops tf, long seed, Class type) { - this(tf, null, seed, type); - } - - /** - * Creates a Sum metric. - * - * @param tf The TensorFlow Ops - * @param name the name of the metric instance. If null, defaults to {@link Class#getSimpleName()} - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - public Sum(Ops tf, String name, long seed, Class type) { - this(name, seed, type); - init(tf); - } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java index c6d88d5f4f4..0f5e4f7e9ca 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracy.java @@ -35,59 +35,54 @@ public class TopKCategoricalAccuracy extends MeanMetricWrappe /** * Creates a TopKCategoricalAccuracy metric using {@link #DEFAULT_K} for {@code k}, Number of top - * elements to look at for computing accuracy. + * elements to look at for computing accuracy with a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type The data type for the metric result */ - public TopKCategoricalAccuracy(String name, long seed, Class type) { - this(name, DEFAULT_K, seed, type); + public TopKCategoricalAccuracy(long seed, Class type) { + this(null, DEFAULT_K, seed, type); } /** - * Creates a TopKCategoricalAccuracy metric + * Creates a TopKCategoricalAccuracy metric with a name based on {@link Class#getSimpleName()}. * - * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param k Number of top elements to look at for computing accuracy. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type The data type for the metric result */ - public TopKCategoricalAccuracy(String name, int k, long seed, Class type) { - super(name, seed, type); - this.k = k; - setLoss(this); + public TopKCategoricalAccuracy(int k, long seed, Class type) { + this(null, k, seed, type); } /** * Creates a TopKCategoricalAccuracy metric using {@link #DEFAULT_K} for {@code k}, Number of top * elements to look at for computing accuracy. * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type The data type for the metric result */ - public TopKCategoricalAccuracy(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_K, seed, type); + public TopKCategoricalAccuracy(String name, long seed, Class type) { + this(name, DEFAULT_K, seed, type); } /** * Creates a TopKCategoricalAccuracy metric * - * @param tf the TensorFlow Ops * @param name the name of this metric, if null then metric name is {@link Class#getSimpleName()}. * @param k Number of top elements to look at for computing accuracy. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. * @param type The data type for the metric result */ - public TopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Class type) { - this(name, k, seed, type); - init(tf); + public TopKCategoricalAccuracy(String name, int k, long seed, Class type) { + super(name, seed, type); + this.k = k; + setLoss(this); } /** @@ -99,10 +94,10 @@ public TopKCategoricalAccuracy(Ops tf, String name, int k, long seed, Class t */ @Override public Operand call( - Operand labels, Operand predictions) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); - return Metrics.topKCategoricalAccuracy(tf, tLabels, tPredictions, k); + Ops tf, Operand labels, Operand predictions) { + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + return Metrics.topKCategoricalAccuracy(getTF(), tLabels, tPredictions, k); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java index 1607eaff377..7c6dcb2b6f9 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TrueNegatives.java @@ -16,7 +16,6 @@ import org.tensorflow.framework.metrics.impl.ConfusionMatrixConditionCount; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; -import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -41,7 +40,7 @@ public class TrueNegatives extends ConfusionMatrixConditionCo * @param type the data type for the variables */ public TrueNegatives(long seed, Class type) { - this((String) null, DEFAULT_THRESHOLD, seed, type); + this(null, DEFAULT_THRESHOLD, seed, type); } /** @@ -56,7 +55,7 @@ public TrueNegatives(long seed, Class type) { * @param type the data type for the variables */ public TrueNegatives(float threshold, long seed, Class type) { - this((String) null, new float[] {threshold}, seed, type); + this(null, new float[] {threshold}, seed, type); } /** @@ -71,7 +70,7 @@ public TrueNegatives(float threshold, long seed, Class type) { * @param type the data type for the variables */ public TrueNegatives(float[] thresholds, long seed, Class type) { - this((String) null, thresholds, seed, type); + this(null, thresholds, seed, type); } /** @@ -117,97 +116,4 @@ public TrueNegatives(String name, float threshold, long seed, Class type) { public TrueNegatives(String name, float[] thresholds, long seed, Class type) { super(name, ConfusionMatrixEnum.TRUE_NEGATIVES, thresholds, seed, type); } - - /** - * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name and a - * default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TrueNegatives(Ops tf, long seed, Class type) { - this(tf, null, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TrueNegatives(Ops tf, float threshold, long seed, Class type) { - this(tf, null, new float[] {threshold}, seed, type); - } - - /** - * Creates a TrueNegatives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TrueNegatives(Ops tf, float[] thresholds, long seed, Class type) { - this(tf, null, thresholds, seed, type); - } - - /** - * Creates a TrueNegatives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TrueNegatives(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a TrueNegatives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TrueNegatives(Ops tf, String name, float threshold, long seed, Class type) { - this(tf, name, new float[] {threshold}, seed, type); - } - - /** - * Creates a TrueNegatives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TrueNegatives(Ops tf, String name, float[] thresholds, long seed, Class type) { - this(name, thresholds, seed, type); - init(tf); - } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java index b08987c36aa..7df1a54a345 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/TruePositives.java @@ -16,7 +16,6 @@ import org.tensorflow.framework.metrics.impl.ConfusionMatrixConditionCount; import org.tensorflow.framework.metrics.impl.ConfusionMatrixEnum; -import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -42,7 +41,7 @@ public class TruePositives extends ConfusionMatrixConditionCo * @param type the data type for the variables */ public TruePositives(long seed, Class type) { - this((String) null, DEFAULT_THRESHOLD, seed, type); + this(null, DEFAULT_THRESHOLD, seed, type); } /** @@ -57,7 +56,7 @@ public TruePositives(long seed, Class type) { * @param type the data type for the variables */ public TruePositives(float threshold, long seed, Class type) { - this((String) null, new float[] {threshold}, seed, type); + this(null, new float[] {threshold}, seed, type); } /** @@ -72,7 +71,7 @@ public TruePositives(float threshold, long seed, Class type) { * @param type the data type for the variables */ public TruePositives(float[] thresholds, long seed, Class type) { - this((String) null, thresholds, seed, type); + this(null, thresholds, seed, type); } /** @@ -118,97 +117,4 @@ public TruePositives(String name, float threshold, long seed, Class type) { public TruePositives(String name, float[] thresholds, long seed, Class type) { super(name, ConfusionMatrixEnum.TRUE_POSITIVES, thresholds, seed, type); } - - /** - * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name and a - * default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TruePositives(Ops tf, long seed, Class type) { - this(tf, null, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TruePositives(Ops tf, float threshold, long seed, Class type) { - this(tf, null, new float[] {threshold}, seed, type); - } - - /** - * Creates a TruePositives metric, using {@link Class#getSimpleName()} for the metric name - * - * @param tf the TensorFlow Ops - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TruePositives(Ops tf, float[] thresholds, long seed, Class type) { - this(tf, null, thresholds, seed, type); - } - - /** - * Creates a TruePositives metric, using a default threshold of {@link #DEFAULT_THRESHOLD}. - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TruePositives(Ops tf, String name, long seed, Class type) { - this(tf, name, DEFAULT_THRESHOLD, seed, type); - } - - /** - * Creates a TruePositives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param threshold a threshold value in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TruePositives(Ops tf, String name, float threshold, long seed, Class type) { - this(tf, name, new float[] {threshold}, seed, type); - } - - /** - * Creates a TruePositives metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param thresholds threshold values in the range {@code [0, 1]}. A threshold is compared with - * prediction values to determine the truth value of predictions (i.e., above the threshold is - * {@code true}, below is {@code false}). One metric value is generated for each threshold - * value - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public TruePositives(Ops tf, String name, float[] thresholds, long seed, Class type) { - this(name, thresholds, seed, type); - init(tf); - } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java index 109a9168224..8ddbc49b4fb 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/ConfusionMatrixConditionCount.java @@ -16,7 +16,6 @@ import static org.tensorflow.framework.utils.CastHelper.cast; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.tensorflow.Operand; @@ -41,7 +40,6 @@ public abstract class ConfusionMatrixConditionCount extends M private final ConfusionMatrixEnum confusionMatrixCond; private final float[] thresholds; private final String accumulatorName; - private final Class type; private Variable accumulator; private Assign initializer; @@ -53,11 +51,11 @@ public abstract class ConfusionMatrixConditionCount extends M * @param confusionMatrixCond the confusion matrix condition to calculate * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables + * @param resultType the data type for the variables */ public ConfusionMatrixConditionCount( - String name, ConfusionMatrixEnum confusionMatrixCond, long seed, Class type) { - this(name, confusionMatrixCond, DEFAULT_THRESHOLD, seed, type); + String name, ConfusionMatrixEnum confusionMatrixCond, long seed, Class resultType) { + this(name, confusionMatrixCond, DEFAULT_THRESHOLD, seed, resultType); } /** * Creates a ConfusionMatrixConditionCount type of Metric @@ -69,15 +67,15 @@ public ConfusionMatrixConditionCount( * true}, below is {@code false}). One metric value is generated for each threshold value. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables + * @param resultType the data type for the variables */ public ConfusionMatrixConditionCount( String name, ConfusionMatrixEnum confusionMatrixCond, float threshold, long seed, - Class type) { - this(name, confusionMatrixCond, new float[] {threshold}, seed, type); + Class resultType) { + this(name, confusionMatrixCond, new float[] {threshold}, seed, resultType); } /** @@ -90,97 +88,40 @@ public ConfusionMatrixConditionCount( * true}, below is {@code false}). One metric value is generated for each threshold value. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables + * @param resultType the data type for the variables */ public ConfusionMatrixConditionCount( String name, ConfusionMatrixEnum confusionMatrixCond, float[] thresholds, long seed, - Class type) { - super(name, seed); + Class resultType) { + super(name, seed, resultType); accumulatorName = this.getVariableName(ACCUMULATOR); - this.type = type; this.confusionMatrixCond = confusionMatrixCond; this.thresholds = thresholds; } - /** - * Creates a ConfusionMatrixConditionCount type of Metric, using a threshold of {@link - * #DEFAULT_THRESHOLD} - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param confusionMatrixCond the confusion matrix condition to calculate - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public ConfusionMatrixConditionCount( - Ops tf, String name, ConfusionMatrixEnum confusionMatrixCond, long seed, Class type) { - this(tf, name, confusionMatrixCond, DEFAULT_THRESHOLD, seed, type); - } - /** - * Creates a ConfusionMatrixConditionCount type of Metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param confusionMatrixCond the confusion matrix condition to calculate - * @param threshold a threshold value in {@code [0, 1]}. A threshold is compared with prediction - * values to determine the truth value of predictions (i.e., above the threshold is {@code - * true}, below is {@code false}). One metric value is generated for each threshold value. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public ConfusionMatrixConditionCount( - Ops tf, - String name, - ConfusionMatrixEnum confusionMatrixCond, - float threshold, - long seed, - Class type) { - this(tf, name, confusionMatrixCond, new float[] {threshold}, seed, type); - } - - /** - * Creates a ConfusionMatrixConditionCount type of Metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric, if null then {@link Class#getSimpleName()} is used - * @param confusionMatrixCond the confusion matrix condition to calculate - * @param thresholds threshold values in {@code [0, 1]}. A threshold is compared with prediction - * values to determine the truth value of predictions (i.e., above the threshold is {@code - * true}, below is {@code false}). One metric value is generated for each threshold value. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - */ - public ConfusionMatrixConditionCount( - Ops tf, - String name, - ConfusionMatrixEnum confusionMatrixCond, - float[] thresholds, - long seed, - Class type) { - this(name, confusionMatrixCond, thresholds, seed, type); - init(tf); - } - /** Initialize the metric */ public Ops init(Ops tf) { - setTensorFlowOps(tf); - - Shape variableShape = Shape.of(this.thresholds.length); - - Zeros zeros = new Zeros<>(); - accumulator = - getTF() - .withName(getAccumulatorName()) - .variable(zeros.call(getTF(), getTF().constant(variableShape), type)); - initializer = - getTF().assign(accumulator, zeros.call(getTF(), getTF().constant(variableShape), type)); - applyOnInit(); + if (this.tf == null) { + setTensorFlowOps(tf); + + Shape variableShape = Shape.of(this.thresholds.length); + + Zeros zeros = new Zeros<>(); + variablesNeedAssign = true; + accumulator = + getTF() + .withName(getAccumulatorName()) + .variable(zeros.call(getTF(), getTF().constant(variableShape), getResultType())); + initializer = + getTF() + .assign( + accumulator, + zeros.call(getTF(), getTF().constant(variableShape), getResultType())); + applyOnInit(); + } return getTF(); } @@ -196,6 +137,7 @@ public Assign getInitializer() { /** * Accumulates the metric statistics. * + * @param tf the TensorFlow Ops * @param labels The ground truth values. * @param predictions the predictions * @param sampleWeights Optional weighting of each example. Defaults to 1. Rank is either 0, or @@ -204,16 +146,19 @@ public Assign getInitializer() { */ @Override public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, type); - Operand tPredictions = cast(tf, predictions, type); - Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; - return new ArrayList<>( + init(tf); + Operand tLabels = cast(tf, labels, getResultType()); + Operand tPredictions = cast(tf, predictions, getResultType()); + Operand tSampleWeights = + sampleWeights != null ? cast(tf, sampleWeights, getResultType()) : null; + List result = MetricsHelper.updateConfusionMatrixVariables( getTF(), + variablesNeedAssign, Collections.singletonMap(confusionMatrixCond, accumulator), Collections.singletonMap(confusionMatrixCond, initializer), tLabels, @@ -223,19 +168,26 @@ public List updateStateList( null, tSampleWeights, false, - null)); + null); + variablesNeedAssign = false; + return result; } /** {@inheritDoc} */ @Override - public Operand result() { - return checkTF().identity(accumulator); + public Operand result(Ops tf) { + init(tf); + if (accumulator == null || variablesNeedAssign) { + return getResultZero(); + } else { + return checkTF().identity(accumulator); + } } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); return initializer; } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/LossMetric.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/LossMetric.java index 76c21aebefc..6ebd68ae02a 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/LossMetric.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/LossMetric.java @@ -15,6 +15,7 @@ package org.tensorflow.framework.metrics.impl; import org.tensorflow.Operand; +import org.tensorflow.op.Ops; import org.tensorflow.types.family.TNumber; /** @@ -27,9 +28,11 @@ public interface LossMetric { /** * Calculates the weighted loss between {@code labels} and {@code predictions} * + * @param tf the TensorFlow Ops * @param labels the truth values or labels * @param predictions the predictions * @return the loss */ - Operand call(Operand labels, Operand predictions); + Operand call( + Ops tf, Operand labels, Operand predictions); } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java index ddc8f3e0945..93286e38137 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MeanMetricWrapper.java @@ -51,19 +51,6 @@ protected MeanMetricWrapper(String name, long seed, Class type) { super(name, seed, type); } - /** - * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#WEIGHTED_MEAN} - * - * @param tf the TensorFlow Ops - * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the type for the variables and result - */ - protected MeanMetricWrapper(Ops tf, String name, long seed, Class type) { - super(tf, name, seed, type); - } - /** * Gets the loss function. * @@ -87,6 +74,7 @@ protected void setLoss(LossMetric loss) { * passing the loss to the Mean metric to calculate the weighted mean of the loss over many * iterations. * + * @param tf the TensorFlow Ops * @param labels the truth values or labels * @param predictions the predictions * @param sampleWeights Optional sampleWeights acts as a coefficient for the loss. If a scalar is @@ -99,19 +87,20 @@ protected void setLoss(LossMetric loss) { * @return a List of control operations that updates the Mean state variables. */ public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { if (labels == null || predictions == null) { throw new IllegalArgumentException("missing required inputs for labels and predictions"); } - Ops tf = checkTF(); + init(tf); - Operand tLabels = cast(tf, labels, getResultType()); - Operand tPredictions = cast(tf, predictions, getResultType()); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); - Operand losses = loss.call(tLabels, tPredictions); + Operand losses = loss.call(getTF(), tLabels, tPredictions); - return super.updateStateList(cast(tf, losses, predictions.type()), sampleWeights); + return super.updateStateList(getTF(), cast(getTF(), losses, predictions.type()), sampleWeights); } } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java new file mode 100644 index 00000000000..d347b95e631 --- /dev/null +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java @@ -0,0 +1,78 @@ +/* Copyright 2021 The TensorFlow Authors. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +=======================================================================*/ +package org.tensorflow.framework.metrics.impl; + +import java.util.List; +import org.tensorflow.Operand; +import org.tensorflow.op.Op; +import org.tensorflow.op.Ops; +import org.tensorflow.types.family.TNumber; + +/** The interface for metrics */ +public interface MetricInterface { + + /** + * Creates a List of Operations to update the metric state based on input values. + * + * @param tf the TensorFlow Ops + * @param values the inputs to be passed to update state, this may not be null + * @param sampleWeights sample weights to be applied to values, may be null. + * @return a List of Operations to update the metric state + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * Initializable#init(Ops)}. + */ + List updateStateList( + Ops tf, Operand values, Operand sampleWeights); + + /** + * Creates a List of Operations to update the metric state based on labels and predictions. + * + * @param tf the TensorFlow Ops + * @param labels shape (N, Cx, L1?) where N is the number of examples, Cx is zero or more class + * dimensions, and L1 is a potential extra dimension of size 1 that would be squeezed. Will be + * cast to {@code }. If {@code multiLabel} or if {@code labelWeights != null}, then Cx must + * be a single dimension. + * @param predictions the predictions shape (N, Cx, P1?). Will be cast to {@code T}. + * @param sampleWeights sample weights to be applied to values, may be null. Will be cast to + * {@code }. + * @return a List of Operations to update the metric state + */ + List updateStateList( + Ops tf, + Operand labels, + Operand predictions, + Operand sampleWeights); + + /** + * Gets the current result of the metric + * + * @param tf the TensorFlow Ops + * @return the result, possibly with control dependencies + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * Initializable#init(Ops)}. + * + */ + Operand result(Ops tf); + + /** + * Resets any state variables to their initial values + * + * @param tf the TensorFlow Ops + * @return the control operation for doing the reset + * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link + * Initializable#init(Ops)}. + */ + Op resetStates(Ops tf); +} diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java index 9c05ab543ab..4edaad8f42e 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricsHelper.java @@ -33,6 +33,7 @@ import org.tensorflow.op.Op; import org.tensorflow.op.Ops; import org.tensorflow.op.core.Assign; +import org.tensorflow.op.core.AssignAdd; import org.tensorflow.op.core.OneHot; import org.tensorflow.op.core.Rank; import org.tensorflow.op.core.Squeeze; @@ -70,7 +71,7 @@ public class MetricsHelper { * @param tf the TensorFlow Ops * @param sampleWeights the sample weights. * @param values the values to which weights are applied. - * @return {@code Operation} with control dependencies to ensure {@code sampleWeight} can be + * @return {@code Operation} with control dependencies to ensure {@code sampleWeights} can be * broadcast to {@code values} * @param the type of Operand * @throws NotBroadcastableException If static checks determine {@code sampleWeights} has an @@ -310,10 +311,12 @@ public static List assertShapes( * broadcast to the shape of {@code predictions}. * * @param tf the TensorFlow Ops + * @param variablesNeedAssign indicator whether the variable should be set with {@link Assign} or + * {@link AssignAdd} * @param variablesToUpdate map with {@link ConfusionMatrixEnum} values as valid keys and * corresponding variables to update as values. If {@code multiLabel}, then the variable * shapes are (T, D), where T is the number of thresholds and D is the number of classes - * (after slicing by {@code classIndex}, if provided). If {@code multiLabels}, then the + * (after slicing by {@code classIndex}, if provided). If {@code multiLabel}, then the * variable shapes are (T). * @param varInitializers map with {@link ConfusionMatrixEnum} values as valid keys and * corresponding initializer Operands to for {@code variablesToUpdate}. @@ -349,6 +352,7 @@ public static List assertShapes( @SuppressWarnings({"unchecked", "rawtypes"}) public static List updateConfusionMatrixVariables( Ops tf, + boolean variablesNeedAssign, Map> variablesToUpdate, Map> varInitializers, Operand labels, @@ -599,6 +603,7 @@ tPredictions, cast(tf, tf.constant(0), tPredictions.type())), controlOps.add( weightedAssignAdd( tf, + variablesNeedAssign, op[0], op[1], weightsTiledF, @@ -625,6 +630,7 @@ tPredictions, cast(tf, tf.constant(0), tPredictions.type())), */ private static Operand weightedAssignAdd( Ops tf, + boolean variablesNeedAssign, Operand labels, Operand predictions, Operand weights, @@ -641,16 +647,7 @@ private static Operand weightedAssignAdd( // else: // sum across ND, leaving shape (T) Operand valueSum = tf.reduceSum(labelAndPred, tf.constant(1)); - Operand assignAdd; - if (initializer != null) { - Ops tfc = - tf.withSubScope("weightedAssignAdd") - .withControlDependencies(Collections.singletonList(initializer)); - assignAdd = tfc.assignAdd(variable, valueSum); - } else { - assignAdd = tf.assignAdd(variable, valueSum); - } - return assignAdd; + return variablesNeedAssign ? tf.assign(variable, valueSum) : tf.assignAdd(variable, valueSum); } /** @@ -724,9 +721,9 @@ public static Operand mean( * * @param tf the TensorFlow Ops * @param x the Operand used to calculate the mean - * @param keepDims Indicates whether to keep the dimensions or not. If {@code keepdims} is {@code - * false}, the rank of the tensor is reduced by 1 for each entry in {@code axes }. If {@code - * keepdims} is {@code true}, the reduced dimensions are retained with length 1. + * @param keepDims Indicates whether to keep the dimensions or not. If {@code keepDims} is false, + * the rank of the tensor is reduced by 1 for each entry in {@code axes }. If {@code keepDims} + * is true, the reduced dimensions are retained with length 1. * @param the type of the operand * @return the mean of elements of {@code x}. */ @@ -740,9 +737,9 @@ public static Operand mean(Ops tf, Operand x, boolean * @param tf the TensorFlow Ops * @param x the Operand used to calculate the mean * @param axes Axes to compute the mean. - * @param keepDims Indicates whether to keep the dimensions or not. If {@code keepdims} is {@code - * false}, the rank of the tensor is reduced by 1 for each entry in {@code axes }. If {@code - * keepdims} is {@code true}, the reduced dimensions are retained with length 1. + * @param keepDims Indicates whether to keep the dimensions or not. If {@code keepDims} is false, + * the rank of the tensor is reduced by 1 for each entry in {@code axes }. If {@code keepDims} + * is true, the reduced dimensions are retained with length 1. * @param the data type of the Operand * @return the mean of elements of {@code x}. */ @@ -754,6 +751,20 @@ public static Operand mean( return tf.math.mean(x, axes, Mean.keepDims(keepDims)); } + /** + * If ragged, it checks the compatibility and then returns the flat_values. + * + *

Note: If two tensors are dense, it does not check their compatibility. Note: Although two + * ragged tensors with different ragged ranks could have identical overall rank and dimension + * sizes and hence be compatible, we do not support those cases. + * + * @param tf The TensorFlow Ops + * @param labels A list of potentially ragged tensor of the same ragged_rank. + * @param predictions A potentially ragged tensor of the same ragged_rank as elements in Values. + * @param the data type of the labels + * @param the data type of the predictions and results + * @return a tuple + */ public static LossTuple raggedAssertCompatibleAndGetFlatValues( Ops tf, Operand labels, Operand predictions) { diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java index f6e8e11019f..95ac4752fbe 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/Reduce.java @@ -74,59 +74,37 @@ protected Reduce(String name, long seed, Class resultType) { * @param resultType the type for the variables and result */ protected Reduce(String name, MetricReduction reduction, long seed, Class resultType) { - super(name, seed); + super(name, seed, resultType); this.reduction = reduction; this.totalName = this.getVariableName(TOTAL); this.countName = this.getVariableName(COUNT); this.resultType = resultType; } - /** - * Creates a Reducible Metric with a metric reductions of {@link MetricReduction#SUM} - * - * @param tf the TensorFlow Ops - * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param resultType the type for the variables and result - */ - protected Reduce(Ops tf, String name, long seed, Class resultType) { - this(tf, name, MetricReduction.SUM, seed, resultType); - } - - /** - * @param tf The TensorFlow Ops - * @param name the name for this metric. If null, name defaults to {@link Class#getSimpleName()}. - * @param reduction The type of metric reduction to apply - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param resultType the type for the variables and result - */ - protected Reduce(Ops tf, String name, MetricReduction reduction, long seed, Class resultType) { - this(name, reduction, seed, resultType); - init(tf); - } /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - - setTensorFlowOps(tf); - if (total == null) { - total = getTF().withName(totalName).variable(Shape.scalar(), resultType); - } - if (reduction == MetricReduction.SUM_OVER_BATCH_SIZE - || reduction == MetricReduction.WEIGHTED_MEAN) { - if (count == null) { - count = getTF().withName(countName).variable(Shape.scalar(), resultType); + if (this.tf == null) { + setTensorFlowOps(tf); + if (total == null) { + variablesNeedAssign = true; + total = getTF().withName(totalName).variable(Shape.scalar(), resultType); + } + if (reduction == MetricReduction.SUM_OVER_BATCH_SIZE + || reduction == MetricReduction.WEIGHTED_MEAN) { + if (count == null) { + variablesNeedAssign = true; + count = getTF().withName(countName).variable(Shape.scalar(), resultType); + } } + applyOnInit(); } - applyOnInit(); return getTF(); } /** {@inheritDoc} */ - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); List controls = new ArrayList<>(); if (total != null) { controls.add(checkTF().assign(total, cast(getTF(), getTF().constant(0), total.type()))); @@ -148,16 +126,16 @@ public Op resetStates() { */ @Override public List updateStateList( - Operand values, Operand sampleWeights) { - + Ops tf, Operand values, Operand sampleWeights) { if (values == null) { throw new IllegalArgumentException("values is required."); } - Ops tf = checkTF(); + init(tf); + List updateOperations = new ArrayList<>(); // cast everything to match the variables Operand tSampleWeights = null; - Operand tValues = cast(tf, values, getResultType()); + Operand tValues = cast(getTF(), values, getResultType()); if (sampleWeights != null) { tSampleWeights = cast(getTF(), sampleWeights, getResultType()); @@ -194,7 +172,9 @@ public List updateStateList( Operand weightedValueSum = getTF().reduceSum(tValues, LossesHelper.allAxes(getTF(), tValues)); Operand totalUpdate = - getTF().assignAdd(total, cast(getTF(), weightedValueSum, total.type())); + variablesNeedAssign + ? getTF().assign(total, cast(getTF(), weightedValueSum, total.type())) + : getTF().assignAdd(total, cast(getTF(), weightedValueSum, total.type())); updateOperations.add(totalUpdate); Operand numValues; // Exit early if the reduction doesn't have a denominator. @@ -221,30 +201,41 @@ public List updateStateList( String.format("reduction [%s] not implemented", reduction)); } - Operand totalCount = getTF().assignAdd(this.count, numValues); + Operand totalCount = + variablesNeedAssign + ? getTF().assign(count, numValues) + : getTF().assignAdd(count, numValues); updateOperations.add(totalCount); } + // reset so next time we use assignAdd instead of assign. + variablesNeedAssign = false; return updateOperations; } /** {@inheritDoc} */ @Override - public Operand result() { + public Operand result(Ops tf) { + init(tf); Operand fResult; - switch (this.reduction) { - case SUM: - fResult = checkTF().identity(total); - break; - case WEIGHTED_MEAN: - case SUM_OVER_BATCH_SIZE: - fResult = checkTF().math.divNoNan(total, cast(getTF(), count, resultType)); - break; - default: - throw new UnsupportedOperationException( - String.format("reduction [%s] not implemented", reduction)); + // return 0 if total is not set or + if (total == null || variablesNeedAssign) { + fResult = getResultZero(); + } else { + switch (this.reduction) { + case SUM: + fResult = checkTF().identity(total); + break; + case WEIGHTED_MEAN: + case SUM_OVER_BATCH_SIZE: + fResult = checkTF().math.divNoNan(total, cast(getTF(), count, resultType)); + break; + default: + throw new UnsupportedOperationException( + String.format("reduction [%s] not implemented", reduction)); + } } return fResult; } diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java index b6bf397f4e7..5457ef36d8d 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/SensitivitySpecificityBase.java @@ -37,7 +37,6 @@ public abstract class SensitivitySpecificityBase extends Metr private final String falsePositivesName; private final String trueNegativesName; private final String falseNegativesName; - private final Class type; protected Variable truePositives; protected Variable falsePositives; protected Variable trueNegatives; @@ -55,13 +54,13 @@ public abstract class SensitivitySpecificityBase extends Metr * @param numThresholds The number of thresholds to use for matching the given recall. * @param seed the seed for random number generation. An initializer created with a given seed * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables + * @param resultType the data type for the variables * @throws IllegalArgumentException if numThresholds <= 0. */ - protected SensitivitySpecificityBase(String name, int numThresholds, long seed, Class type) { - super(name, seed); + protected SensitivitySpecificityBase( + String name, int numThresholds, long seed, Class resultType) { + super(name, seed, resultType); if (numThresholds <= 0) throw new IllegalArgumentException("numThresholds must be > 0."); - this.type = type; this.truePositivesName = this.getVariableName(TRUE_POSITIVES); this.falsePositivesName = this.getVariableName(FALSE_POSITIVES); this.trueNegativesName = this.getVariableName(TRUE_NEGATIVES); @@ -80,52 +79,37 @@ protected SensitivitySpecificityBase(String name, int numThresholds, long seed, } } - /** - * Creates a SensitivitySpecificityBase Metric - * - * @param tf the TensorFlow Ops - * @param name the name of the metric instance, if null then {@link Class#getSimpleName()} is used - * @param numThresholds The number of thresholds to use for matching the given recall. - * @param seed the seed for random number generation. An initializer created with a given seed - * will always produce the same random tensor for a given shape and data type. - * @param type the data type for the variables - * @throws IllegalArgumentException if numThresholds <= 0. - */ - protected SensitivitySpecificityBase( - Ops tf, String name, int numThresholds, long seed, Class type) { - this(name, numThresholds, seed, type); - init(tf); - } - /** {@inheritDoc} */ @Override public Ops init(Ops tf) { - setTensorFlowOps(tf); - Zeros zeros = new Zeros<>(); - Shape varShape = Shape.of(numThresholds); - Operand zero = zeros.call(getTF(), getTF().constant(varShape), type); - - if (this.getTruePositives() == null) { - - truePositives = getTF().withName(truePositivesName).variable(zero); - truePositivesInitializer = getTF().assign(truePositives, zero); - } - if (this.getFalsePositives() == null) { - - falsePositives = getTF().withName(falsePositivesName).variable(zero); - falsePositivesInitializer = getTF().assign(falsePositives, zero); - } - if (this.getTrueNegatives() == null) { - - trueNegatives = getTF().withName(trueNegativesName).variable(zero); - trueNegativesInitializer = getTF().assign(trueNegatives, zero); - } - if (this.getFalseNegatives() == null) { - - falseNegatives = getTF().withName(falseNegativesName).variable(zero); - falseNegativesInitializer = getTF().assign(falseNegatives, zero); + if (this.tf == null) { + setTensorFlowOps(tf); + Zeros zeros = new Zeros<>(); + Shape varShape = Shape.of(numThresholds); + Operand zero = zeros.call(getTF(), getTF().constant(varShape), getResultType()); + + if (this.getTruePositives() == null) { + variablesNeedAssign = true; + truePositives = getTF().withName(truePositivesName).variable(zero); + truePositivesInitializer = getTF().assign(truePositives, zero); + } + if (this.getFalsePositives() == null) { + variablesNeedAssign = true; + falsePositives = getTF().withName(falsePositivesName).variable(zero); + falsePositivesInitializer = getTF().assign(falsePositives, zero); + } + if (this.getTrueNegatives() == null) { + variablesNeedAssign = true; + trueNegatives = getTF().withName(trueNegativesName).variable(zero); + trueNegativesInitializer = getTF().assign(trueNegatives, zero); + } + if (this.getFalseNegatives() == null) { + variablesNeedAssign = true; + falseNegatives = getTF().withName(falseNegativesName).variable(zero); + falseNegativesInitializer = getTF().assign(falseNegatives, zero); + } + applyOnInit(); } - applyOnInit(); return getTF(); } @@ -156,6 +140,7 @@ public Op initializeVariables() { /** * Accumulates confusion matrix statistics. * + * @param tf the TensorFlow Ops * @param labels The ground truth values. * @param predictions the predictions * @param sampleWeights Optional weighting of each example. Defaults to 1. Rank is either 0, or @@ -165,13 +150,15 @@ public Op initializeVariables() { @Override @SuppressWarnings("unchecked") public List updateStateList( + Ops tf, Operand labels, Operand predictions, Operand sampleWeights) { - Ops tf = checkTF(); - Operand tLabels = cast(tf, labels, type); - Operand tPredictions = cast(tf, predictions, type); - Operand tSampleWeights = sampleWeights != null ? cast(tf, sampleWeights, type) : null; + init(tf); + Operand tLabels = cast(getTF(), labels, getResultType()); + Operand tPredictions = cast(getTF(), predictions, getResultType()); + Operand tSampleWeights = + sampleWeights != null ? cast(getTF(), sampleWeights, getResultType()) : null; Map> confusionMatrix = new HashMap<>(); confusionMatrix.put(ConfusionMatrixEnum.TRUE_POSITIVES, getTruePositives()); @@ -179,24 +166,29 @@ public List updateStateList( confusionMatrix.put(ConfusionMatrixEnum.TRUE_NEGATIVES, getTrueNegatives()); confusionMatrix.put(ConfusionMatrixEnum.FALSE_NEGATIVES, getFalseNegatives()); - return MetricsHelper.updateConfusionMatrixVariables( - tf, - confusionMatrix, - Collections.EMPTY_MAP, - tLabels, - tPredictions, - tf.constant(thresholds), - null, - null, - tSampleWeights, - false, - null); + List result = + MetricsHelper.updateConfusionMatrixVariables( + getTF(), + variablesNeedAssign, + confusionMatrix, + Collections.EMPTY_MAP, + tLabels, + tPredictions, + getTF().constant(thresholds), + null, + null, + tSampleWeights, + false, + null); + + variablesNeedAssign = false; + return result; } /** {@inheritDoc} */ @Override - public Op resetStates() { - checkTF(); + public Op resetStates(Ops tf) { + init(tf); return initializeVariables(); } @@ -289,13 +281,4 @@ public String getTrueNegativesName() { public String getFalseNegativesName() { return falseNegativesName; } - - /** - * Gets the type - * - * @return the type - */ - public Class getType() { - return type; - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java index f5fc80c7702..727cae5c1c3 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AUCTest.java @@ -45,37 +45,18 @@ public void testValueIsIdempotent() { Ops tf = session.getTF(); Operand yPred = tf.constant(predArray); Operand yTrue = tf.constant(trueArray); - AUC instance = new AUC<>(tf, numThresholds, 1001L, TFloat32.class); + AUC instance = new AUC<>(numThresholds, 1001L, TFloat32.class); - session.run(instance.resetStates()); - - Op update = instance.updateState(yTrue, yPred, null); + Op update = instance.updateState(tf, yTrue, yPred, null); for (int i = 0; i < 10; i++) { session.run(update); } - Operand result = instance.result(); + Operand result = instance.result(tf); for (int i = 0; i < 10; i++) { - session.evaluate(result, instance.result()); - } - - // test init(tf) - instance = new AUC<>(numThresholds, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - - update = instance.updateState(yTrue, yPred, null); - - for (int i = 0; i < 10; i++) { - session.run(update); - } - - result = instance.result(); - - for (int i = 0; i < 10; i++) { - session.evaluate(result, instance.result()); + session.evaluate(result, instance.result(tf)); } } } @@ -92,9 +73,7 @@ public void testCumulative() { Ops tf = session.getTF(); Operand yPred = tf.constant(predArray); Operand yTrue = tf.constant(trueArray); - AUC instance = new AUC<>(tf, numThresholds, 1001L, TFloat32.class); - - session.run(instance.resetStates()); + AUC instance = new AUC<>(numThresholds, 1001L, TFloat32.class); assertNull(instance.getTruePositives()); assertNull(instance.getFalsePositives()); @@ -102,7 +81,7 @@ public void testCumulative() { assertNull(instance.getFalseNegatives()); for (int i = 0; i < 3; i++) { - Op update = instance.updateState(yTrue, yPred, null); + Op update = instance.updateState(tf, yTrue, yPred, null); session.run(update); session.evaluate(tp[i], instance.getTruePositives()); session.evaluate(fp[i], instance.getFalsePositives()); @@ -111,40 +90,9 @@ public void testCumulative() { } // test reset - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); for (int i = 0; i < 3; i++) { - Op update = instance.updateState(yTrue, yPred, null); - session.run(update); - session.evaluate(tp[i], instance.getTruePositives()); - session.evaluate(fp[i], instance.getFalsePositives()); - session.evaluate(tn[i], instance.getTrueNegatives()); - session.evaluate(fn[i], instance.getFalseNegatives()); - } - - // test init(tf) - instance = new AUC<>(numThresholds, 1001L, TFloat32.class); - instance.init(tf); - - session.run(instance.resetStates()); - - assertNull(instance.getTruePositives()); - assertNull(instance.getFalsePositives()); - assertNull(instance.getTrueNegatives()); - assertNull(instance.getFalseNegatives()); - - for (int i = 0; i < 3; i++) { - Op update = instance.updateState(yTrue, yPred, null); - session.run(update); - session.evaluate(tp[i], instance.getTruePositives()); - session.evaluate(fp[i], instance.getFalsePositives()); - session.evaluate(tn[i], instance.getTrueNegatives()); - session.evaluate(fn[i], instance.getFalseNegatives()); - } - - // test reset - session.run(instance.resetStates()); - for (int i = 0; i < 3; i++) { - Op update = instance.updateState(yTrue, yPred, null); + Op update = instance.updateState(tf, yTrue, yPred, null); session.run(update); session.evaluate(tp[i], instance.getTruePositives()); session.evaluate(fp[i], instance.getFalsePositives()); @@ -158,7 +106,7 @@ public void testCumulative() { public void basicTestSampleWeight() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - AUC instance = new AUC<>(tf, numThresholds, 1001L, TFloat32.class); + AUC instance = new AUC<>(numThresholds, 1001L, TFloat32.class); assertEquals(numThresholds, instance.getNumThresholds()); float[] expectedThresholds = new float[] {-1e-7f, 0.5f, 1 + 1e-7f}; assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); @@ -167,20 +115,9 @@ public void basicTestSampleWeight() { Operand yTrue = tf.constant(new float[] {0f, 0.5f, 0.3f, 0.9f}); Operand sampleWeights = tf.constant(new float[] {1, 0, 0, 1}); - Op update = instance.updateState(yTrue, yPred, sampleWeights); - session.run(update); - Operand result = instance.result(); - session.evaluate(1.0f, result); - - // test init(tf) - instance = new AUC<>(numThresholds, 1001L, TFloat32.class); - instance.init(tf); - assertEquals(numThresholds, instance.getNumThresholds()); - assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); - - update = instance.updateState(yTrue, yPred, sampleWeights); + Op update = instance.updateState(tf, yTrue, yPred, sampleWeights); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.0f, result); } } @@ -190,24 +127,11 @@ public void testUnweightedAllCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); Operand yTrue = cast(tf, tf.constant(this.trueArray), TFloat32.class); - AUC instance = new AUC<>(tf, this.numThresholds, 1001L, TFloat32.class); - session.run(instance.resetStates()); - - Op update = instance.updateState(yTrue, yTrue, null); - session.run(update); - Operand result = instance.result(); - - session.evaluate(1f, result); + AUC instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); - // test init(tf) - instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); - instance.init(tf); - instance.resetStates(); - session.run(instance.resetStates()); - - update = instance.updateState(yTrue, yTrue, null); + Op update = instance.updateState(tf, yTrue, yTrue, null); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1f, result); } @@ -219,22 +143,10 @@ public void testUnweighted() { Ops tf = session.getTF(); Operand yPred = tf.constant(this.predArray); Operand yTrue = tf.constant(this.trueArray); - AUC instance = new AUC<>(tf, this.numThresholds, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, null); + AUC instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); + Op update = instance.updateState(tf, yTrue, yPred, null); session.run(update); - Operand result = instance.result(); - - // float expectedResult = (0.75f * 1 + 0.25f * 0); - session.evaluate(0.75f, result); - - // test init(tf) - instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, null); - session.run(update); - result = instance.result(); + Operand result = instance.result(tf); // float expectedResult = (0.75f * 1 + 0.25f * 0); session.evaluate(0.75f, result); @@ -247,26 +159,12 @@ public void testManualThresholds() { Ops tf = session.getTF(); Operand yPred = tf.constant(this.predArray); Operand yTrue = tf.constant(this.trueArray); - AUC instance = new AUC<>(tf, new float[] {0.5f}, 1001L, TFloat32.class); + AUC instance = new AUC<>(new float[] {0.5f}, 1001L, TFloat32.class); float[] expectedThresholds = new float[] {-AUC.EPSILON, 0.5f, 1 + AUC.EPSILON}; assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, null); - session.run(update); - Operand result = instance.result(); - - // float expectedResult = (0.75f * 1 + 0.25f * 0); - session.evaluate(0.75f, result); - - // test init(tf) - instance = new AUC<>(new float[] {0.5f}, 1001L, TFloat32.class); - assertArrayEquals(expectedThresholds, instance.getThresholds(), epsilon); - instance.init(tf); - instance.resetStates(); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, null); + Op update = instance.updateState(tf, yTrue, yPred, null); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); // float expectedResult = (0.75f * 1 + 0.25f * 0); session.evaluate(0.75f, result); @@ -281,23 +179,13 @@ public void testWeightedRocInterpolation() { Operand yTrue = tf.constant(this.trueArray); Operand sampleWights = tf.constant(this.sampleWeight); - AUC instance = new AUC<>(tf, this.numThresholds, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, sampleWights); + AUC instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); + Op update = instance.updateState(tf, yTrue, yPred, sampleWights); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expectedResult = (0.78571427f * 1 + 0.2857145f * 0); session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>(this.numThresholds, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, sampleWights); - session.run(update); - result = instance.result(); - session.evaluate(expectedResult, result); } } @@ -310,31 +198,13 @@ public void testWeightedRocMajoring() { Operand sampleWights = tf.constant(this.sampleWeight); AUC instance = - new AUC<>( - tf, - this.numThresholds, - AUCCurve.ROC, - AUCSummationMethod.MAJORING, - 1001L, - TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, sampleWights); - session.run(update); - Operand result = instance.result(); - - float expectedResult = (1.0f + .5714285f * 0f); - session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>( this.numThresholds, AUCCurve.ROC, AUCSummationMethod.MAJORING, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, sampleWights); + Op update = instance.updateState(tf, yTrue, yPred, sampleWights); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); + float expectedResult = (1.0f + .5714285f * 0f); session.evaluate(expectedResult, result); } } @@ -348,31 +218,13 @@ public void testWeightedRocMinoring() { Operand sampleWights = tf.constant(this.sampleWeight); AUC instance = - new AUC<>( - tf, - this.numThresholds, - AUCCurve.ROC, - AUCSummationMethod.MINORING, - 1001L, - TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, sampleWights); - session.run(update); - Operand result = instance.result(); - - float expectedResult = (0.5714285f + 0f * 0f); - session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>( this.numThresholds, AUCCurve.ROC, AUCSummationMethod.MINORING, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, sampleWights); + Op update = instance.updateState(tf, yTrue, yPred, sampleWights); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); + float expectedResult = (0.5714285f + 0f * 0f); session.evaluate(expectedResult, result); } } @@ -386,29 +238,12 @@ public void testWeightedPrMajoring() { Operand sampleWights = tf.constant(this.sampleWeight); AUC instance = - new AUC<>( - tf, - this.numThresholds, - AUCCurve.PR, - AUCSummationMethod.MAJORING, - 1001L, - TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, sampleWights); - session.run(update); - Operand result = instance.result(); - float expectedResult = 0.4285715f + 0.5714285f; - session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>( this.numThresholds, AUCCurve.PR, AUCSummationMethod.MAJORING, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, sampleWights); + Op update = instance.updateState(tf, yTrue, yPred, sampleWights); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); + float expectedResult = 0.4285715f + 0.5714285f; session.evaluate(expectedResult, result); } } @@ -422,29 +257,12 @@ public void testWeightedPrMinoring() { Operand sampleWights = tf.constant(this.sampleWeight); AUC instance = - new AUC<>( - tf, - this.numThresholds, - AUCCurve.PR, - AUCSummationMethod.MINORING, - 1001L, - TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, sampleWights); - session.run(update); - Operand result = instance.result(); - float expectedResult = 0.7f * 0.4285715f + 0f * 0.5714285f; - session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>( this.numThresholds, AUCCurve.PR, AUCSummationMethod.MINORING, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, sampleWights); + Op update = instance.updateState(tf, yTrue, yPred, sampleWights); session.run(update); - result = instance.result(); + Operand result = instance.result(tf); + float expectedResult = 0.7f * 0.4285715f + 0f * 0.5714285f; session.evaluate(expectedResult, result); } } @@ -457,37 +275,18 @@ public void testWeightedPrInterpolation() { Operand yTrue = tf.constant(this.trueArray); Operand sampleWights = tf.constant(this.sampleWeight); - AUC instance = - new AUC<>(tf, this.numThresholds, AUCCurve.PR, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(yTrue, yPred, sampleWights); + AUC instance = new AUC<>(this.numThresholds, AUCCurve.PR, 1001L, TFloat32.class); + Op update = instance.updateState(tf, yTrue, yPred, sampleWights); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expectedResult = 0.916613f; session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>(this.numThresholds, AUCCurve.PR, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(yTrue, yPred, sampleWights); - session.run(update); - result = instance.result(); - session.evaluate(expectedResult, result); } } @Test public void testInvalidNumThresholds() { - assertThrows( - IllegalArgumentException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Ops tf = session.getTF(); - - new AUC<>(tf, -1, 1001L, TFloat32.class); - } - }); + assertThrows(IllegalArgumentException.class, () -> new AUC<>(-1, 1001L, TFloat32.class)); } @Test @@ -516,34 +315,12 @@ public void testExtraDims() { Operand logits = tf.constant(logitsArray); Operand labels = tf.constant(labelArray); - AUC instance = new AUC<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, logits, null); + AUC instance = new AUC<>(1001L, TFloat32.class); + Op update = instance.updateState(tf, labels, logits, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expectedResult = 0.5f; session.evaluate(expectedResult, result); - - // test init(tf) - instance = new AUC<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - update = instance.updateState(labels, logits, null); - session.run(update); - result = instance.result(); - session.evaluate(expectedResult, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - AUC instance = new AUC<>(1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java index 2195f61d5b4..ad943c4632d 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/AccuracyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -33,32 +31,17 @@ public class AccuracyTest { public void testCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Accuracy instance = new Accuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Accuracy instance = new Accuracy<>(1001L, TFloat32.class); int[] trueArray = {1, 2, 3, 4}; float[] predArray = {1, 2, 3, 4}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 1))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(4, 1))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); - session.evaluate(4F, total); - session.evaluate(4, count); - session.evaluate(1F, result); - - // test init(tf) - instance = new Accuracy<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - - op = instance.updateState(labels, predictions, null); - session.run(op); - total = instance.getTotal(); - count = instance.getCount(); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4F, total); session.evaluate(4, count); session.evaluate(1F, result); @@ -69,8 +52,7 @@ public void testCorrect() { public void testSampleWeight() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Accuracy instance = new Accuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Accuracy instance = new Accuracy<>(1001L, TFloat32.class); float[] trueArray = {2, 1}; float[] predArray = {2, 0}; @@ -80,27 +62,12 @@ public void testSampleWeight() { Operand sampleWeight = tf.reshape(tf.constant(new float[] {.5F, .2F}), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); - session.evaluate(.5F, total); - session.evaluate(.7, count); - session.evaluate(0.71428573f, result); - - // test init(tf) - instance = new Accuracy<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - - op = instance.updateState(labels, predictions, sampleWeight); - session.run(op); - - total = instance.getTotal(); - count = instance.getCount(); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(.5F, total); session.evaluate(.7, count); session.evaluate(0.71428573f, result); @@ -111,106 +78,91 @@ public void testSampleWeight() { public void testVariableState() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Accuracy instance = new Accuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Accuracy instance = new Accuracy<>(1001L, TFloat32.class); float[] trueArray = {2, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 1))); Operand sampleWeight = tf.reshape(tf.constant(new float[] {.5F, .2F}), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, labels, sampleWeight); + Op op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); // 2nd run - op = instance.updateState(labels, labels, sampleWeight); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(1.4F, total); session.evaluate(1.4, count); session.evaluate(1.0F, result); // new instance same graph - instance = new Accuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); - op = instance.updateState(labels, labels, sampleWeight); + instance = new Accuracy<>(1001L, TFloat32.class); + session.run(instance.resetStates(tf)); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); total = instance.getTotal(); count = instance.getCount(); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); // reset variables - session.run(instance.resetStates()); - result = instance.result(); - op = instance.updateState(labels, labels, sampleWeight); + session.run(instance.resetStates(tf)); + result = instance.result(tf); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); - // test init(tf) instance = new Accuracy<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); - op = instance.updateState(labels, labels, sampleWeight); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); total = instance.getTotal(); count = instance.getCount(); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); // 2nd run - op = instance.updateState(labels, labels, sampleWeight); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(1.4F, total); session.evaluate(1.4, count); session.evaluate(1.0F, result); // new instance same graph - instance = new Accuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); - op = instance.updateState(labels, labels, sampleWeight); + instance = new Accuracy<>(1001L, TFloat32.class); + session.run(instance.resetStates(tf)); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); total = instance.getTotal(); count = instance.getCount(); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); // reset variables - session.run(instance.resetStates()); - result = instance.result(); - op = instance.updateState(labels, labels, sampleWeight); + session.run(instance.resetStates(tf)); + result = instance.result(tf); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Accuracy instance = new Accuracy<>(1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java index f8d833eaa6a..fb3b4ca7cd4 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryAccuracyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -33,31 +31,18 @@ public class BinaryAccuracyTest { public void testCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - BinaryAccuracy instance = new BinaryAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + BinaryAccuracy instance = new BinaryAccuracy<>(1001L, TFloat32.class); + int[] trueArray = {1, 0}; float[] predArray = {1, 0}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 1))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); - session.evaluate(2F, total); - session.evaluate(2, count); - session.evaluate(1F, result); - - // test init(tf) - instance = new BinaryAccuracy<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - op = instance.updateState(labels, predictions, null); - session.run(op); - total = instance.getTotal(); - count = instance.getCount(); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2F, total); session.evaluate(2, count); session.evaluate(1F, result); @@ -68,31 +53,18 @@ public void testCorrect() { public void testPredictionSqueeze() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - BinaryAccuracy instance = new BinaryAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + BinaryAccuracy instance = new BinaryAccuracy<>(1001L, TFloat32.class); + int[] trueArray = {1, 0}; float[] predArray = {1, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 1))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 1, 1))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); - session.evaluate(2F, total); - session.evaluate(4, count); - session.evaluate(0.5F, result); - - // test init(tf) - instance = new BinaryAccuracy<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - op = instance.updateState(labels, predictions, null); - session.run(op); - total = instance.getTotal(); - count = instance.getCount(); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2F, total); session.evaluate(4, count); session.evaluate(0.5F, result); @@ -103,8 +75,8 @@ public void testPredictionSqueeze() { public void testSampleWeight() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - BinaryAccuracy instance = new BinaryAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + BinaryAccuracy instance = new BinaryAccuracy<>(1001L, TFloat32.class); + int[] trueArray = {1, 1}; float[] predArray = {1, 0}; @@ -114,11 +86,11 @@ public void testSampleWeight() { Operand sampleWeight = tf.reshape(tf.constant(new float[] {.5F, .2F}), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.5F, total); session.evaluate(.7, count); session.evaluate(0.71428573f, result); @@ -126,12 +98,12 @@ public void testSampleWeight() { // test init(tf) instance = new BinaryAccuracy<>(1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); - op = instance.updateState(labels, predictions, sampleWeight); + + op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); total = instance.getTotal(); count = instance.getCount(); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.5F, total); session.evaluate(.7, count); session.evaluate(0.71428573f, result); @@ -142,63 +114,50 @@ public void testSampleWeight() { public void testVariableState() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - BinaryAccuracy instance = new BinaryAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + BinaryAccuracy instance = new BinaryAccuracy<>(1001L, TFloat32.class); + float[] trueArray = {2, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 1))); Operand sampleWeight = tf.reshape(tf.constant(new float[] {.5F, .2F}), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, labels, sampleWeight); + Op op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.2F, total); session.evaluate(.7, count); session.evaluate(0.2857143F, result); // 2nd run - op = instance.updateState(labels, labels, sampleWeight); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.4F, total); session.evaluate(1.4, count); session.evaluate(0.2857143F, result); // new instance same graph - instance = new BinaryAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); - op = instance.updateState(labels, labels, sampleWeight); + instance = new BinaryAccuracy<>(1001L, TFloat32.class); + session.run(instance.resetStates(tf)); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); total = instance.getTotal(); count = instance.getCount(); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.2F, total); session.evaluate(.7, count); session.evaluate(0.2857143F, result); // reset variables - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(0.0, total); session.evaluate(0.0, count); - op = instance.updateState(labels, labels, sampleWeight); + op = instance.updateState(tf, labels, labels, sampleWeight); session.run(op); - result = instance.result(); - session.evaluate(0.2F, total); - session.evaluate(.7, count); - session.evaluate(0.2857143F, result); - - // test init(tf) - instance = new BinaryAccuracy<>(1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - op = instance.updateState(labels, labels, sampleWeight); - session.run(op); - total = instance.getTotal(); - count = instance.getCount(); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.2F, total); session.evaluate(.7, count); session.evaluate(0.2857143F, result); @@ -209,48 +168,21 @@ public void testVariableState() { public void testBinaryAccuracyAThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - BinaryAccuracy instance = new BinaryAccuracy<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + BinaryAccuracy instance = new BinaryAccuracy<>(0.7f, 1001L, TFloat32.class); int[] trueArray = {1, 1, 0, 0}; float[] predArray = {0.9f, 0.6f, 0.4f, 0.8f}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 1))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(4, 1))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); - session.evaluate(2F, total); - session.evaluate(4, count); - session.evaluate(0.5F, result); - - // test init(tf) - instance = new BinaryAccuracy<>(0.7f, 1001L, TFloat32.class); - instance.init(tf); - session.run(instance.resetStates()); - - op = instance.updateState(labels, predictions, null); - session.run(op); - total = instance.getTotal(); - count = instance.getCount(); - result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2F, total); session.evaluate(4, count); session.evaluate(0.5F, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - BinaryAccuracy instance = new BinaryAccuracy<>(1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java index 7fc3a7962c6..1a0181f3e36 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/BinaryCrossentropyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -35,18 +33,17 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); BinaryCrossentropy instance = - new BinaryCrossentropy<>(tf, "BCE_testUnweighted", false, 0, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new BinaryCrossentropy<>("BCE_testUnweighted", false, 0, 1001L, TFloat64.class); float[] trueArray = {1, 0, 1, 0}; float[] predictionArray = {1, 1, 1, 0}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 2))); Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(2, 2))); - Op op = instance.updateState(labels, yPrediction, null); + Op op = instance.updateState(tf, labels, yPrediction, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.71247434F, total); session.evaluate(2, count); session.evaluate(3.85623717F, result); @@ -58,17 +55,17 @@ public void testUnweightedLogits() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); BinaryCrossentropy instance = - new BinaryCrossentropy<>(tf, "BCE_testUnweightedLogits", true, 0, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new BinaryCrossentropy<>("BCE_testUnweightedLogits", true, 0, 1001L, TFloat64.class); + float[] trueArray = {1, 0, 1, 0, 1, 1}; double[] logitsArray = {100.0, -100.0, 100.0, 100.0, 100.0, -100.0}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand logits = tf.reshape(tf.constant(logitsArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, logits, null); + Op op = instance.updateState(tf, labels, logits, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(66.66667, total); session.evaluate(2, count); session.evaluate(33.333332, result); @@ -80,20 +77,19 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); BinaryCrossentropy instance = - new BinaryCrossentropy<>(tf, "BCE_testWeighted", false, 0, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new BinaryCrossentropy<>("BCE_testWeighted", false, 0, 1001L, TFloat32.class); int[] trueArray = {1, 0, 1, 0}; float[] predictionArray = {1, 1, 1, 0}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 2))); Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(2, 2))); Operand sampleWeight = tf.constant(new float[] {1.5f, 2.f}); - Op op = instance.updateState(labels, yPrediction, sampleWeight); + Op op = instance.updateState(tf, labels, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(11.499929f, total); session.evaluate(3.5f, count); session.evaluate(3.285694f, result); @@ -105,20 +101,19 @@ public void testWeightedLogits() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); BinaryCrossentropy instance = - new BinaryCrossentropy<>(tf, "BCE_testWeightedLogits", true, 0, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new BinaryCrossentropy<>("BCE_testWeightedLogits", true, 0, 1001L, TFloat64.class); float[] trueArray = {1, 0, 1, 0, 1, 1}; double[] logitsArray = {100.0, -100.0, 100.0, 100.0, 100.0, -100.0}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand logits = tf.reshape(tf.constant(logitsArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new double[] {2, 2.5}); - Op op = instance.updateState(labels, logits, sampleWeight); + Op op = instance.updateState(tf, labels, logits, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(166.66666, total); session.evaluate(4.5, count); session.evaluate(37.037033, result); @@ -132,18 +127,18 @@ public void testLabelSmoothing() { float labelSmoothing = 0.1F; BinaryCrossentropy instance = new BinaryCrossentropy<>( - tf, "BCE_testWeightedLabS", true, labelSmoothing, 1001L, TFloat64.class); - session.run(instance.resetStates()); + "BCE_testWeightedLabS", true, labelSmoothing, 1001L, TFloat64.class); + float[] trueArray = {1, 0, 1}; double[] logitsArray = {100., -100., -100.}; Operand labels = tf.constant(trueArray); Operand logits = tf.constant(logitsArray); - Op op = instance.updateState(labels, logits, null); + Op op = instance.updateState(tf, labels, logits, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(35, total); session.evaluate(1, count); @@ -160,35 +155,21 @@ public void testInitTF() { new BinaryCrossentropy<>( "BCE_testWeightedLabS", true, labelSmoothing, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + float[] trueArray = {1, 0, 1}; double[] logitsArray = {100., -100., -100.}; Operand labels = tf.constant(trueArray); Operand logits = tf.constant(logitsArray); - Op op = instance.updateState(labels, logits, null); + Op op = instance.updateState(tf, labels, logits, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(35, total); session.evaluate(1, count); session.evaluate(35, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - BinaryCrossentropy instance = - new BinaryCrossentropy<>( - "BCE_testWeightedLabS", false, 1.0f, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java index 6fb55e41ca3..a080993fac7 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalAccuracyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -33,8 +31,8 @@ public class CategoricalAccuracyTest { public void testCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - CategoricalAccuracy instance = new CategoricalAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + CategoricalAccuracy instance = new CategoricalAccuracy<>(1001L, TFloat32.class); + int[] trueArray = { 0, 0, 1, 0, 1, 0 @@ -46,11 +44,11 @@ public void testCorrect() { Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2F, total); session.evaluate(2, count); session.evaluate(1F, result); @@ -61,8 +59,8 @@ public void testCorrect() { public void testSampleWeight() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - CategoricalAccuracy instance = new CategoricalAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + CategoricalAccuracy instance = new CategoricalAccuracy<>(1001L, TFloat32.class); + int[] trueArray = { 0, 0, 1, 0, 1, 0 @@ -77,11 +75,11 @@ public void testSampleWeight() { Operand sampleWeight = tf.reshape(tf.constant(new float[] {.5F, .2F}), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); @@ -92,8 +90,8 @@ public void testSampleWeight() { public void testVariableState() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - CategoricalAccuracy instance = new CategoricalAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + CategoricalAccuracy instance = new CategoricalAccuracy<>(1001L, TFloat32.class); + int[] trueArray = { 0, 0, 1, 0, 1, 0 @@ -109,29 +107,29 @@ public void testVariableState() { Operand sampleWeight = tf.reshape(tf.constant(new float[] {.5F, .2F}), tf.constant(Shape.of(2, 1))); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); // 2nd run - op = instance.updateState(labels, predictions, sampleWeight); + op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(1.4F, total); session.evaluate(1.4, count); session.evaluate(1.0F, result); // new instance same graph - instance = new CategoricalAccuracy<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); - op = instance.updateState(labels, predictions, sampleWeight); + instance = new CategoricalAccuracy<>(1001L, TFloat32.class); + + op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); - result = instance.result(); + result = instance.result(tf); total = instance.getTotal(); count = instance.getCount(); session.evaluate(0.7F, total); @@ -139,14 +137,15 @@ public void testVariableState() { session.evaluate(1.0F, result); // reset variables - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); + session.evaluate(0, total); session.evaluate(0, count); session.evaluate(0, result); - op = instance.updateState(labels, predictions, sampleWeight); + op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(0.7F, total); session.evaluate(.7, count); session.evaluate(1.0F, result); @@ -159,7 +158,7 @@ public void testInitTF() { Ops tf = session.getTF(); CategoricalAccuracy instance = new CategoricalAccuracy<>(1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = { 0, 0, 1, 0, 1, 0 @@ -171,27 +170,14 @@ public void testInitTF() { Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2F, total); session.evaluate(2, count); session.evaluate(1F, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - CategoricalAccuracy instance = - new CategoricalAccuracy<>(1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java index e5f4e12251f..e75392515e8 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalCrossentropyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -34,19 +32,18 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CategoricalCrossentropy instance = - new CategoricalCrossentropy<>( - tf, "CCE_testUnweighted", false, 0, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new CategoricalCrossentropy<>("CCE_testUnweighted", false, 0, -1, 1001L, TFloat64.class); + int[] trueArray = {0, 1, 0, 0, 0, 1}; double[] predArray = {0.05, 0.95, 0, 0.1, 0.8, 0.1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.3538785, total); session.evaluate(2, count); session.evaluate(1.1769392, result); @@ -59,18 +56,18 @@ public void testUnweightedLogits() { Ops tf = session.getTF(); CategoricalCrossentropy instance = new CategoricalCrossentropy<>( - tf, "CCE_testUnweightedLogits", true, 0, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + "CCE_testUnweightedLogits", true, 0, -1, 1001L, TFloat64.class); + int[] trueArray = {0, 1, 0, 0, 0, 1}; double[] predArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.0022807, total); session.evaluate(2, count); session.evaluate(3.5011404, result); @@ -82,20 +79,19 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CategoricalCrossentropy instance = - new CategoricalCrossentropy<>( - tf, "CCE_testWeighted", false, 0, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new CategoricalCrossentropy<>("CCE_testWeighted", false, 0, -1, 1001L, TFloat64.class); + int[] trueArray = {0, 1, 0, 0, 0, 1}; double[] predArray = {0.05f, 0.95f, 0f, 0.1f, 0.8f, 0.1f}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new double[] {1.5f, 2.}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4.6821095, total); session.evaluate(3.5, count); session.evaluate(1.3377455, result); @@ -107,19 +103,19 @@ public void testWeightedLogits() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CategoricalCrossentropy instance = - new CategoricalCrossentropy<>(tf, "CCE_testWeighted", true, 0, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new CategoricalCrossentropy<>("CCE_testWeighted", true, 0, -1, 1001L, TFloat64.class); + int[] trueArray = {0, 1, 0, 0, 0, 1}; double[] predArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new double[] {1.5, 2.f}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(14.004333, total); session.evaluate(3.5, count); session.evaluate(4.0012328, result); @@ -133,18 +129,18 @@ public void testLabelSmoothing() { float labelSmoothing = 0.1F; CategoricalCrossentropy instance = new CategoricalCrossentropy<>( - tf, "CCE_testWeighted", true, labelSmoothing, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + "CCE_testWeighted", true, labelSmoothing, -1, 1001L, TFloat64.class); + int[] trueArray = {0, 1, 0, 0, 0, 1}; double[] predArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.3356137, total); session.evaluate(2, count); session.evaluate(3.6678069, result); @@ -159,34 +155,20 @@ public void testInitTF() { new CategoricalCrossentropy<>( "CCE_testUnweightedLogits", true, 0, -1, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = {0, 1, 0, 0, 0, 1}; double[] predArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.0022807, total); session.evaluate(2, count); session.evaluate(3.5011404, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - CategoricalCrossentropy instance = - new CategoricalCrossentropy<>( - "testIllegalState", true, 0, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java index 408a049d869..e8136548e90 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CategoricalHingeTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -34,8 +32,8 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CategoricalHinge instance = - new CategoricalHinge<>(tf, "CH_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new CategoricalHinge<>("CH_testUnweighted", 1001L, TFloat64.class); + int[] trueArray = { 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, @@ -51,11 +49,11 @@ public void testUnweighted() { Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2., total); session.evaluate(4, count); session.evaluate(0.5, result); @@ -67,8 +65,8 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CategoricalHinge instance = - new CategoricalHinge<>(tf, "CH_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new CategoricalHinge<>("CH_testWeighted", 1001L, TFloat64.class); + int[] trueArray = { 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, @@ -86,11 +84,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1., 1.5, 2., 2.5}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(3.5F, total); session.evaluate(7, count); session.evaluate(0.5, result); @@ -104,7 +102,7 @@ public void testInitTF() { CategoricalHinge instance = new CategoricalHinge<>("CH_testUnweighted", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = { 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, @@ -120,27 +118,14 @@ public void testInitTF() { Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2., total); session.evaluate(4, count); session.evaluate(0.5, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - CategoricalHinge instance = - new CategoricalHinge<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java index 075898ab523..cc12109191d 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/CosineSimilarityTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -34,18 +32,18 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CosineSimilarity instance = - new CosineSimilarity<>(tf, "CS_testUnweighted", 1001L, TFloat32.class); - session.run(instance.resetStates()); + new CosineSimilarity<>("CS_testUnweighted", 1001L, TFloat32.class); + int[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.3744381F, total); session.evaluate(2, count); session.evaluate(0.18721905F, result); @@ -57,8 +55,8 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); CosineSimilarity instance = - new CosineSimilarity<>(tf, "CS_testWeighted", 1001L, TFloat32.class); - session.run(instance.resetStates()); + new CosineSimilarity<>("CS_testWeighted", 1001L, TFloat32.class); + int[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); @@ -66,11 +64,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new float[] {1.2f, 3.4f}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(-0.3119840621948241F, total); session.evaluate(4.6, count); session.evaluate(-0.06782262221626612F, result); @@ -83,18 +81,18 @@ public void test_axis() { Ops tf = session.getTF(); int axis = 1; CosineSimilarity instance = - new CosineSimilarity<>(tf, "CS_testWeighted", axis, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new CosineSimilarity<>("CS_testWeighted", axis, 1001L, TFloat32.class); + int[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.3744381F, total); session.evaluate(2, count); session.evaluate(0.18721905F, result); @@ -108,7 +106,7 @@ public void testInitTF() { CosineSimilarity instance = new CosineSimilarity<>("CS_testWeighted", 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); @@ -116,27 +114,14 @@ public void testInitTF() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new float[] {1.2f, 3.4f}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(-0.3119840621948241F, total); session.evaluate(4.6, count); session.evaluate(-0.06782262221626612F, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - CosineSimilarity instance = - new CosineSimilarity<>("CS_testWeighted", -1, 1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java index 916e4d12573..6907dddfdda 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalseNegativesTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -47,11 +45,11 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); - FalseNegatives instance = new FalseNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + FalseNegatives instance = new FalseNegatives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(3.0, result); } @@ -65,11 +63,11 @@ public void testWeighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); - FalseNegatives instance = new FalseNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + FalseNegatives instance = new FalseNegatives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(5.0, result); } @@ -97,11 +95,11 @@ public void testUnweightedWithThresholds() { {1, 1, 1, 1} }); FalseNegatives instance = - new FalseNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + new FalseNegatives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float[] expected = new float[] {1.f, 4.f, 6.f}; session.evaluate(expected, result); } @@ -131,11 +129,11 @@ public void testWeightedWithThresholds() { Operand sampleWeight = tf.constant(new double[][] {{3.0}, {5.0}, {7.0}, {4.0}}); FalseNegatives instance = - new FalseNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + new FalseNegatives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected = new double[] {4., 16., 23.}; session.evaluate(expected, result); } @@ -150,25 +148,12 @@ public void testInitTF() { Operand sampleWeight = tf.constant(this.sampleWeightArray); FalseNegatives instance = new FalseNegatives<>(1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(5.0, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - FalseNegatives instance = - new FalseNegatives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java index a890d8cffdf..d87e90e4fb8 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/FalsePositivesTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -47,11 +45,11 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); - FalsePositives instance = new FalsePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + FalsePositives instance = new FalsePositives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.0, result); } @@ -65,11 +63,11 @@ public void testWeighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); - FalsePositives instance = new FalsePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + FalsePositives instance = new FalsePositives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(14.0, result); } @@ -97,11 +95,11 @@ public void testUnweightedWithThresholds() { {1, 1, 1, 1} }); FalsePositives instance = - new FalsePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + new FalsePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float[] expected = new float[] {7.f, 4.f, 2.f}; session.evaluate(expected, result); } @@ -138,11 +136,11 @@ public void testWeightedWithThresholds() { {19.0, 23.0, 29.0, 31.0} }); FalsePositives instance = - new FalsePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + new FalsePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected = new double[] {125., 42., 12.}; session.evaluate(expected, result); } @@ -172,25 +170,12 @@ public void testInitTF() { FalsePositives instance = new FalsePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float[] expected = new float[] {7.f, 4.f, 2.f}; session.evaluate(expected, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - FalsePositives instance = - new FalsePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java index 1b3c3c14834..391e983a36a 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/HingeTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -34,18 +32,18 @@ class HingeTest { public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Hinge instance = new Hinge<>(tf, "Hinge_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + Hinge instance = new Hinge<>("Hinge_testUnweighted", 1001L, TFloat64.class); + int[] trueArray = {0, 1, 0, 1, 0, 0, 1, 1}; double[] predArray = {-0.3, 0.2, -0.1, 1.6, -0.25, -1., 0.5, 0.6}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.0125, total); session.evaluate(2, count); session.evaluate(.5062500, result); @@ -56,8 +54,8 @@ public void testUnweighted() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Hinge instance = new Hinge<>(tf, "Hinge_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + Hinge instance = new Hinge<>("Hinge_testWeighted", 1001L, TFloat64.class); + int[] trueArray = { -1, 1, -1, 1, -1, -1, 1, 1 @@ -68,11 +66,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); Operand sampleWeight = tf.constant(new double[] {1.5, 2.}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.7250f, total); session.evaluate(3.5, count); session.evaluate(.49285714f, result); @@ -85,32 +83,20 @@ public void testInitTF() { Ops tf = session.getTF(); Hinge instance = new Hinge<>("Hinge_testUnweighted", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = {0, 1, 0, 1, 0, 0, 1, 1}; double[] predArray = {-0.3, 0.2, -0.1, 1.6, -0.25, -1., 0.5, 0.6}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.0125, total); session.evaluate(2, count); session.evaluate(.5062500, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Hinge instance = new Hinge<>("Hinge_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java index cdcbb4e8141..4a80634d411 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/KLDivergenceTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -34,18 +32,18 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); KLDivergence instance = - new KLDivergence<>(tf, "KLD_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new KLDivergence<>("KLD_testUnweighted", 1001L, TFloat64.class); + float[][] trueArray = {{.5f, .8f, .12f}, {.7f, .43f, .8f}}; float[][] predArray = {{.4f, .9f, .12f}, {.36f, .3f, .4f}}; Operand labels = tf.constant(trueArray); Operand predictions = tf.constant(predArray); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.1921477, total); session.evaluate(2, count); session.evaluate(0.5960738, result); @@ -57,8 +55,8 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); KLDivergence instance = - new KLDivergence<>(tf, "KLD_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new KLDivergence<>("KLD_testWeighted", 1001L, TFloat64.class); + float[] trueArray = { .5f, .8f, .12f, .7f, .43f, .8f @@ -72,11 +70,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new double[][] {{1.2}, {3.4}}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4.015142, total); session.evaluate(4.6, count); session.evaluate(0.872857, result); @@ -90,7 +88,7 @@ public void testInitTF() { KLDivergence instance = new KLDivergence<>("KLD_testWeighted", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + float[] trueArray = { .5f, .8f, .12f, .7f, .43f, .8f @@ -104,27 +102,14 @@ public void testInitTF() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new double[][] {{1.2}, {3.4}}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4.015142, total); session.evaluate(4.6, count); session.evaluate(0.872857, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - KLDivergence instance = - new KLDivergence<>("KLD_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java index 3511d02ef05..a4f6579c323 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/LogCoshErrorTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -35,19 +33,19 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); LogCoshError instance = - new LogCoshError<>(tf, "LogCosh_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new LogCoshError<>("LogCosh_testUnweighted", 1001L, TFloat64.class); + float[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4.829245, result); session.evaluate(9.65849, total); session.evaluate(2, count); @@ -59,8 +57,8 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); LogCoshError instance = - new LogCoshError<>(tf, "LogCosh_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new LogCoshError<>("LogCosh_testWeighted", 1001L, TFloat64.class); + int[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; double[][] sampleArray = {{1.2}, {3.4}}; @@ -69,11 +67,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(sampleArray); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(5.2178759, result); session.evaluate(24.002228, total); session.evaluate(4.6, count); @@ -86,7 +84,7 @@ public void testInitTF() { Ops tf = session.getTF(); LogCoshError instance = new LogCoshError<>("testInitTF", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = {1, 9, 2, -5, -2, 6}; float[] predArray = {4, 8, 12, 8, 1, 3}; double[][] sampleArray = {{1.2}, {3.4}}; @@ -95,27 +93,14 @@ public void testInitTF() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(sampleArray); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(5.2178759, result); session.evaluate(24.002228, total); session.evaluate(4.6, count); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - LogCoshError instance = - new LogCoshError<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java index 7fa6e84589e..8d821c62dd8 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsoluteErrorTest.java @@ -14,7 +14,7 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; @@ -35,11 +35,11 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); MeanAbsoluteError instance = - new MeanAbsoluteError<>(tf, "MAE_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - session.evaluate(0.0f, instance.getTotal()); - session.evaluate(0f, instance.getCount()); - session.evaluate(0.f, instance.getCount()); + new MeanAbsoluteError<>("MAE_testUnweighted", 1001L, TFloat64.class); + + // not initialzied yet. + assertNull(instance.getTotal()); + assertNull(instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -56,19 +56,18 @@ public void testUnweighted() { Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(yTrue, yPrediction, null); + Op op = instance.updateState(tf, yTrue, yPrediction, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.0, total); session.evaluate(4, count); session.evaluate(0.5, result); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(0.0, instance.getTotal()); session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); } } @@ -77,11 +76,11 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); MeanAbsoluteError instance = - new MeanAbsoluteError<>(tf, "MAE_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); + new MeanAbsoluteError<>("MAE_testWeighted", 1001L, TFloat64.class); + + // not initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -100,16 +99,16 @@ public void testWeighted() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1., 1.5, 2., 2.5}); - Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + Op op = instance.updateState(tf, yTrue, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(3.8, total); session.evaluate(7, count); session.evaluate(0.54285, result); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(0.0, instance.getTotal()); session.evaluate(0, instance.getCount()); session.evaluate(0., instance.getCount()); @@ -123,10 +122,10 @@ public void testInitTF() { MeanAbsoluteError instance = new MeanAbsoluteError<>("MAE_testUnweighted", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); + session.evaluate(0.0f, instance.getTotal()); session.evaluate(0f, instance.getCount()); - session.evaluate(0.f, instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -143,32 +142,18 @@ public void testInitTF() { Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(yTrue, yPrediction, null); + Op op = instance.updateState(tf, yTrue, yPrediction, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.0, total); session.evaluate(4, count); session.evaluate(0.5, result); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(0.0, instance.getTotal()); session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanAbsoluteError instance = - new MeanAbsoluteError<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java index 0a55073e8cd..e66243bc0ae 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanAbsolutePercentageErrorTest.java @@ -14,7 +14,8 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; @@ -37,11 +38,11 @@ public void testUnweighted() { session.setEpsilon(1E-6f); Ops tf = session.getTF(); MeanAbsolutePercentageError instance = - new MeanAbsolutePercentageError<>(tf, "MAPE_testUnweighted", 1001L, TFloat32.class); - session.run(instance.resetStates()); - session.evaluate(0.0f, instance.getTotal()); - session.evaluate(0f, instance.getCount()); - session.evaluate(0.f, instance.getCount()); + new MeanAbsolutePercentageError<>("MAPE_testUnweighted", 1001L, TFloat32.class); + + // not initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -60,13 +61,13 @@ public void testUnweighted() { Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(yTrue, yPrediction, null); + Op op = instance.updateState(tf, yTrue, yPrediction, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.4E9f, total); session.evaluate(4f, count); session.evaluate(35e7f, result); @@ -79,11 +80,10 @@ public void testWeighted() { session.setEpsilon(1E-6f); Ops tf = session.getTF(); MeanAbsolutePercentageError instance = - new MeanAbsolutePercentageError<>(tf, "MAPE_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0, instance.getCount()); + new MeanAbsolutePercentageError<>("MAPE_testWeighted", 1001L, TFloat64.class); + // should not be initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); long[] trueArray = { 0, 1, 0, 1, 0, @@ -102,13 +102,13 @@ public void testWeighted() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1.f, 1.5f, 2.f, 2.5f}); - Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + Op op = instance.updateState(tf, yTrue, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.800000067278928E9, total); session.evaluate(7, count); session.evaluate(4.000000096112754E8, result); @@ -122,10 +122,12 @@ public void testInitTF() { MeanAbsolutePercentageError instance = new MeanAbsolutePercentageError<>("MAPE_testWeighted", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0, instance.getCount()); + + session.run(instance.resetStates(tf)); + + // should not be initialized yet + assertNotNull(instance.getTotal()); + assertNotNull(instance.getCount()); long[] trueArray = { 0, 1, 0, 1, 0, @@ -144,29 +146,16 @@ public void testInitTF() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1.f, 1.5f, 2.f, 2.5f}); - Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + Op op = instance.updateState(tf, yTrue, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.800000067278928E9, total); session.evaluate(7, count); session.evaluate(4.000000096112754E8, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanAbsolutePercentageError instance = - new MeanAbsolutePercentageError<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java index 1ffe330d7d1..f6c18f221a2 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanIoUTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -36,11 +34,11 @@ public void testUnweighted() { Ops tf = session.getTF().withSubScope("testUnweighted"); Operand predictions = tf.constant(new long[] {0, 1, 0, 1}); Operand labels = tf.constant(new long[] {0, 0, 1, 1}); - MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double expected_result = (1. / (2. + 2. - 1.) + 1. / (2. + 2. - 1.)) / 2.; session.evaluate(expected_result, result); } @@ -53,11 +51,11 @@ public void testWeighted() { Operand predictions = tf.constant(new long[] {0, 1, 0, 1}); Operand labels = tf.constant(new long[] {0, 0, 1, 1}); Operand sampleWeight = tf.constant(new float[] {0.2f, 0.3f, 0.4f, 0.1f}); - MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expected_result = (0.2f / (0.6f + 0.5f - 0.2f) + 0.1f / (0.4f + 0.5f - 0.1f)) / 2f; session.evaluate(expected_result, result); } @@ -71,11 +69,11 @@ public void testMultiDimInput() { Operand predictions = tf.constant(new long[][] {{0, 1}, {0, 1}}); Operand labels = tf.constant(new long[][] {{0, 0}, {1, 1}}); Operand sampleWeight = tf.constant(new float[][] {{0.2f, 0.3f}, {0.4f, 0.1f}}); - MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expected_result = (0.2f / (0.6f + 0.5f - 0.2f) + 0.1f / (0.4f + 0.5f - 0.1f)) / 2f; session.evaluate(expected_result, result); } @@ -85,9 +83,9 @@ public void testMultiDimInput() { public void testZeroValidEntries() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF().withSubScope("testZeroValidEntries"); - MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Operand result = instance.result(); + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat32.class); + + Operand result = instance.result(tf); session.evaluate(0.0f, result); } } @@ -99,11 +97,11 @@ public void testZeroAndNonZeroEntries() { Operand predictions = tf.constant(new float[] {1}); Operand labels = tf.constant(new int[] {1}); - MeanIoU instance = new MeanIoU<>(tf, numClasses, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expected_result = (0f + 1f / (1f + 1f - 1f)) / 1f; session.evaluate(expected_result, result); } @@ -118,24 +116,12 @@ public void testInitTF() { MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float expected_result = (0f + 1f / (1f + 1f - 1f)) / 1f; session.evaluate(expected_result, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanIoU instance = new MeanIoU<>(numClasses, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java index 744e20a36fa..0b22920a16f 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanRelativeErrorTest.java @@ -14,7 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.tensorflow.framework.utils.CastHelper.cast; import org.junit.jupiter.api.Test; @@ -40,13 +39,11 @@ public void testUnweighted() { Operand predictions = tf.constant(predArray); Operand labels = tf.constant(trueArray); - MeanRelativeError instance = - new MeanRelativeError<>(tf, labels, 1001L, TFloat32.class); - session.run(instance.resetStates()); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + MeanRelativeError instance = new MeanRelativeError<>(labels, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double expected_result = 1.25; session.evaluate(expected_result, result); @@ -65,13 +62,11 @@ public void testWeighted() { Operand labels = tf.constant(trueArray); Operand sampleWeight = tf.constant(sampleWeightArray); - MeanRelativeError instance = - new MeanRelativeError<>(tf, labels, 1001L, TFloat32.class); - session.run(instance.resetStates()); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + MeanRelativeError instance = new MeanRelativeError<>(labels, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double expectedResult = 1.3; session.evaluate(expectedResult, result); @@ -90,11 +85,11 @@ public void testZeroNormalizer() { MeanRelativeError instance = new MeanRelativeError<>( - tf, cast(tf, tf.zerosLike(labels), TFloat32.class), 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + cast(tf, tf.zerosLike(labels), TFloat32.class), 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double expectedResult = 0; session.evaluate(expectedResult, result); @@ -116,27 +111,13 @@ public void testInitTF() { MeanRelativeError instance = new MeanRelativeError<>("testInitTF", normalizer, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double expected_result = 1.25; session.evaluate(expected_result, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanRelativeError instance = - new MeanRelativeError<>( - "testIllegalState", new float[] {0, 0, 0}, 1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java index 62c66b587b3..02dcc859767 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredErrorTest.java @@ -14,7 +14,7 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; @@ -36,11 +36,11 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); MeanSquaredError instance = - new MeanSquaredError<>(tf, "MSE_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); + new MeanSquaredError<>("MSE_testUnweighted", 1001L, TFloat64.class); + + // should not be initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -57,11 +57,11 @@ public void testUnweighted() { Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(yTrue, yPrediction, null); + Op op = instance.updateState(tf, yTrue, yPrediction, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.0, total); session.evaluate(4, count); session.evaluate(0.5, result); @@ -73,11 +73,11 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); MeanSquaredError instance = - new MeanSquaredError<>(tf, "MSE_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); + new MeanSquaredError<>("MSE_testWeighted", 1001L, TFloat64.class); + + // should not be initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); long[] trueArray = { 0, 1, 0, 1, 0, @@ -96,65 +96,14 @@ public void testWeighted() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1., 1.5, 2., 2.5}); - Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + Op op = instance.updateState(tf, yTrue, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(3.8, total); session.evaluate(7, count); session.evaluate(0.542857, result); } } - - @Test - public void testInitTF() { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Ops tf = session.getTF(); - MeanSquaredError instance = - new MeanSquaredError<>("testInitTF", 1001L, TFloat64.class); - instance.init(tf); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); - - int[] trueArray = { - 0, 1, 0, 1, 0, - 0, 0, 1, 1, 1, - 1, 1, 1, 1, 0, - 0, 0, 0, 0, 1 - }; - float[] predictionArray = { - 0, 0, 1, 1, 0, - 1, 1, 1, 1, 1, - 0, 1, 0, 1, 0, - 1, 1, 1, 1, 1 - }; - Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); - Operand yPrediction = - tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(yTrue, yPrediction, null); - session.run(op); - Variable total = instance.getTotal(); - Variable count = instance.getCount(); - Operand result = instance.result(); - session.evaluate(2.0, total); - session.evaluate(4, count); - session.evaluate(0.5, result); - } - } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanSquaredError instance = - new MeanSquaredError<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java index 6177d9991ec..cf52e97271c 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanSquaredLogarithmicErrorTest.java @@ -14,7 +14,7 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; @@ -35,11 +35,11 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); MeanSquaredLogarithmicError instance = - new MeanSquaredLogarithmicError<>(tf, "MSLE_testUnweighted", 1001L, TFloat32.class); - session.run(instance.resetStates()); - session.evaluate(0.0f, instance.getTotal()); - session.evaluate(0f, instance.getCount()); - session.evaluate(0.f, instance.getCount()); + new MeanSquaredLogarithmicError<>("MSLE_testUnweighted", 1001L, TFloat32.class); + + // not initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -56,11 +56,11 @@ public void testUnweighted() { Operand yTrue = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(4, 5))); Operand yPrediction = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); - Op op = instance.updateState(yTrue, yPrediction, null); + Op op = instance.updateState(tf, yTrue, yPrediction, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.96090573f, total); session.evaluate(4f, count); session.evaluate(0.24022f, result); @@ -72,11 +72,11 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); MeanSquaredLogarithmicError instance = - new MeanSquaredLogarithmicError<>(tf, "MSLE_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); - session.evaluate(0.0, instance.getTotal()); - session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); + new MeanSquaredLogarithmicError<>("MSLE_testWeighted", 1001L, TFloat64.class); + + // not initialized yet + assertNull(instance.getTotal()); + assertNull(instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -95,11 +95,11 @@ public void testWeighted() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1., 1.5, 2., 2.5}); - Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + Op op = instance.updateState(tf, yTrue, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.8257208, total); session.evaluate(7, count); session.evaluate(0.26082, result); @@ -112,11 +112,9 @@ public void testInitTF() { Ops tf = session.getTF(); MeanSquaredLogarithmicError instance = new MeanSquaredLogarithmicError<>("testInitTF", 1001L, TFloat64.class); - instance.init(tf); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(0.0, instance.getTotal()); session.evaluate(0, instance.getCount()); - session.evaluate(0., instance.getCount()); int[] trueArray = { 0, 1, 0, 1, 0, @@ -135,27 +133,14 @@ public void testInitTF() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(4, 5))); Operand sampleWeight = tf.constant(new double[] {1., 1.5, 2., 2.5}); - Op op = instance.updateState(yTrue, yPrediction, sampleWeight); + Op op = instance.updateState(tf, yTrue, yPrediction, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.8257208, total); session.evaluate(7, count); session.evaluate(0.26082, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanSquaredLogarithmicError instance = - new MeanSquaredLogarithmicError<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java index d60832f14f5..b4849b6c8ca 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/MeanTensorTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -33,18 +31,18 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); Operand values = tf.constant(new long[] {100, 40}); - MeanTensor instance = new MeanTensor<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(values, null); + MeanTensor instance = new MeanTensor<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, values, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected_result = new double[] {100, 40}; session.evaluate(expected_result, result); session.evaluate(expected_result, instance.getTotal()); session.evaluate(new double[] {1, 1}, instance.getCount()); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(new double[] {0, 0}, instance.getTotal()); session.evaluate(new double[] {0, 0}, instance.getCount()); } @@ -55,13 +53,12 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); Operand values = tf.constant(new long[] {100, 30}); - MeanTensor instance = new MeanTensor<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); + MeanTensor instance = new MeanTensor<>(1001L, TFloat64.class); // check scalar weight - Op update = instance.updateState(values, tf.constant(0.5f)); + Op update = instance.updateState(tf, values, tf.constant(0.5f)); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected_result = new double[] {100, 30}; session.evaluate(expected_result, result); session.evaluate(new double[] {50, 15}, instance.getTotal()); @@ -69,9 +66,9 @@ public void testWeighted() { // check weights not scalar and weights rank matches values rank values = tf.constant(new long[] {1, 5}); - update = instance.updateState(values, tf.constant(new double[] {1f, 0.2f})); + update = instance.updateState(tf, values, tf.constant(new double[] {1f, 0.2f})); session.run(update); - result = instance.result(); + result = instance.result(tf); expected_result = new double[] {51 / 1.5, 16 / 0.7}; session.evaluate(expected_result, result); session.evaluate(new double[] {51, 16}, instance.getTotal()); @@ -79,9 +76,9 @@ public void testWeighted() { // check weights broadcast values = tf.constant(new long[] {1, 2}); - update = instance.updateState(values, tf.constant(0.5f)); + update = instance.updateState(tf, values, tf.constant(0.5f)); session.run(update); - result = instance.result(); + result = instance.result(tf); expected_result = new double[] {51.5 / 2, 17 / 1.2}; session.evaluate(expected_result, result); session.evaluate(new double[] {51.5, 17}, instance.getTotal()); @@ -90,9 +87,9 @@ public void testWeighted() { // check weights squeeze values = tf.constant(new long[] {1, 5}); Operand sampleWeight = tf.constant(new double[][] {{1}, {0.2}}); - update = instance.updateState(values, sampleWeight); + update = instance.updateState(tf, values, sampleWeight); session.run(update); - result = instance.result(); + result = instance.result(tf); expected_result = new double[] {52.5 / 3, 18 / 1.4}; session.evaluate(expected_result, result); session.evaluate(new double[] {52.5, 18}, instance.getTotal()); @@ -106,13 +103,13 @@ public void testWeightedExpand() { Ops tf = session.getTF(); // check weights expand - MeanTensor instance = new MeanTensor<>(tf, 1001L, TFloat32.class); + MeanTensor instance = new MeanTensor<>(1001L, TFloat32.class); Operand values = tf.constant(new long[][] {{1}, {5}}); Operand sampleWeight = tf.constant(new float[] {1f, 0.2f}); - Op update = instance.updateState(values, sampleWeight); + Op update = instance.updateState(tf, values, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(tf.constant(new float[][] {{1f}, {5f}}), result); session.evaluate(tf.constant(new float[][] {{1f}, {1f}}), instance.getTotal()); session.evaluate(tf.constant(new float[][] {{1f}, {0.2f}}), instance.getCount()); @@ -126,31 +123,19 @@ public void testInitTF() { Operand values = tf.constant(new long[] {100, 40}); MeanTensor instance = new MeanTensor<>(1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(values, null); + + Op update = instance.updateState(tf, values, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected_result = new double[] {100, 40}; session.evaluate(expected_result, result); session.evaluate(expected_result, instance.getTotal()); session.evaluate(new double[] {1, 1}, instance.getCount()); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); session.evaluate(new double[] {0, 0}, instance.getTotal()); session.evaluate(new double[] {0, 0}, instance.getCount()); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - MeanTensor instance = new MeanTensor<>(1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java index 01944ef18c4..da158e94303 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PoissonTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -34,19 +32,18 @@ class PoissonTest { public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Poisson instance = - new Poisson<>(tf, "Poisson_testUnweighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + Poisson instance = new Poisson<>("Poisson_testUnweighted", 1001L, TFloat64.class); + int[] trueArray = {4, 8, 12, 8, 1, 3}; float[] predArray = {1, 9, 2, 5, 2, 6}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(-6.6131644, total); session.evaluate(2, count); session.evaluate(-3.3065822, result); @@ -57,8 +54,8 @@ public void testUnweighted() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Poisson instance = new Poisson<>(tf, "Poisson_testWeighted", 1001L, TFloat32.class); - session.run(instance.resetStates()); + Poisson instance = new Poisson<>("Poisson_testWeighted", 1001L, TFloat32.class); + int[] trueArray = {4, 8, 12, 8, 1, 3}; float[] predArray = {1, 9, 2, 5, 2, 6}; @@ -67,11 +64,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new float[] {1.2f, 3.4f}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(-12.29468f, total); session.evaluate(4.6f, count); session.evaluate(-2.6727562f, result); @@ -84,32 +81,20 @@ public void testInitTF() { Ops tf = session.getTF(); Poisson instance = new Poisson<>("testInitTF", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = {4, 8, 12, 8, 1, 3}; float[] predArray = {1, 9, 2, 5, 2, 6}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 3))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(-6.6131644, total); session.evaluate(2, count); session.evaluate(-3.3065822, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Poisson instance = new Poisson<>("testIllegalState", 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java index 7ee3dccbefd..97e96e9d749 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionAtRecallTest.java @@ -36,9 +36,7 @@ public class PrecisionAtRecallTest { public void testValueIsIdempotent() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - PrecisionAtRecall instance = - new PrecisionAtRecall<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + PrecisionAtRecall instance = new PrecisionAtRecall<>(0.7f, 1001L, TFloat32.class); Operand predictions = tf.random.randomUniform( @@ -47,13 +45,13 @@ public void testValueIsIdempotent() { tf.random.randomUniform( tf.constant(Shape.of(10, 3)), TFloat32.class, RandomUniform.seed(1L)); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); for (int i = 0; i < 10; i++) session.run(update); - Operand initialPrecision = instance.result(); + Operand initialPrecision = instance.result(tf); - for (int i = 0; i < 10; i++) session.evaluate(initialPrecision, instance.result()); + for (int i = 0; i < 10; i++) session.evaluate(initialPrecision, instance.result(tf)); } } @@ -72,19 +70,18 @@ private int[][] generateRandomArray(int dim1, int dim2) { public void testUnweightedAllCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - PrecisionAtRecall instance = - new PrecisionAtRecall<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + PrecisionAtRecall instance = new PrecisionAtRecall<>(0.7f, 1001L, TFloat32.class); + int[][] predArray = generateRandomArray(100, 1); int[][] trueArray = new int[100][1]; // 100,1 System.arraycopy(predArray, 0, trueArray, 0, predArray.length); Operand predictions = cast(tf, tf.constant(predArray), TFloat32.class); Operand labels = cast(tf, tf.constant(trueArray), TFloat32.class); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1f, precision); } @@ -94,17 +91,16 @@ public void testUnweightedAllCorrect() { public void testUnweightedHighRecall() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - PrecisionAtRecall instance = - new PrecisionAtRecall<>(tf, 0.8f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + PrecisionAtRecall instance = new PrecisionAtRecall<>(0.8f, 1001L, TFloat32.class); + Operand predictions = tf.constant(new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.5f, 0.4f, 0.5f, 0.6f, 0.8f, 0.9f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.8f, precision); } @@ -114,17 +110,16 @@ public void testUnweightedHighRecall() { public void testUnweightedLowRecall() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - PrecisionAtRecall instance = - new PrecisionAtRecall<>(tf, 0.4f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + PrecisionAtRecall instance = new PrecisionAtRecall<>(0.4f, 1001L, TFloat32.class); + Operand predictions = tf.constant(new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.1f, 0.15f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.5f, precision); } @@ -134,19 +129,18 @@ public void testUnweightedLowRecall() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - PrecisionAtRecall instance = - new PrecisionAtRecall<>(tf, 0.4f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + PrecisionAtRecall instance = new PrecisionAtRecall<>(0.4f, 1001L, TFloat32.class); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); Operand sampleWeight = tf.constant(new float[] {2, 2, 1, 1, 1, 1, 1, 2, 2, 2}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(2.f / 3.f, precision); } @@ -159,7 +153,7 @@ public void testInvalidSensitivity() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - new PrecisionAtRecall<>(tf, -1f, 1001L, TFloat32.class); + new PrecisionAtRecall<>(-1f, 1001L, TFloat32.class); } }); } @@ -171,7 +165,7 @@ public void testInvalidNumThresholds() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - new PrecisionAtRecall<>(tf, 0.7f, -1, 1001L, TFloat32.class); + new PrecisionAtRecall<>(0.7f, -1, 1001L, TFloat32.class); } }); } @@ -182,32 +176,19 @@ public void testInitTF() { Ops tf = session.getTF(); PrecisionAtRecall instance = new PrecisionAtRecall<>(0.4f, 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); Operand sampleWeight = tf.constant(new float[] {2, 2, 1, 1, 1, 1, 1, 2, 2, 2}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(2.f / 3.f, precision); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - PrecisionAtRecall instance = - new PrecisionAtRecall<>(0.4f, 1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java index a2272721993..aa651468980 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/PrecisionTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -37,8 +35,8 @@ public void testValueIsIdempotent() { Ops tf = session.getTF(); Precision instance = - new Precision<>(tf, new float[] {0.3f, 0.72f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new Precision<>(new float[] {0.3f, 0.72f}, 1001L, TFloat64.class); + Operand predictions = tf.random.randomUniform( tf.constant(Shape.of(10, 3)), TFloat32.class, RandomUniform.seed(1001L)); @@ -46,16 +44,16 @@ public void testValueIsIdempotent() { tf.random.randomUniform( tf.constant(Shape.of(10, 3)), TFloat32.class, RandomUniform.seed(1001L)); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); for (int i = 0; i < 10; i++) { session.run(update); } - Operand initialPrecision = instance.result(); + Operand initialPrecision = instance.result(tf); for (int i = 0; i < 10; i++) { - session.evaluate(initialPrecision, instance.result()); + session.evaluate(initialPrecision, instance.result(tf)); } } } @@ -64,14 +62,13 @@ public void testValueIsIdempotent() { public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Precision instance = new Precision<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(1001L, TFloat64.class); Operand predictions = tf.constant(new long[][] {{1, 0, 1, 0}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.5, precision); } } @@ -80,15 +77,14 @@ public void testUnweighted() { public void testUnweightedAllIncorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Precision instance = new Precision<>(tf, 0.5f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(0.5f, 1001L, TFloat32.class); Operand predictions = tf.random.randomUniformInt(tf.constant(Shape.of(100, 1)), tf.constant(0), tf.constant(2)); Operand labels = tf.math.sub(tf.constant(1), predictions); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.0f, precision); } } @@ -97,15 +93,14 @@ public void testUnweightedAllIncorrect() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Precision instance = new Precision<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(1001L, TFloat64.class); Operand predictions = tf.constant(new long[][] {{1, 0, 1, 0}, {1, 0, 1, 0}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0}, {1, 0, 0, 1}}); Operand sampleWeight = tf.constant(new double[][] {{1, 2, 3, 4}, {4, 3, 2, 1}}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); double weightedTP = 3.0f + 4.0f; double weightedPositives = (1.0f + 3.0f) + (4.0f + 2.0f); @@ -119,14 +114,13 @@ public void testWeighted() { public void testDivByZero() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Precision instance = new Precision<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(1001L, TFloat64.class); Operand predictions = tf.constant(new int[] {0, 0, 0, 0}); Operand labels = tf.constant(new int[] {0, 0, 0, 0}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0, precision); } } @@ -136,14 +130,13 @@ public void testUnweightedWithThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); Precision instance = - new Precision<>(tf, new float[] {0.5f, 0.7f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new Precision<>(new float[] {0.5f, 0.7f}, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{1f, 0f, 0.6f, 0f}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); float[] expected = new float[] {0.5f, 0.f}; @@ -156,15 +149,14 @@ public void testWeightedWithThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); Precision instance = - new Precision<>(tf, new float[] {0.5f, 1.f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new Precision<>(new float[] {0.5f, 1.f}, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{1f, 0f}, {0.6f, 0f}}); Operand labels = tf.constant(new long[][] {{0, 1}, {1, 0}}); Operand sampleWeight = tf.constant(new float[][] {{4, 0}, {3, 1}}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); float weightedTP = 0f + 3.f; float weightedPositives = (0f + 3.f) + (4.f + 0.f); @@ -180,15 +172,14 @@ public void testMultipleUpdates() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); Precision instance = - new Precision<>(tf, new float[] {0.5f, 1.f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new Precision<>(new float[] {0.5f, 1.f}, 1001L, TFloat64.class); Operand predictions = tf.constant(new float[][] {{1f, 0f}, {0.6f, 0f}}); Operand labels = tf.constant(new long[][] {{0, 1}, {1, 0}}); Operand sampleWeight = tf.constant(new double[][] {{4, 0}, {3, 1}}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); for (int i = 0; i < 2; i++) session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); double weighted_tp = (0 + 3.) + (0 + 3.); double weighted_positives = ((0 + 3.) + (4. + 0.)) + ((0 + 3.) + (4. + 0.)); @@ -204,13 +195,13 @@ public void testUnweightedTopK() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); // set topK to 3 - Precision instance = new Precision<>(tf, null, 3, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(null, 3, null, 1001L, TFloat32.class); + Operand predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.5f, 0f, 0.2f}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1.0f / 3.0f, precision); } } @@ -220,21 +211,20 @@ public void testWeightedTopK() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); // set topK to 3 - Precision instance = new Precision<>(tf, null, 3, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(null, 3, null, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[] {0.2f, 0.1f, 0.4f, 0f, 0.2f}); Operand labels = tf.constant(new long[] {0, 1, 1, 0, 1}); Operand sampleWeight = tf.constant(new float[][] {{1, 4, 2, 3, 5}}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); predictions = tf.constant(new float[][] {{0.2f, 0.6f, 0.4f, 0.2f, 0.2f}}); labels = tf.constant(new long[][] {{1, 0, 1, 1, 1}}); - update = instance.updateState(labels, predictions, tf.constant(3.f)); + update = instance.updateState(tf, labels, predictions, tf.constant(3.f)); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); float tp = (2f + 5f) + (3f + 3f); float predicted_positives = (1f + 2f + 5f) + (3f + 3f + 3f); @@ -248,14 +238,13 @@ public void testUnweightedClassId() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); // set classId to 2 - Precision instance = new Precision<>(tf, null, null, 2, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(null, null, 2, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.6f, 0f, 0.2f}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1, precision); session.evaluate(1, instance.getTruePositives()); @@ -263,9 +252,9 @@ public void testUnweightedClassId() { predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0f, 0f, 0.2f}}); labels = tf.constant(new long[][] {{0, 1, 1, 0, 0}}); - update = instance.updateState(labels, predictions, null); + update = instance.updateState(tf, labels, predictions, null); session.run(update); - precision = instance.result(); + precision = instance.result(tf); session.evaluate(1, precision); session.evaluate(1, instance.getTruePositives()); @@ -273,9 +262,9 @@ public void testUnweightedClassId() { predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.6f, 0f, 0.2f}}); labels = tf.constant(new long[][] {{0, 1, 0, 0, 0}}); - update = instance.updateState(labels, predictions, null); + update = instance.updateState(tf, labels, predictions, null); session.run(update); - precision = instance.result(); + precision = instance.result(tf); session.evaluate(0.5f, precision); session.evaluate(1, instance.getTruePositives()); @@ -288,14 +277,13 @@ public void testUnweightedTopKAndClassId() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); // set topK and classId to 2 - Precision instance = new Precision<>(tf, null, 2, 2, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(null, 2, 2, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{0.2f, 0.6f, 0.3f, 0f, 0.2f}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1, precision); session.evaluate(1, instance.getTruePositives()); @@ -303,9 +291,9 @@ public void testUnweightedTopKAndClassId() { predictions = tf.constant(new float[][] {{1f, 1f, 0.9f, 1f, 1f}}); labels = tf.constant(new long[][] {{0, 1, 1, 0, 0}}); - update = instance.updateState(labels, predictions, null); + update = instance.updateState(tf, labels, predictions, null); session.run(update); - precision = instance.result(); + precision = instance.result(tf); session.evaluate(1, precision); session.evaluate(1, instance.getTruePositives()); @@ -318,14 +306,13 @@ public void testUnweightedTopKAndThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); // set topK to 2 - Precision instance = new Precision<>(tf, 0.7f, 2, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Precision instance = new Precision<>(0.7f, 2, null, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{0.2f, 0.8f, 0.6f, 0f, 0.2f}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0, 1}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1, precision); session.evaluate(1, instance.getTruePositives()); @@ -339,29 +326,16 @@ public void testInitTF() { Ops tf = session.getTF(); Precision instance = new Precision<>(0.7f, 2, null, 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); Operand predictions = tf.constant(new float[][] {{0.2f, 0.8f, 0.6f, 0f, 0.2f}}); Operand labels = tf.constant(new long[][] {{0, 1, 1, 0, 1}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1, precision); session.evaluate(1, instance.getTruePositives()); session.evaluate(0, instance.getFalsePositives()); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Precision instance = new Precision<>(0.7f, 2, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java index 4c031eb7841..8f2c4274112 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallAtPrecisionTest.java @@ -36,9 +36,7 @@ public class RecallAtPrecisionTest { public void testValueIsIdempotent() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - RecallAtPrecision instance = - new RecallAtPrecision<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + RecallAtPrecision instance = new RecallAtPrecision<>(0.7f, 1001L, TFloat32.class); Operand predictions = tf.random.randomUniform( @@ -48,16 +46,16 @@ public void testValueIsIdempotent() { tf.constant(Shape.of(10, 3)), TFloat32.class, RandomUniform.seed(1L)); labels = tf.math.mul(labels, tf.constant(2.0f)); - Op update = instance.updateState(labels, predictions); + Op update = instance.updateState(tf, labels, predictions, null); for (int i = 0; i < 10; i++) { session.run(update); } - Operand initialPrecision = instance.result(); + Operand initialPrecision = instance.result(tf); for (int i = 0; i < 10; i++) { - session.evaluate(initialPrecision, instance.result()); + session.evaluate(initialPrecision, instance.result(tf)); } } } @@ -77,18 +75,17 @@ private int[][] generateRandomArray(int dim1, int dim2, int maxVal) { public void test_unweighted_all_correct() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - RecallAtPrecision instance = - new RecallAtPrecision<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + RecallAtPrecision instance = new RecallAtPrecision<>(0.7f, 1001L, TFloat32.class); + int[][] predArray = generateRandomArray(100, 1, 2); int[][] trueArray = new int[100][1]; // 100,1 System.arraycopy(predArray, 0, trueArray, 0, predArray.length); Operand predictions = cast(tf, tf.constant(predArray), TFloat32.class); Operand labels = cast(tf, tf.constant(trueArray), TFloat32.class); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1f, precision); } @@ -98,9 +95,8 @@ public void test_unweighted_all_correct() { public void testUnweightedHighPrecision() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - RecallAtPrecision instance = - new RecallAtPrecision<>(tf, 0.75f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + RecallAtPrecision instance = new RecallAtPrecision<>(0.75f, 1001L, TFloat32.class); + Operand predictions = tf.constant( new float[] { @@ -108,10 +104,10 @@ public void testUnweightedHighPrecision() { }); Operand labels = tf.constant(new long[] {0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.5f, precision); } @@ -122,8 +118,8 @@ public void testUnweightedLowPrecision() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); RecallAtPrecision instance = - new RecallAtPrecision<>(tf, 2.0f / 3f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new RecallAtPrecision<>(2.0f / 3f, 1001L, TFloat32.class); + Operand predictions = tf.constant( new float[] { @@ -131,10 +127,10 @@ public void testUnweightedLowPrecision() { }); Operand labels = tf.constant(new long[] {0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(5.f / 6f, precision); } @@ -144,18 +140,17 @@ public void testUnweightedLowPrecision() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - RecallAtPrecision instance = - new RecallAtPrecision<>(tf, 0.75f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + RecallAtPrecision instance = new RecallAtPrecision<>(0.75f, 1001L, TFloat32.class); + Operand predictions = tf.constant(new float[] {0.1f, 0.2f, 0.3f, 0.5f, 0.6f, 0.9f, 0.9f}); Operand labels = tf.constant(new long[] {0, 1, 0, 0, 0, 1, 1}); Operand sampleWeight = tf.constant(new float[] {1, 2, 1, 2, 1, 2, 1}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.6f, precision); } @@ -166,15 +161,15 @@ public void testUnachievablePrecision() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); RecallAtPrecision instance = - new RecallAtPrecision<>(tf, 2.0f / 3f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new RecallAtPrecision<>(2.0f / 3f, 1001L, TFloat32.class); + Operand predictions = tf.constant(new float[] {0.1f, 0.2f, 0.3f, 0.9f}); Operand labels = tf.constant(new long[] {1, 1, 0, 0}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); // The highest possible precision is 1/2 which is below the required session.evaluate(0f, precision); } @@ -187,7 +182,7 @@ public void test_invalid_sensitivity() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - new RecallAtPrecision<>(tf, -1f, 1001L, TFloat32.class); + new RecallAtPrecision<>(-1f, 1001L, TFloat32.class); } }); } @@ -199,7 +194,7 @@ public void test_invalid_num_thresholds() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - new RecallAtPrecision<>(tf, 0.7f, -1, 1001L, TFloat32.class); + new RecallAtPrecision<>(0.7f, -1, 1001L, TFloat32.class); } }); } @@ -211,29 +206,16 @@ public void testInitTF() { RecallAtPrecision instance = new RecallAtPrecision<>(2.0f / 3f, 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); + Operand predictions = tf.constant(new float[] {0.1f, 0.2f, 0.3f, 0.9f}); Operand labels = tf.constant(new long[] {1, 1, 0, 0}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); // The highest possible precision is 1/2 which is below the required session.evaluate(0f, precision); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - RecallAtPrecision instance = - new RecallAtPrecision<>(2.0f / 3f, 1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java index a1a4662ed60..2e852abef03 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RecallTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import java.util.Random; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; @@ -33,20 +31,18 @@ public class RecallTest { public void testValueIsIdempotent() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = - new Recall<>(tf, new float[] {0.3f, 0.72f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(new float[] {0.3f, 0.72f}, 1001L, TFloat32.class); Operand predictions = tf.random.randomUniform(tf.constant(Shape.of(10, 3)), TFloat32.class); Operand labels = tf.random.randomUniform(tf.constant(Shape.of(10, 3)), TFloat32.class); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); for (int i = 0; i < 10; i++) session.run(update); - Operand initialRecall = instance.result(); - for (int i = 0; i < 10; i++) session.evaluate(initialRecall, instance.result()); + Operand initialRecall = instance.result(tf); + for (int i = 0; i < 10; i++) session.evaluate(initialRecall, instance.result(tf)); } } @@ -54,15 +50,14 @@ public void testValueIsIdempotent() { public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{1, 0, 1, 0}}); Operand labels = tf.constant(new float[][] {{0, 1, 1, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5f, instance.result()); + session.evaluate(0.5f, instance.result(tf)); } } @@ -81,16 +76,16 @@ private int[][] generateRandomArray(int dim1, int dim2, int maxInt) { public void testUnweightedAllIncorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(1001L, TFloat32.class); + int[][] array = generateRandomArray(100, 1, 2); Operand predictions = tf.dtypes.cast(tf.constant(array), TFloat32.class); Operand labels = tf.dtypes.cast(tf.math.sub(tf.constant(1), tf.constant(array)), TFloat32.class); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.f, instance.result()); + session.evaluate(0.f, instance.result(tf)); } } @@ -98,8 +93,8 @@ public void testUnweightedAllIncorrect() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(1001L, TFloat32.class); + Operand predictions = tf.constant( new float[][] { @@ -119,14 +114,14 @@ public void testWeighted() { {1, 2, 3, 4}, {4, 3, 2, 1} }); - Op update = instance.updateState(labels, predictions, sampleWeights); + Op update = instance.updateState(tf, labels, predictions, sampleWeights); session.run(update); float weightedTp = 3.0f + 1.0f; float weightedT = (2.0f + 3.0f) + (4.0f + 1.0f); float expectedRecall = weightedTp / weightedT; - session.evaluate(expectedRecall, instance.result()); + session.evaluate(expectedRecall, instance.result(tf)); } } @@ -134,16 +129,15 @@ public void testWeighted() { public void testDivByZero() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(1001L, TFloat32.class); Operand predictions = tf.constant(new float[] {0, 0, 0, 0}); Operand labels = tf.constant(new float[] {0, 0, 0, 0}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0f, instance.result()); + session.evaluate(0f, instance.result(tf)); } } @@ -151,17 +145,16 @@ public void testDivByZero() { public void testUnweightedWithThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, new float[] {0.5f, 0.7f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(new float[] {0.5f, 0.7f}, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{1, 0, 0.6f, 0}}); Operand labels = tf.constant(new float[][] {{0, 1, 1, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); Float[] expected = new Float[] {0.5f, 0f}; - session.evaluate(expected, instance.result()); + session.evaluate(expected, instance.result(tf)); } } @@ -169,21 +162,20 @@ public void testUnweightedWithThreshold() { public void testWeightedWithThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, new float[] {0.5f, 1.f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(new float[] {0.5f, 1.f}, 1001L, TFloat32.class); Operand labels = tf.constant(new float[][] {{0, 1}, {1, 0}}); Operand predictions = tf.constant(new float[][] {{1, 0}, {0.6f, 0}}); Operand weights = tf.constant(new float[][] {{1, 4}, {3, 2}}); - Op update = instance.updateState(labels, predictions, weights); + Op update = instance.updateState(tf, labels, predictions, weights); session.run(update); float weightedTp = 0 + 3.f; float weightedPositives = (0 + 3.f) + (4.f + 0.f); float expectedRecall = weightedTp / weightedPositives; float[] expected = new float[] {expectedRecall, 0f}; - session.evaluate(expected, instance.result()); + session.evaluate(expected, instance.result(tf)); } } @@ -191,21 +183,20 @@ public void testWeightedWithThreshold() { public void testMultipleUpdates() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, new float[] {0.5f, 1.f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(new float[] {0.5f, 1.f}, 1001L, TFloat32.class); Operand labels = tf.constant(new float[][] {{0, 1}, {1, 0}}); Operand predictions = tf.constant(new float[][] {{1, 0}, {0.6f, 0}}); Operand weights = tf.constant(new float[][] {{1, 4}, {3, 2}}); - Op update = instance.updateState(labels, predictions, weights); + Op update = instance.updateState(tf, labels, predictions, weights); for (int i = 0; i < 2; i++) session.run(update); float weightedTp = (0f + 3.f) + (0f + 3.f); float weightedPositives = ((0f + 3.f) + (4.f + 0.f)) + ((0f + 3.f) + (4.f + 0.f)); float expectedRecall = weightedTp / weightedPositives; float[] expected = new float[] {expectedRecall, 0f}; - session.evaluate(expected, instance.result()); + session.evaluate(expected, instance.result(tf)); } } @@ -213,16 +204,15 @@ public void testMultipleUpdates() { public void testUnweightedTopK() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, null, null, 3, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(null, null, 3, null, 1001L, TFloat32.class); Operand labels = tf.constant(new float[][] {{0f, 1f, 1f, 0f, 0f}}); Operand predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.5f, 0f, 0.2f}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5f, instance.result()); + session.evaluate(0.5f, instance.result(tf)); } } @@ -230,27 +220,26 @@ public void testUnweightedTopK() { public void testWeightedTopK() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, null, null, 3, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(null, null, 3, null, 1001L, TFloat32.class); Operand labels = tf.constant(new float[][] {{0, 1, 1, 0, 1}}); Operand predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.4f, 0f, 0.2f}}); Operand weights = tf.constant(new float[][] {{1, 4, 2, 3, 5}}); - Op update = instance.updateState(labels, predictions, weights); + Op update = instance.updateState(tf, labels, predictions, weights); session.run(update); labels = tf.constant(new float[][] {{1, 0, 1, 1, 1}}); predictions = tf.constant(new float[][] {{0.2f, 0.6f, 0.4f, 0.2f, 0.2f}}); weights = tf.constant(3.f); - update = instance.updateState(labels, predictions, weights); + update = instance.updateState(tf, labels, predictions, weights); session.run(update); float weightedTp = (2 + 5) + (3 + 3); float weightedPositives = (4 + 2 + 5) + (3 + 3 + 3 + 3); float expectedRecall = weightedTp / weightedPositives; - session.evaluate(expectedRecall, instance.result()); + session.evaluate(expectedRecall, instance.result(tf)); } } @@ -258,30 +247,29 @@ public void testWeightedTopK() { public void testUnweightedClassId() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, null, null, null, 2, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(null, null, null, 2, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.6f, 0f, 0.2f}}); Operand labels = tf.constant(new float[][] {{0, 1, 1, 0, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(1f, instance.result()); + session.evaluate(1f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(0f, instance.getFalseNegatives()); predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0f, 0f, 0.2f}}); labels = tf.constant(new float[][] {{0, 1, 1, 0, 0}}); - update = instance.updateState(labels, predictions, null); + update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5f, instance.result()); + session.evaluate(0.5f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(1f, instance.getFalseNegatives()); predictions = tf.constant(new float[][] {{0.2f, 0.1f, 0.6f, 0f, 0.2f}}); labels = tf.constant(new float[][] {{0, 1, 0, 0, 0}}); - update = instance.updateState(labels, predictions, null); + update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5f, instance.result()); + session.evaluate(0.5f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(1f, instance.getFalseNegatives()); } @@ -291,24 +279,23 @@ public void testUnweightedClassId() { public void testUnweightedTopKAndClassId() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, null, null, 2, 2, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(null, null, 2, 2, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{0.2f, 0.6f, 0.3f, 0, 0.2f}}); Operand labels = tf.constant(new float[][] {{0, 1, 1, 0, 0}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(1f, instance.result()); + session.evaluate(1f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(0f, instance.getFalseNegatives()); predictions = tf.constant(new float[][] {{1, 1, 0.9f, 1, 1}}); labels = tf.constant(new float[][] {{0, 1, 1, 0, 0}}); - update = instance.updateState(labels, predictions, null); + update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5f, instance.result()); + session.evaluate(0.5f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(1f, instance.getFalseNegatives()); } @@ -318,15 +305,14 @@ public void testUnweightedTopKAndClassId() { public void testUnweightedTopKAndThreshold() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>(tf, null, 0.7f, 2, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Recall instance = new Recall<>(null, 0.7f, 2, null, 1001L, TFloat32.class); Operand predictions = tf.constant(new float[][] {{0.2f, 0.8f, 0.6f, 0f, 0.2f}}); Operand labels = tf.constant(new float[][] {{1, 1, 1, 0, 1}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.25f, instance.result()); + session.evaluate(0.25f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(3f, instance.getFalseNegatives()); } @@ -336,31 +322,17 @@ public void testUnweightedTopKAndThreshold() { public void testInitTF() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Recall instance = new Recall<>((String) null, 0.7f, 2, null, 1001L, TFloat32.class); + Recall instance = new Recall<>(null, 0.7f, 2, null, 1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); Operand predictions = tf.constant(new float[][] {{0.2f, 0.8f, 0.6f, 0f, 0.2f}}); Operand labels = tf.constant(new float[][] {{1, 1, 1, 0, 1}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.25f, instance.result()); + session.evaluate(0.25f, instance.result(tf)); session.evaluate(1f, instance.getTruePositives()); session.evaluate(3f, instance.getFalseNegatives()); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Recall instance = - new Recall<>((String) null, 0.7f, 2, null, 1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java index d3339e1cc63..208c2de26fc 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/RootMeanSquaredErrorTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -32,18 +30,16 @@ public class RootMeanSquaredErrorTest { public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - RootMeanSquaredError instance = - new RootMeanSquaredError<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + RootMeanSquaredError instance = new RootMeanSquaredError<>(1001L, TFloat32.class); Operand labels = tf.constant(new float[] {2, 4, 6}); Operand predictions = tf.constant(new float[] {1, 3, 2}); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(18, total); session.evaluate(3, count); session.evaluate(Math.sqrt(6), result); @@ -54,18 +50,17 @@ public void testUnweighted() { public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - RootMeanSquaredError instance = - new RootMeanSquaredError<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); + RootMeanSquaredError instance = new RootMeanSquaredError<>(1001L, TFloat64.class); + Operand labels = tf.constant(new float[][] {{2, 4, 6, 8}}); Operand predictions = tf.constant(new float[][] {{1, 3, 2, 3}}); Operand sampleWeight = tf.constant(new double[][] {{0, 1, 0, 1}}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(26, total); session.evaluate(2, count); session.evaluate(Math.sqrt(13), result); @@ -78,32 +73,18 @@ public void testInitTF() { Ops tf = session.getTF(); RootMeanSquaredError instance = new RootMeanSquaredError<>(1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); Operand labels = tf.constant(new float[] {2, 4, 6}); Operand predictions = tf.constant(new float[] {1, 3, 2}); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(18, total); session.evaluate(3, count); session.evaluate(Math.sqrt(6), result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - RootMeanSquaredError instance = - new RootMeanSquaredError<>(1001L, TFloat32.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java index de4cb6ee916..2fca7c231bd 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SensitivityAtSpecificityTest.java @@ -38,8 +38,8 @@ public void testValueIsIdempotent() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SensitivityAtSpecificity instance = - new SensitivityAtSpecificity<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SensitivityAtSpecificity<>(0.7f, 1001L, TFloat32.class); + Operand predictions = tf.random.randomUniform( tf.constant(Shape.of(10, 3)), TFloat32.class, RandomUniform.seed(1L)); @@ -49,13 +49,13 @@ public void testValueIsIdempotent() { labels = tf.math.mul(labels, tf.constant(2.0f)); // instance.setDebug(session.getGraphSession()); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); for (int i = 0; i < 10; i++) session.run(update); - Operand initialSensitivity = instance.result(); + Operand initialSensitivity = instance.result(tf); - for (int i = 0; i < 10; i++) session.evaluate(initialSensitivity, instance.result()); + for (int i = 0; i < 10; i++) session.evaluate(initialSensitivity, instance.result(tf)); // instance.setDebug(null); @@ -78,18 +78,18 @@ public void testUnweightedAllCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SensitivityAtSpecificity instance = - new SensitivityAtSpecificity<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SensitivityAtSpecificity<>(0.7f, 1001L, TFloat32.class); + int[][] predArray = generateRandomArray(100, 1); int[][] trueArray = new int[100][1]; // 100,1 System.arraycopy(predArray, 0, trueArray, 0, predArray.length); Operand predictions = cast(tf, tf.constant(predArray), TFloat32.class); Operand labels = cast(tf, tf.constant(trueArray), TFloat32.class); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1f, precision); } @@ -100,16 +100,16 @@ public void testUnweightedHighSpecificity() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SensitivityAtSpecificity instance = - new SensitivityAtSpecificity<>(tf, 0.8f, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new SensitivityAtSpecificity<>(0.8f, 1001L, TFloat64.class); + Operand predictions = tf.constant(new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.1f, 0.45f, 0.5f, 0.8f, 0.9f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.8, precision); } @@ -120,17 +120,17 @@ public void testUnweightedLowSpecificity() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SensitivityAtSpecificity instance = - new SensitivityAtSpecificity<>(tf, 0.4f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SensitivityAtSpecificity<>(0.4f, 1001L, TFloat32.class); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.6f, precision); } @@ -141,18 +141,18 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SensitivityAtSpecificity instance = - new SensitivityAtSpecificity<>(tf, 0.4f, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new SensitivityAtSpecificity<>(0.4f, 1001L, TFloat64.class); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); Operand sampleWeight = tf.constant(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.675, precision); } @@ -165,7 +165,7 @@ public void testInvalidSensitivity() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - new SensitivityAtSpecificity<>(tf, -1f, 1001L, TFloat32.class); + new SensitivityAtSpecificity<>(-1f, 1001L, TFloat32.class); } }); } @@ -177,7 +177,7 @@ public void testInvalidNumThresholds() { () -> { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - new SensitivityAtSpecificity<>(tf, 0.7f, -1, 1001L, TFloat32.class); + new SensitivityAtSpecificity<>(0.7f, -1, 1001L, TFloat32.class); } }); } @@ -189,32 +189,19 @@ public void testInitTF() { SensitivityAtSpecificity instance = new SensitivityAtSpecificity<>(0.4f, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); Operand sampleWeight = tf.constant(new double[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.675, precision); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - SensitivityAtSpecificity instance = - new SensitivityAtSpecificity<>(0.4f, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java index bf5eafeb8bc..628939494a6 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SparseCategoricalCrossentropyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -36,18 +34,18 @@ public void testUnweighted() { Ops tf = session.getTF(); SparseCategoricalCrossentropy instance = new SparseCategoricalCrossentropy<>( - tf, "SCE_testUnweighted", false, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + "SCE_testUnweighted", false, -1, 1001L, TFloat64.class); + int[] trueArray = {1, 2}; double[] predictionArray = {0.05, 0.95, 0, 0.1, 0.8, 0.1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2))); Operand predictions = tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(2.3538785, total); session.evaluate(2, count); session.evaluate(1.1769392, result); @@ -59,18 +57,17 @@ public void testUnweightedLogits() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SparseCategoricalCrossentropy instance = - new SparseCategoricalCrossentropy<>( - tf, "SCE_testWeighted", true, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new SparseCategoricalCrossentropy<>("SCE_testWeighted", true, -1, 1001L, TFloat64.class); + int[] trueArray = {1, 2}; double[] logitsArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2))); Operand logits = tf.reshape(tf.constant(logitsArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, logits, null); + Op op = instance.updateState(tf, labels, logits, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.002277, total); session.evaluate(2, count); session.evaluate(3.501135, result); @@ -82,9 +79,8 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SparseCategoricalCrossentropy instance = - new SparseCategoricalCrossentropy<>( - tf, "SCE_testWeighted", false, -1, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SparseCategoricalCrossentropy<>("SCE_testWeighted", false, -1, 1001L, TFloat32.class); + int[] trueArray = {1, 2}; double[] predictionArray = {0.05, 0.95, 0, 0.1, 0.8, 0.1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2))); @@ -92,11 +88,11 @@ public void testWeighted() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new float[] {1.5F, 2.F}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4.6821103f, total); session.evaluate(3.5f, count); session.evaluate(1.3377458f, result); @@ -108,9 +104,8 @@ public void testWeightedLogits() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SparseCategoricalCrossentropy instance = - new SparseCategoricalCrossentropy<>( - tf, "SCE_testWeighted", true, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new SparseCategoricalCrossentropy<>("SCE_testWeighted", true, -1, 1001L, TFloat64.class); + int[] trueArray = {1, 2}; double[] predictionArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2))); @@ -118,11 +113,11 @@ public void testWeightedLogits() { tf.reshape(tf.constant(predictionArray), tf.constant(Shape.of(2, 3))); Operand sampleWeight = tf.constant(new double[] {1.5, 2}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(14.004333, total); session.evaluate(3.5, count); session.evaluate(4.001232, result); @@ -136,34 +131,19 @@ public void testInitTF() { SparseCategoricalCrossentropy instance = new SparseCategoricalCrossentropy<>("testInitTF", true, -1, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = {1, 2}; double[] logitsArray = {1, 9, 0, 1, 8, 1}; Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2))); Operand logits = tf.reshape(tf.constant(logitsArray), tf.constant(Shape.of(2, 3))); - Op op = instance.updateState(labels, logits, null); + Op op = instance.updateState(tf, labels, logits, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.002277, total); session.evaluate(2, count); session.evaluate(3.501135, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - SparseCategoricalCrossentropy instance = - new SparseCategoricalCrossentropy<>( - "testIllegalState", true, -1, 1001L, TFloat64.class); - session.run(instance.resetStates()); - instance.result(); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java index c7a10b76e29..6789444fae7 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SpecificityAtSensitivityTest.java @@ -39,8 +39,7 @@ public void testValueIsIdempotent() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SpecificityAtSensitivity instance = - new SpecificityAtSensitivity<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SpecificityAtSensitivity<>(0.7f, 1001L, TFloat32.class); Operand predictions = tf.random.randomUniform( @@ -50,13 +49,13 @@ public void testValueIsIdempotent() { tf.constant(Shape.of(10, 3)), TFloat32.class, RandomUniform.seed(1L)); // instance.setDebug(session.getGraphSession()); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); for (int i = 0; i < 10; i++) session.run(update); - Operand initialSpecificity = instance.result(); + Operand initialSpecificity = instance.result(tf); - for (int i = 0; i < 10; i++) session.evaluate(initialSpecificity, instance.result()); + for (int i = 0; i < 10; i++) session.evaluate(initialSpecificity, instance.result(tf)); } } @@ -76,8 +75,8 @@ public void testUnweightedAllCorrect() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SpecificityAtSensitivity instance = - new SpecificityAtSensitivity<>(tf, 0.7f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SpecificityAtSensitivity<>(0.7f, 1001L, TFloat32.class); + int[][] predArray = generateRandomArray(100, 1); int[][] trueArray = new int[100][1]; // 100,1 System.arraycopy(predArray, 0, trueArray, 0, predArray.length); @@ -85,10 +84,10 @@ public void testUnweightedAllCorrect() { Operand labels = tf.constant(trueArray); labels = tf.math.mul(labels, tf.constant(2)); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(1f, precision); } @@ -99,16 +98,16 @@ public void testUnweightedHighSensitivity() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SpecificityAtSensitivity instance = - new SpecificityAtSensitivity<>(tf, 0.8f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SpecificityAtSensitivity<>(0.8f, 1001L, TFloat32.class); + Operand predictions = tf.constant(new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.1f, 0.45f, 0.5f, 0.8f, 0.9f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.4f, precision); } @@ -119,17 +118,17 @@ public void testUnweightedLowSensitivity() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SpecificityAtSensitivity instance = - new SpecificityAtSensitivity<>(tf, 0.4f, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new SpecificityAtSensitivity<>(0.4f, 1001L, TFloat64.class); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.6f, precision); } @@ -140,18 +139,18 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SpecificityAtSensitivity instance = - new SpecificityAtSensitivity<>(tf, 0.4f, 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SpecificityAtSensitivity<>(0.4f, 1001L, TFloat32.class); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); Operand sampleWeight = tf.constant(new float[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.4f, precision); } @@ -161,24 +160,14 @@ public void testWeighted() { public void testInvalidSensitivity() { assertThrows( IllegalArgumentException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Ops tf = session.getTF(); - new SpecificityAtSensitivity<>(tf, -1f, 1001L, TFloat32.class); - } - }); + () -> new SpecificityAtSensitivity<>(-1f, 1001L, TFloat32.class)); } @Test public void testInvalidNumThresholds() { assertThrows( IllegalArgumentException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Ops tf = session.getTF(); - new SpecificityAtSensitivity<>(tf, 0.4f, -1, 1001L, TFloat32.class); - } - }); + () -> new SpecificityAtSensitivity<>(0.4f, -1, 1001L, TFloat32.class)); } @Test @@ -188,32 +177,18 @@ public void testInitTF() { SpecificityAtSensitivity instance = new SpecificityAtSensitivity<>(0.4f, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + Operand predictions = tf.constant( new float[] {0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.01f, 0.02f, 0.25f, 0.26f, 0.26f}); Operand labels = tf.constant(new long[] {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand precision = instance.result(); + Operand precision = instance.result(tf); session.evaluate(0.6f, precision); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - SpecificityAtSensitivity instance = - new SpecificityAtSensitivity<>(0.4f, 1001L, TFloat64.class); - session.run(instance.resetStates()); - instance.result(); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java index 761d5705251..ac5f61f0e1f 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SquaredHingeTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -35,8 +33,8 @@ public void testUnweighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SquaredHinge instance = - new SquaredHinge<>(tf, "SCE_testUnweighted", 1001L, TFloat32.class); - session.run(instance.resetStates()); + new SquaredHinge<>("SCE_testUnweighted", 1001L, TFloat32.class); + int[] trueArray = { 0, 1, 0, 1, 0, 0, 1, 1 @@ -45,11 +43,11 @@ public void testUnweighted() { Operand labels = tf.reshape(tf.constant(trueArray), tf.constant(Shape.of(2, 4))); Operand predictions = tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); - Op op = instance.updateState(labels, predictions, null); + Op op = instance.updateState(tf, labels, predictions, null); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(0.72812f, total); session.evaluate(2f, count); session.evaluate(0.3640625f, result); @@ -61,8 +59,8 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); SquaredHinge instance = - new SquaredHinge<>(tf, "SCE_testWeighted", 1001L, TFloat64.class); - session.run(instance.resetStates()); + new SquaredHinge<>("SCE_testWeighted", 1001L, TFloat64.class); + int[] trueArray = { 0, 1, 0, 1, 0, 0, 1, 1 @@ -73,11 +71,11 @@ public void testWeighted() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); Operand sampleWeight = tf.constant(new double[] {1.5f, 2.f}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.2137499, total); session.evaluate(3.5, count); session.evaluate(0.3467857, result); @@ -90,7 +88,7 @@ public void testInitTF() { Ops tf = session.getTF(); SquaredHinge instance = new SquaredHinge<>("testInitTF", 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); + int[] trueArray = { 0, 1, 0, 1, 0, 0, 1, 1 @@ -101,27 +99,14 @@ public void testInitTF() { tf.reshape(tf.constant(predArray), tf.constant(Shape.of(2, 4))); Operand sampleWeight = tf.constant(new double[] {1.5f, 2.f}); - Op op = instance.updateState(labels, predictions, sampleWeight); + Op op = instance.updateState(tf, labels, predictions, sampleWeight); session.run(op); Variable total = instance.getTotal(); Variable count = instance.getCount(); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(1.2137499, total); session.evaluate(3.5, count); session.evaluate(0.3467857, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - SquaredHinge instance = - new SquaredHinge<>("testIllegalState", 1001L, TFloat64.class); - instance.result(); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java index 9451dce2845..8089c953d35 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/SumTest.java @@ -15,7 +15,7 @@ package org.tensorflow.framework.metrics; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; import org.tensorflow.Operand; @@ -33,22 +33,23 @@ public class SumTest { public void testUnWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Sum instance = new Sum<>(tf, 1001L, TFloat32.class); - session.run(instance.resetStates()); + Sum instance = new Sum<>(1001L, TFloat32.class); + assertEquals(TFloat32.class, instance.getResultType()); - session.evaluate(0f, instance.getTotal()); + assertNull(instance.getTotal()); - Op update = instance.updateState(tf.constant(100f), null); + Op update = instance.updateState(tf, tf.constant(100f), null); session.run(update); - session.evaluate(100f, instance.result()); + session.evaluate(100f, instance.result(tf)); session.evaluate(100f, instance.getTotal()); - update = instance.updateState(tf.constant(new float[] {1, 5}), null); + update = instance.updateState(tf, tf.constant(new float[] {1, 5}), null); session.run(update); - session.evaluate(106f, instance.result()); + session.evaluate(106f, instance.result(tf)); session.evaluate(106f, instance.getTotal()); - session.run(instance.resetStates()); + // test reset state + session.run(instance.resetStates(tf)); session.evaluate(0f, instance.getTotal()); } } @@ -57,56 +58,57 @@ public void testUnWeighted() { public void testSumWithSampleWeight() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); - Sum instance = new Sum<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); + Sum instance = new Sum<>(1001L, TFloat64.class); // check scalar weight - Op op = instance.updateState(tf.constant(100f), tf.constant(0.5)); + Op op = instance.updateState(tf, tf.constant(100f), tf.constant(0.5)); session.run(op); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(50.0, instance.getTotal()); session.evaluate(50.0, result); // check weights not scalar and weights rank matches values rank op = - instance.updateState(tf.constant(new float[] {1, 5}), tf.constant(new double[] {1, 0.2})); + instance.updateState( + tf, tf.constant(new float[] {1, 5}), tf.constant(new double[] {1, 0.2})); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(52., instance.getTotal()); session.evaluate(52., result); // check weights broadcast - op = instance.updateState(tf.constant(new float[] {1, 2}), tf.constant(0.5)); + op = instance.updateState(tf, tf.constant(new float[] {1, 2}), tf.constant(0.5)); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(53.5, instance.getTotal()); session.evaluate(53.5, result); // check weights squeeze op = instance.updateState( - tf.constant(new float[] {1, 5}), tf.constant(new double[][] {{1}, {0.2}})); + tf, tf.constant(new float[] {1, 5}), tf.constant(new double[][] {{1}, {0.2}})); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(55.5, instance.getTotal()); session.evaluate(55.5, result); // check weights expand op = instance.updateState( - tf.constant(new float[][] {{1}, {5}}), tf.constant(new double[] {1, 0.2})); + tf, tf.constant(new float[][] {{1}, {5}}), tf.constant(new double[] {1, 0.2})); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(57.5, instance.getTotal()); session.evaluate(57.5, result); // heck values reduced to the dimensions of weight op = instance.updateState( + tf, tf.constant(new float[][][] {{{1.f, 2.f}, {3.f, 2.f}, {0.5f, 4.f}}}), tf.constant(new double[] {0.5})); session.run(op); - result = instance.result(); + result = instance.result(tf); session.evaluate(63.75, instance.getTotal()); session.evaluate(63.75, result); } @@ -118,35 +120,24 @@ public void testInitTF() { Ops tf = session.getTF(); Sum instance = new Sum<>(1001L, TFloat32.class); instance.init(tf); - session.run(instance.resetStates()); + session.run(instance.resetStates(tf)); + assertEquals(TFloat32.class, instance.getResultType()); session.evaluate(0f, instance.getTotal()); - Op update = instance.updateState(tf.constant(100f), null); + Op update = instance.updateState(tf, tf.constant(100f), null); session.run(update); - session.evaluate(100f, instance.result()); + session.evaluate(100f, instance.result(tf)); session.evaluate(100f, instance.getTotal()); - update = instance.updateState(tf.constant(new float[] {1, 5}), null); + update = instance.updateState(tf, tf.constant(new float[] {1, 5}), null); session.run(update); - session.evaluate(106f, instance.result()); + session.evaluate(106f, instance.result(tf)); session.evaluate(106f, instance.getTotal()); - session.run(instance.resetStates()); + // test reset states + session.run(instance.resetStates(tf)); session.evaluate(0f, instance.getTotal()); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - Sum instance = new Sum<>(1001L, TFloat32.class); - instance.result(); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java index 94122efb8c8..649e55206fd 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TopKCategoricalAccuracyTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -32,23 +30,22 @@ public void testCorrectness() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); TopKCategoricalAccuracy instance = - new TopKCategoricalAccuracy<>(tf, "TopK_testUnweighted", 5, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new TopKCategoricalAccuracy<>("TopK_testUnweighted", 5, 1001L, TFloat64.class); + Operand labels = tf.constant(new float[][] {{0, 0, 1}, {0, 1, 0}}); Operand predictions = tf.constant(new double[][] {{0.1f, 0.9f, 0.8f}, {0.05f, 0.95f, 0f}}); - Op update = instance.updateState(labels, predictions, null); + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(1., instance.result()); + session.evaluate(1., instance.result(tf)); // With `k` < 5. - instance = - new TopKCategoricalAccuracy<>(tf, "TopK_testUnweighted1", 1, 1001L, TFloat64.class); - session.run(instance.resetStates()); - update = instance.updateState(labels, predictions, null); + instance = new TopKCategoricalAccuracy<>("TopK_testUnweighted1", 1, 1001L, TFloat64.class); + + update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5, instance.result()); + session.evaluate(0.5, instance.result(tf)); // With `k` > 5. labels = @@ -63,12 +60,11 @@ public void testCorrectness() { {0.5f, 0.9f, 0.1f, 0.7f, 0.6f, 0.5f, 0.4f}, {0.05f, 0.95f, 0f, 0f, 0f, 0f, 0f} }); - instance = - new TopKCategoricalAccuracy<>(tf, "TopK_testUnweighted6", 6, 1001L, TFloat64.class); - session.run(instance.resetStates()); - update = instance.updateState(labels, predictions, null); + instance = new TopKCategoricalAccuracy<>("TopK_testUnweighted6", 6, 1001L, TFloat64.class); + + update = instance.updateState(tf, labels, predictions, null); session.run(update); - session.evaluate(0.5, instance.result()); + session.evaluate(0.5, instance.result(tf)); } } @@ -77,8 +73,7 @@ public void testWeighted() { try (TestSession session = TestSession.createTestSession(tfMode)) { Ops tf = session.getTF(); TopKCategoricalAccuracy instance = - new TopKCategoricalAccuracy<>(tf, "TopK_testWeighted", 5, 1001L, TFloat64.class); - session.run(instance.resetStates()); + new TopKCategoricalAccuracy<>("TopK_testWeighted", 5, 1001L, TFloat64.class); Operand labels = tf.constant( @@ -97,9 +92,9 @@ public void testWeighted() { Operand sampleWeight = tf.constant(new double[] {1, 0, 1}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - session.evaluate(1., instance.result()); + session.evaluate(1., instance.result(tf)); } } @@ -110,7 +105,6 @@ public void testInitTF() { TopKCategoricalAccuracy instance = new TopKCategoricalAccuracy<>("testInitTF", 5, 1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); Operand labels = tf.constant( @@ -129,22 +123,9 @@ public void testInitTF() { Operand sampleWeight = tf.constant(new double[] {1, 0, 1}); - Op update = instance.updateState(labels, predictions, sampleWeight); + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - session.evaluate(1., instance.result()); + session.evaluate(1., instance.result(tf)); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - TopKCategoricalAccuracy instance = - new TopKCategoricalAccuracy<>("testIllegalState", 5, 1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java index 825598e5c85..7cb0d5a804b 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TrueNegativesTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -47,11 +45,11 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); - TrueNegatives instance = new TrueNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + TrueNegatives instance = new TrueNegatives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(3.0, result); } @@ -65,11 +63,11 @@ public void testWeighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); - TrueNegatives instance = new TrueNegatives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + TrueNegatives instance = new TrueNegatives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(4.0, result); } @@ -97,11 +95,11 @@ public void testUnweightedWithThresholds() { {1, 1, 1, 1} }); TrueNegatives instance = - new TrueNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + new TrueNegatives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float[] expected = new float[] {2.f, 5.f, 7.f}; session.evaluate(expected, result); } @@ -131,11 +129,11 @@ public void testWeightedWithThresholds() { Operand sampleWeight = tf.constant(new double[][] {{0.0, 2.0, 3.0, 5.0}}); TrueNegatives instance = - new TrueNegatives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + new TrueNegatives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected = new double[] {5., 15., 23.}; session.evaluate(expected, result); } @@ -150,24 +148,12 @@ public void testInitTF() { Operand labels = tf.constant(this.trueArray); TrueNegatives instance = new TrueNegatives<>(1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(3.0, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - TrueNegatives instance = new TrueNegatives<>(1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java index de64f89fb36..e85c96874f2 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/metrics/TruePositivesTest.java @@ -14,8 +14,6 @@ =======================================================================*/ package org.tensorflow.framework.metrics; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.Test; import org.tensorflow.Operand; import org.tensorflow.framework.utils.TestSession; @@ -47,11 +45,11 @@ public void testUnweighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); - TruePositives instance = new TruePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + TruePositives instance = new TruePositives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(7.0, result); } @@ -65,11 +63,11 @@ public void testWeighted() { Operand predictions = tf.constant(this.predArray); Operand labels = tf.constant(this.trueArray); Operand sampleWeight = tf.constant(this.sampleWeightArray); - TruePositives instance = new TruePositives<>(tf, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + TruePositives instance = new TruePositives<>(1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(12.0, result); } @@ -97,11 +95,11 @@ public void testUnweightedWithThresholds() { {1, 1, 1, 1} }); TruePositives instance = - new TruePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, null); + new TruePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat32.class); + + Op update = instance.updateState(tf, labels, predictions, null); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); float[] expected = new float[] {6.f, 3.f, 1.f}; session.evaluate(expected, result); } @@ -131,11 +129,11 @@ public void testWeightedWithThresholds() { Operand sampleWeight = tf.constant(37.); TruePositives instance = - new TruePositives<>(tf, new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + new TruePositives<>(new float[] {0.15f, 0.5f, 0.85f}, 1001L, TFloat64.class); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); double[] expected = new double[] {222., 111., 37.}; session.evaluate(expected, result); } @@ -150,24 +148,12 @@ public void testInitTF() { Operand sampleWeight = tf.constant(this.sampleWeightArray); TruePositives instance = new TruePositives<>(1001L, TFloat64.class); instance.init(tf); - session.run(instance.resetStates()); - Op update = instance.updateState(labels, predictions, sampleWeight); + + Op update = instance.updateState(tf, labels, predictions, sampleWeight); session.run(update); - Operand result = instance.result(); + Operand result = instance.result(tf); session.evaluate(12.0, result); } } - - @Test - public void testIllegalState() { - assertThrows( - IllegalStateException.class, - () -> { - try (TestSession session = TestSession.createTestSession(tfMode)) { - TruePositives instance = new TruePositives<>(1001L, TFloat64.class); - session.run(instance.resetStates()); - } - }); - } } From 50007f2022e2df045772432618a64e38c482a941 Mon Sep 17 00:00:00 2001 From: Jim Clarke Date: Sat, 19 Jun 2021 16:19:06 -0400 Subject: [PATCH 7/7] Re ran spotless apply. --- .../org/tensorflow/framework/metrics/impl/MetricInterface.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java index d347b95e631..c77133d63e4 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/metrics/impl/MetricInterface.java @@ -62,7 +62,6 @@ List updateStateList( * @return the result, possibly with control dependencies * @throws IllegalStateException if the TensorFlow Ops has nat been initialized with {@link * Initializable#init(Ops)}. - * */ Operand result(Ops tf);