diff --git a/ndarray/src/main/java/org/tensorflow/ndarray/NdArrays.java b/ndarray/src/main/java/org/tensorflow/ndarray/NdArrays.java index 186d8019888..508e8a3e09e 100644 --- a/ndarray/src/main/java/org/tensorflow/ndarray/NdArrays.java +++ b/ndarray/src/main/java/org/tensorflow/ndarray/NdArrays.java @@ -65,7 +65,7 @@ public static ByteNdArray vectorOf(byte... values) { if (values == null) { throw new IllegalArgumentException("Values cannot be null"); } - return wrap(DataBuffers.of(values, false, false), Shape.of(values.length)); + return wrap(Shape.of(values.length), DataBuffers.of(values, false, false)); } /** @@ -81,19 +81,19 @@ public static ByteNdArray ofBytes(Shape shape) { if (shape == null) { throw new IllegalArgumentException("Shape cannot be null"); } - return wrap(DataBuffers.ofBytes(shape.size()), shape); + return wrap(shape, DataBuffers.ofBytes(shape.size())); } /** * Wraps a buffer in a byte N-dimensional array of a given shape. * - * @param buffer buffer to wrap * @param shape shape of the array + * @param buffer buffer to wrap * @return new byte N-dimensional array * @throws IllegalArgumentException if shape is null, has unknown dimensions or has size bigger * in the buffer size */ - public static ByteNdArray wrap(ByteDataBuffer buffer, Shape shape) { + public static ByteNdArray wrap(Shape shape, ByteDataBuffer buffer) { return ByteDenseNdArray.create(buffer, shape); } diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_generator.cc b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_generator.cc index f0fb802d548..0667f0db05b 100644 --- a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_generator.cc +++ b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_generator.cc @@ -237,12 +237,12 @@ void RenderFactoryMethods(const OpSpec& op, const Type& op_class, writer->EndLine(); for (const ArgumentSpec& input : op.inputs()) { if (input.iterable()) { - writer->Append("opBuilder.addInputList(Operands.asOutputs(" + + writer->Append("opBuilder.addInputList(Operands.asOutputs(scope, " + input.var().name() + "));"); writer->EndLine(); } else { writer->Append("opBuilder.addInput(" + input.var().name() + - ".asOutput());"); + ".asOutput(scope));"); writer->EndLine(); } } @@ -348,8 +348,9 @@ void RenderInterfaceImpl(const OpSpec& op, RenderMode mode, if (mode == OPERAND) { bool cast2obj = output.type().wildcard(); Type return_type = Type::Class("Output", "org.tensorflow") - .add_parameter(cast2obj ? Type::Class("TType", "org.tensorflow.types.family") : output.type()); + .add_parameter(cast2obj ? Type::Interface("TType", "org.tensorflow.types.family") : output.type()); Method as_output = Method::Create("asOutput", return_type) + .add_argument(Variable::Create("scope", Type::Class("Scope", "org.tensorflow.op"))) .add_annotation(Annotation::Create("Override")); if (cast2obj) { as_output.add_annotation( @@ -366,7 +367,7 @@ void RenderInterfaceImpl(const OpSpec& op, RenderMode mode, } else if (mode == LIST_OPERAND) { Type operand = Type::Interface("Operand", "org.tensorflow"); if (output.type().wildcard()) { - operand.add_parameter(Type::Class("TType", "org.tensorflow.types.family")); + operand.add_parameter(Type::Interface("TType", "org.tensorflow.types.family")); } else { operand.add_parameter(output.type()); } @@ -430,10 +431,9 @@ void GenerateOp(const OpSpec& op, const EndpointSpec& endpoint, RenderMode mode = DEFAULT; if (op.outputs().size() == 1) { const ArgumentSpec& output = op.outputs().front(); - Type operand_type(output.type().wildcard() ? Type::Class("TType", "org.tensorflow.types.family") + Type operand_type(output.type().wildcard() ? Type::Interface("TType", "org.tensorflow.types.family") : output.type()); - Type operand_inf(Type::Interface("Operand", "org.tensorflow") - .add_parameter(operand_type)); + Type operand_inf(Type::Interface("Operand", "org.tensorflow").add_parameter(operand_type)); if (output.iterable()) { mode = LIST_OPERAND; op_class.add_supertype(Type::IterableOf(operand_inf)); diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc index c9e0525edb7..7906613569a 100644 --- a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc +++ b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc @@ -65,6 +65,13 @@ class TypeResolver { std::pair TypesOf(const OpDef_AttrDef& attr_def, bool* iterable_out); + // Returns the highest type family this attribute is part of + // + // For example, if the attribute is of type 'bool', the base 'TType' family + // returned. But if it represents a number, like a float or an integer, + // then 'TNumber' (which supersedes 'TType') is returned. + Type FamilyOf(const OpDef_AttrDef& attr_def); + // Returns true if the type of this attribute has already been resolved bool IsAttributeVisited(const string& attr_name) { return visited_attrs_.find(attr_name) != visited_attrs_.cend(); @@ -81,13 +88,12 @@ class TypeResolver { std::pair MakeTypePair(const Type& type) { return std::make_pair(type, type); } - Type NextGeneric() { + Type NextGeneric(const Type& typeFamily) { char generic_letter = next_generic_letter_++; if (next_generic_letter_ > 'Z') { next_generic_letter_ = 'A'; } - return Type::Generic(string(1, generic_letter)) - .add_supertype(Type::Class("TType", "org.tensorflow.types.family")); + return Type::Generic(string(1, generic_letter)).add_supertype(typeFamily); } }; @@ -156,10 +162,7 @@ std::pair TypeResolver::TypesOf(const OpDef_AttrDef& attr_def, .add_parameter(Type::Wildcard())); } else if (attr_type == "type") { - Type type = *iterable_out ? Type::Wildcard() : NextGeneric(); - if (IsRealNumbers(attr_def.allowed_values())) { - type.add_supertype(Type::Class("TNumber", "org.tensorflow.types.family")); - } + Type type = *iterable_out ? Type::Wildcard() : NextGeneric(FamilyOf(attr_def)); types = MakeTypePair(type, Type::Enum("DataType", "org.tensorflow")); } else { @@ -170,6 +173,14 @@ std::pair TypeResolver::TypesOf(const OpDef_AttrDef& attr_def, return types; } +Type TypeResolver::FamilyOf(const OpDef_AttrDef& attr_def) { + // TODO (karlllessard): add more type families + if (IsRealNumbers(attr_def.allowed_values())) { + return Type::Interface("TNumber", "org.tensorflow.types.family"); + } + return Type::Interface("TType", "org.tensorflow.types.family"); +} + string SnakeToCamelCase(const string& str, bool upper = false) { string result; bool cap = upper; diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/source_writer.cc b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/source_writer.cc index 63191c080ac..27185f1465b 100644 --- a/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/source_writer.cc +++ b/tensorflow-core/tensorflow-core-api/src/bazel/op_generator/source_writer.cc @@ -305,8 +305,15 @@ SourceWriter& SourceWriter::WriteGenerics( Append(", "); } Append(pt->name()); - if (!pt->supertypes().empty()) { - Append(" extends ").AppendType(pt->supertypes().front()); + bool first_bound = true; + for (const Type& bound : pt->supertypes()) { + if (first_bound) { + Append(" extends "); + first_bound = false; + } else { + Append(" & "); + } + AppendType(bound); } first = false; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java index 1c27b439cec..b17d3c81d31 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java @@ -23,7 +23,6 @@ import org.tensorflow.EagerSession; import org.tensorflow.ExecutionEnvironment; import org.tensorflow.Operand; -import org.tensorflow.Tensor; import org.tensorflow.ndarray.BooleanNdArray; import org.tensorflow.ndarray.ByteNdArray; import org.tensorflow.ndarray.DoubleNdArray; @@ -1052,6 +1051,17 @@ public Bucketize bucketize(Operand input, List bou return Bucketize.create(scope, input, boundaries); } + /** + * Create a constant from a Tensor. + * + * @param scope is a scope used to add the underlying operation. + * @param tensor a Tensor holding the constant value + * @return a constant of the same data type as `tensor` + */ + public Constant capture(T tensor) { + return Constant.create(scope, tensor); + } + /** * Clips tensor values to a specified min and max. *

@@ -1687,17 +1697,6 @@ public Constant constant(Shape shape) { return Constant.tensorOf(scope, shape); } - /** - * Create a constant from a Tensor. - * - * @param scope is a scope used to add the underlying operation. - * @param tensor a Tensor holding the constant value - * @return a constant of the same data type as `tensor` - */ - public Constant constant(Tensor tensor) { - return Constant.create(scope, tensor); - } - /** * Creates a constant of {@code String} elements, using the given charset. * 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 6774323de4d..232f24bdc0d 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 @@ -93,7 +93,7 @@ private Options() { @Endpoint(describeByClass = true) public static AudioSpectrogram create(Scope scope, Operand input, Long windowSize, Long stride, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AudioSpectrogram", scope.makeOpName("AudioSpectrogram")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("window_size", windowSize); opBuilder.setAttr("stride", stride); @@ -123,7 +123,7 @@ public Output spectrogram() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return spectrogram; } 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 a58d814660c..7a38b5b4dc2 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 @@ -89,7 +89,7 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeWav create(Scope scope, Operand contents, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeWav", scope.makeOpName("DecodeWav")); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 2336a3124c5..d6d54ba7faa 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 @@ -54,8 +54,8 @@ public final class EncodeWav extends RawOp implements Operand { @Endpoint(describeByClass = true) public static EncodeWav create(Scope scope, Operand audio, Operand sampleRate) { OperationBuilder opBuilder = scope.env().opBuilder("EncodeWav", scope.makeOpName("EncodeWav")); - opBuilder.addInput(audio.asOutput()); - opBuilder.addInput(sampleRate.asOutput()); + opBuilder.addInput(audio.asOutput(scope)); + opBuilder.addInput(sampleRate.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new EncodeWav(opBuilder.build()); } @@ -68,7 +68,7 @@ public Output contents() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return contents; } 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 a13d22fdb4a..f89f6858d07 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 @@ -102,8 +102,8 @@ private Options() { @Endpoint(describeByClass = true) public static Mfcc create(Scope scope, Operand spectrogram, Operand sampleRate, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Mfcc", scope.makeOpName("Mfcc")); - opBuilder.addInput(spectrogram.asOutput()); - opBuilder.addInput(sampleRate.asOutput()); + opBuilder.addInput(spectrogram.asOutput(scope)); + opBuilder.addInput(sampleRate.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -161,7 +161,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 70318891190..a5edf08f11c 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Elementwise computes the bitwise AND of `x` and `y`. @@ -67,8 +66,8 @@ public final class BitwiseAnd extends RawOp implements Operan @Endpoint(describeByClass = true) public static BitwiseAnd create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("BitwiseAnd", scope.makeOpName("BitwiseAnd")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BitwiseAnd(opBuilder.build()); } @@ -80,7 +79,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 4d882a6c202..1f98acc6f31 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Elementwise computes the bitwise OR of `x` and `y`. @@ -67,8 +66,8 @@ public final class BitwiseOr extends RawOp implements Operand @Endpoint(describeByClass = true) public static BitwiseOr create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("BitwiseOr", scope.makeOpName("BitwiseOr")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BitwiseOr(opBuilder.build()); } @@ -80,7 +79,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 597ae15fb90..b2e1c72defc 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Elementwise computes the bitwise XOR of `x` and `y`. @@ -67,8 +66,8 @@ public final class BitwiseXor extends RawOp implements Operan @Endpoint(describeByClass = true) public static BitwiseXor create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("BitwiseXor", scope.makeOpName("BitwiseXor")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BitwiseXor(opBuilder.build()); } @@ -80,7 +79,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 6cbacade24d..6154331c843 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Invert (flip) each bit of supported types; for example, type `uint8` value 01010101 becomes 10101010. @@ -87,7 +86,7 @@ public final class Invert extends RawOp implements Operand @Endpoint(describeByClass = true) public static Invert create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Invert", scope.makeOpName("Invert")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Invert(opBuilder.build()); } @@ -99,7 +98,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 bddf9269c42..2e66c974de3 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Elementwise computes the bitwise left-shift of `x` and `y`. @@ -78,8 +77,8 @@ public final class LeftShift extends RawOp implements Operand @Endpoint(describeByClass = true) public static LeftShift create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("LeftShift", scope.makeOpName("LeftShift")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LeftShift(opBuilder.build()); } @@ -91,7 +90,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 92487345d8c..16e97117ecf 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Elementwise computes the bitwise right-shift of `x` and `y`. @@ -81,8 +80,8 @@ public final class RightShift extends RawOp implements Operan @Endpoint(describeByClass = true) public static RightShift create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("RightShift", scope.makeOpName("RightShift")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RightShift(opBuilder.build()); } @@ -94,7 +93,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 350036bbdc6..a872a6f8496 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 @@ -50,8 +50,8 @@ public final class KMC2ChainInitialization extends RawOp implements Operand distances, Operand seed) { OperationBuilder opBuilder = scope.env().opBuilder("KMC2ChainInitialization", scope.makeOpName("KMC2ChainInitialization")); - opBuilder.addInput(distances.asOutput()); - opBuilder.addInput(seed.asOutput()); + opBuilder.addInput(distances.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new KMC2ChainInitialization(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output index() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return index; } 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 a8d6f3eb70b..a26bb5432bd 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 @@ -54,10 +54,10 @@ public final class KmeansPlusPlusInitialization extends RawOp implements Operand @Endpoint(describeByClass = true) public static KmeansPlusPlusInitialization create(Scope scope, Operand points, Operand numToSample, Operand seed, Operand numRetriesPerSample) { OperationBuilder opBuilder = scope.env().opBuilder("KmeansPlusPlusInitialization", scope.makeOpName("KmeansPlusPlusInitialization")); - opBuilder.addInput(points.asOutput()); - opBuilder.addInput(numToSample.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(numRetriesPerSample.asOutput()); + opBuilder.addInput(points.asOutput(scope)); + opBuilder.addInput(numToSample.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(numRetriesPerSample.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new KmeansPlusPlusInitialization(opBuilder.build()); } @@ -70,7 +70,7 @@ public Output samples() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return samples; } 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 40125fa7856..9318b8df55f 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Mutually reduces multiple tensors of identical type and shape. @@ -81,7 +80,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("group_size", groupSize); opBuilder.setAttr("group_key", groupKey); @@ -131,7 +130,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c754a3d9dea..f829cb75210 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 @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 72f721a9fa3..ff5905a61db 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 @@ -69,7 +69,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("group_size", groupSize); opBuilder.setAttr("group_key", groupKey); @@ -99,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 2c92e6934cc..95acd0433a1 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the "logical and" of elements across dimensions of a tensor. @@ -72,8 +71,8 @@ private Options() { @Endpoint(describeByClass = true) public static All create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("All", scope.makeOpName("All")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c30305b2207..6222b9c50d8 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the "logical or" of elements across dimensions of a tensor. @@ -72,8 +71,8 @@ private Options() { @Endpoint(describeByClass = true) public static Any create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Any", scope.makeOpName("Any")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a56b01c90aa..ca758ea0801 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 @@ -67,8 +67,8 @@ private Options() { @Endpoint(describeByClass = true) public static AssertThat create(Scope scope, Operand condition, Iterable> data, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Assert", scope.makeOpName("AssertThat")); - opBuilder.addInput(condition.asOutput()); - opBuilder.addInputList(Operands.asOutputs(data)); + opBuilder.addInput(condition.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, data)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 c0319759f33..0752ca68a4c 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 @@ -81,8 +81,8 @@ private Options() { @Endpoint(describeByClass = true) public static Assign create(Scope scope, Operand ref, Operand value, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Assign", scope.makeOpName("Assign")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -123,7 +123,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 9208756aa95..570e8f97ffb 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 @@ -70,8 +70,8 @@ private Options() { @Endpoint(describeByClass = true) public static AssignAdd create(Scope scope, Operand ref, Operand value, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AssignAdd", scope.makeOpName("AssignAdd")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +100,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 3725c318637..5249d72ac2a 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 @@ -46,8 +46,8 @@ public final class AssignAddVariableOp extends RawOp { @Endpoint(describeByClass = true) public static AssignAddVariableOp create(Scope scope, Operand resource, Operand value) { OperationBuilder opBuilder = scope.env().opBuilder("AssignAddVariableOp", scope.makeOpName("AssignAddVariableOp")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AssignAddVariableOp(opBuilder.build()); } 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 13506b03543..7268972953c 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 @@ -70,8 +70,8 @@ private Options() { @Endpoint(describeByClass = true) public static AssignSub create(Scope scope, Operand ref, Operand value, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AssignSub", scope.makeOpName("AssignSub")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +100,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 c47fc330702..1bf0b7cdd13 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 @@ -46,8 +46,8 @@ public final class AssignSubVariableOp extends RawOp { @Endpoint(describeByClass = true) public static AssignSubVariableOp create(Scope scope, Operand resource, Operand value) { OperationBuilder opBuilder = scope.env().opBuilder("AssignSubVariableOp", scope.makeOpName("AssignSubVariableOp")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AssignSubVariableOp(opBuilder.build()); } 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 bdd89c0204d..74209cd615e 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 @@ -46,8 +46,8 @@ public final class AssignVariableOp extends RawOp { @Endpoint(describeByClass = true) public static AssignVariableOp create(Scope scope, Operand resource, Operand value) { OperationBuilder opBuilder = scope.env().opBuilder("AssignVariableOp", scope.makeOpName("AssignVariableOp")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AssignVariableOp(opBuilder.build()); } 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 dea40abd45c..8f779a3ebbd 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 @@ -177,7 +177,7 @@ public Output handle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return handle; } 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 2b1cbc84c2b..93005265cc2 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 @@ -71,7 +71,7 @@ private Options() { @Endpoint(describeByClass = true) public static BarrierClose create(Scope scope, Operand handle, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BarrierClose", scope.makeOpName("BarrierClose")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 62bcdcf1e56..d94c23296a5 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 @@ -44,7 +44,7 @@ public final class BarrierIncompleteSize extends RawOp implements Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("BarrierIncompleteSize", scope.makeOpName("BarrierIncompleteSize")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BarrierIncompleteSize(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 8e16fe1df11..2b81b8c3812 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 @@ -52,9 +52,9 @@ public final class BarrierInsertMany extends RawOp { @Endpoint(describeByClass = true) public static BarrierInsertMany create(Scope scope, Operand handle, Operand keys, Operand values, Long componentIndex) { OperationBuilder opBuilder = scope.env().opBuilder("BarrierInsertMany", scope.makeOpName("BarrierInsertMany")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(keys.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(keys.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("component_index", componentIndex); return new BarrierInsertMany(opBuilder.build()); 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 b3059b5b8c9..e7897cefc1e 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 @@ -44,7 +44,7 @@ public final class BarrierReadySize extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BarrierReadySize create(Scope scope, Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("BarrierReadySize", scope.makeOpName("BarrierReadySize")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BarrierReadySize(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 481cdcd1d7a..8983036f436 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 @@ -100,8 +100,8 @@ private Options() { @Endpoint(describeByClass = true) public static BarrierTakeMany create(Scope scope, Operand handle, Operand numElements, List> componentTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BarrierTakeMany", scope.makeOpName("BarrierTakeMany")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(numElements.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(numElements.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] componentTypesArray = new DataType[componentTypes.size()]; for (int i = 0; i < componentTypesArray.length; ++i) { 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 895ad5e3c77..edcb0a3b6ca 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 @@ -143,7 +143,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInputList(Operands.asOutputs(inTensors)); + opBuilder.addInputList(Operands.asOutputs(scope, inTensors)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_batch_threads", numBatchThreads); opBuilder.setAttr("max_batch_size", maxBatchSize); 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 3d1fc8af44e..9cd0f18e4ae 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 @@ -63,8 +63,8 @@ public final class BatchToSpace extends RawOp implements Operan @Endpoint(describeByClass = true) public static BatchToSpace create(Scope scope, Operand input, Operand crops, Long blockSize) { OperationBuilder opBuilder = scope.env().opBuilder("BatchToSpace", scope.makeOpName("BatchToSpace")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(crops.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(crops.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("block_size", blockSize); return new BatchToSpace(opBuilder.build()); @@ -130,7 +130,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8c2a3d9b703..1f8cdf1db56 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 @@ -150,9 +150,9 @@ public final class BatchToSpaceNd extends RawOp implements Oper @Endpoint(describeByClass = true) public static BatchToSpaceNd create(Scope scope, Operand input, Operand blockShape, Operand crops) { OperationBuilder opBuilder = scope.env().opBuilder("BatchToSpaceND", scope.makeOpName("BatchToSpaceNd")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(blockShape.asOutput()); - opBuilder.addInput(crops.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(blockShape.asOutput(scope)); + opBuilder.addInput(crops.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchToSpaceNd(opBuilder.build()); } @@ -164,7 +164,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fa7777e0d98..23222c3b913 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 @@ -98,7 +98,7 @@ public final class Bitcast extends RawOp implements Operand @Endpoint(describeByClass = true) public static Bitcast create(Scope scope, Operand input, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("Bitcast", scope.makeOpName("Bitcast")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new Bitcast(opBuilder.build()); @@ -111,7 +111,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 88758189167..1490e9c8d0a 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Return the shape of s0 op s1 with broadcast. @@ -50,8 +49,8 @@ public final class BroadcastDynamicShape extends RawOp implem @Endpoint(describeByClass = true) public static BroadcastDynamicShape create(Scope scope, Operand s0, Operand s1) { OperationBuilder opBuilder = scope.env().opBuilder("BroadcastArgs", scope.makeOpName("BroadcastDynamicShape")); - opBuilder.addInput(s0.asOutput()); - opBuilder.addInput(s1.asOutput()); + opBuilder.addInput(s0.asOutput(scope)); + opBuilder.addInput(s1.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BroadcastDynamicShape(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output r0() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return r0; } 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 309cfef9430..395e33a6258 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Return the reduction indices for computing gradients of s0 op s1 with broadcast. @@ -48,8 +47,8 @@ public final class BroadcastGradientArgs extends RawOp { @Endpoint(describeByClass = true) public static BroadcastGradientArgs create(Scope scope, Operand s0, Operand s1) { OperationBuilder opBuilder = scope.env().opBuilder("BroadcastGradientArgs", scope.makeOpName("BroadcastGradientArgs")); - opBuilder.addInput(s0.asOutput()); - opBuilder.addInput(s1.asOutput()); + opBuilder.addInput(s0.asOutput(scope)); + opBuilder.addInput(s1.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BroadcastGradientArgs(opBuilder.build()); } 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 e4c1b80764f..781a718cb8c 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 @@ -66,8 +66,8 @@ public final class BroadcastTo extends RawOp implements Operand @Endpoint(describeByClass = true) public static BroadcastTo create(Scope scope, Operand input, Operand shape) { OperationBuilder opBuilder = scope.env().opBuilder("BroadcastTo", scope.makeOpName("BroadcastTo")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BroadcastTo(opBuilder.build()); } @@ -80,7 +80,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f7f32115de1..e28ef23c14c 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Bucketizes 'input' based on 'boundaries'. @@ -58,7 +57,7 @@ public final class Bucketize extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Bucketize create(Scope scope, Operand input, List boundaries) { OperationBuilder opBuilder = scope.env().opBuilder("Bucketize", scope.makeOpName("Bucketize")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); float[] boundariesArray = new float[boundaries.size()]; for (int i = 0; i < boundariesArray.length; ++i) { @@ -80,7 +79,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1c33f21ba98..eddfbe8c006 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 @@ -54,9 +54,9 @@ public final class ClipByValue extends RawOp implements Operand @Endpoint(describeByClass = true) public static ClipByValue create(Scope scope, Operand t, Operand clipValueMin, Operand clipValueMax) { OperationBuilder opBuilder = scope.env().opBuilder("ClipByValue", scope.makeOpName("ClipByValue")); - opBuilder.addInput(t.asOutput()); - opBuilder.addInput(clipValueMin.asOutput()); - opBuilder.addInput(clipValueMax.asOutput()); + opBuilder.addInput(t.asOutput(scope)); + opBuilder.addInput(clipValueMin.asOutput(scope)); + opBuilder.addInput(clipValueMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ClipByValue(opBuilder.build()); } @@ -69,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 da4f82ad2a2..7e663151a82 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Mutually accumulates multiple tensors of identical type and shape. @@ -70,7 +69,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("group_size", groupSize); opBuilder.setAttr("group_key", groupKey); @@ -100,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 eb62cb86bf5..27dfab03f3f 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 @@ -50,8 +50,8 @@ public final class Concat extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Concat create(Scope scope, Iterable> values, Operand axis) { OperationBuilder opBuilder = scope.env().opBuilder("ConcatV2", scope.makeOpName("Concat")); - opBuilder.addInputList(Operands.asOutputs(values)); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, values)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Concat(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8a7440297f3..0599e25506f 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 @@ -49,7 +49,7 @@ public final class ConsumeMutexLock extends RawOp { @Endpoint(describeByClass = true) public static ConsumeMutexLock create(Scope scope, Operand mutexLock) { OperationBuilder opBuilder = scope.env().opBuilder("ConsumeMutexLock", scope.makeOpName("ConsumeMutexLock")); - opBuilder.addInput(mutexLock.asOutput()); + opBuilder.addInput(mutexLock.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ConsumeMutexLock(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 6ca879bf1b9..a074e84a211 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 @@ -87,7 +87,7 @@ private Options() { @Endpoint(describeByClass = true) public static Copy create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Copy", scope.makeOpName("Copy")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -131,7 +131,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b57961ead25..6062d28f7ba 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 @@ -85,7 +85,7 @@ private Options() { @Endpoint(describeByClass = true) public static CopyHost create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("CopyHost", scope.makeOpName("CopyHost")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -129,7 +129,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 84dfbc90633..7cf7550e53f 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Increments 'ref' until it reaches 'limit'. @@ -48,7 +47,7 @@ public final class CountUpTo extends RawOp implements Operand @Endpoint(describeByClass = true) public static CountUpTo create(Scope scope, Operand ref, Long limit) { OperationBuilder opBuilder = scope.env().opBuilder("CountUpTo", scope.makeOpName("CountUpTo")); - opBuilder.addInput(ref.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("limit", limit); return new CountUpTo(opBuilder.build()); @@ -63,7 +62,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8a423575c08..69f18b67524 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 @@ -137,7 +137,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(bytes.asOutput()); + opBuilder.addInput(bytes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("message_type", messageType); String[] fieldNamesArray = new String[fieldNames.size()]; 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 0abe365a8a9..527529a9207 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 @@ -45,7 +45,7 @@ public final class DeepCopy extends RawOp implements Operand @Endpoint(describeByClass = true) public static DeepCopy create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("DeepCopy", scope.makeOpName("DeepCopy")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DeepCopy(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 2da72b19db9..0f3823951ce 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 @@ -42,7 +42,7 @@ public final class DeleteSessionTensor extends RawOp { @Endpoint(describeByClass = true) public static DeleteSessionTensor create(Scope scope, Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("DeleteSessionTensor", scope.makeOpName("DeleteSessionTensor")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 dc494cea751..27ff8b78f0e 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 @@ -65,7 +65,7 @@ private Options() { @Endpoint(describeByClass = true) public static DestroyResourceOp create(Scope scope, Operand resource, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DestroyResourceOp", scope.makeOpName("DestroyResourceOp")); - opBuilder.addInput(resource.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 65fa9c62e4a..5bc0358962a 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 @@ -55,7 +55,7 @@ public final class DestroyTemporaryVariable extends RawOp imple @Endpoint(describeByClass = true) public static DestroyTemporaryVariable create(Scope scope, Operand ref, String varName) { OperationBuilder opBuilder = scope.env().opBuilder("DestroyTemporaryVariable", scope.makeOpName("DestroyTemporaryVariable")); - opBuilder.addInput(ref.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("var_name", varName); return new DestroyTemporaryVariable(opBuilder.build()); @@ -68,7 +68,7 @@ public Output value() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return value; } 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 c5a6187d1ed..3c0f3c033a2 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 @@ -52,7 +52,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 48dd3b54f8e..7878bfed47f 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 @@ -85,8 +85,8 @@ public final class DynamicPartition extends RawOp implements It @Endpoint(describeByClass = true) public static DynamicPartition create(Scope scope, Operand data, Operand partitions, Long numPartitions) { OperationBuilder opBuilder = scope.env().opBuilder("DynamicPartition", scope.makeOpName("DynamicPartition")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(partitions.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(partitions.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_partitions", numPartitions); return new DynamicPartition(opBuilder.build()); 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 ba41dcf77f8..79cba09d6eb 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 @@ -103,8 +103,8 @@ public final class DynamicStitch extends RawOp implements Opera @Endpoint(describeByClass = true) public static DynamicStitch create(Scope scope, Iterable> indices, Iterable> data) { OperationBuilder opBuilder = scope.env().opBuilder("DynamicStitch", scope.makeOpName("DynamicStitch")); - opBuilder.addInputList(Operands.asOutputs(indices)); - opBuilder.addInputList(Operands.asOutputs(data)); + opBuilder.addInputList(Operands.asOutputs(scope, indices)); + opBuilder.addInputList(Operands.asOutputs(scope, data)); opBuilder = scope.applyControlDependencies(opBuilder); return new DynamicStitch(opBuilder.build()); } @@ -116,7 +116,7 @@ public Output merged() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return merged; } 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 7c0a35798d5..7a3583a8e5a 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 @@ -84,12 +84,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(hypothesisIndices.asOutput()); - opBuilder.addInput(hypothesisValues.asOutput()); - opBuilder.addInput(hypothesisShape.asOutput()); - opBuilder.addInput(truthIndices.asOutput()); - opBuilder.addInput(truthValues.asOutput()); - opBuilder.addInput(truthShape.asOutput()); + opBuilder.addInput(hypothesisIndices.asOutput(scope)); + opBuilder.addInput(hypothesisValues.asOutput(scope)); + opBuilder.addInput(hypothesisShape.asOutput(scope)); + opBuilder.addInput(truthIndices.asOutput(scope)); + opBuilder.addInput(truthValues.asOutput(scope)); + opBuilder.addInput(truthShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -147,7 +147,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0e39ea25f92..ff03c154af0 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 @@ -70,7 +70,7 @@ private Options() { @Endpoint(describeByClass = true) public static Empty create(Scope scope, Operand shape, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Empty", scope.makeOpName("Empty")); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -98,7 +98,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e91ebafbb03..7a73f068593 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 @@ -55,8 +55,8 @@ public final class EmptyTensorList extends RawOp implements Operand { @Endpoint(describeByClass = true) public static EmptyTensorList create(Scope scope, Operand elementShape, Operand maxNumElements, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("EmptyTensorList", scope.makeOpName("EmptyTensorList")); - opBuilder.addInput(elementShape.asOutput()); - opBuilder.addInput(maxNumElements.asOutput()); + opBuilder.addInput(elementShape.asOutput(scope)); + opBuilder.addInput(maxNumElements.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new EmptyTensorList(opBuilder.build()); @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 6f2e448d053..f0754def839 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,8 +109,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(sizes.asOutput()); - opBuilder.addInputList(Operands.asOutputs(values)); + opBuilder.addInput(sizes.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); opBuilder = scope.applyControlDependencies(opBuilder); String[] fieldNamesArray = new String[fieldNames.size()]; for (int i = 0; i < fieldNamesArray.length; ++i) { @@ -143,7 +143,7 @@ public Output bytes() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return bytes; } 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 3b8a8790afa..8bad2890370 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 @@ -50,7 +50,7 @@ public final class EnsureShape extends RawOp implements Operand @Endpoint(describeByClass = true) public static EnsureShape create(Scope scope, Operand input, Shape shape) { OperationBuilder opBuilder = scope.env().opBuilder("EnsureShape", scope.makeOpName("EnsureShape")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("shape", shape); return new EnsureShape(opBuilder.build()); @@ -64,7 +64,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d6802061959..3ccb8d1b9b9 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 @@ -80,7 +80,7 @@ private Options() { @Endpoint(describeByClass = true) public static Enter create(Scope scope, Operand data, String frameName, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Enter", scope.makeOpName("Enter")); - opBuilder.addInput(data.asOutput()); + opBuilder.addInput(data.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("frame_name", frameName); if (options != null) { @@ -118,7 +118,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 879225e5dbc..57b9c871151 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 @@ -46,7 +46,7 @@ public final class Exit extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Exit create(Scope scope, Operand data) { OperationBuilder opBuilder = scope.env().opBuilder("Exit", scope.makeOpName("Exit")); - opBuilder.addInput(data.asOutput()); + opBuilder.addInput(data.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Exit(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 12cb36b98dc..4493f8ebf59 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 @@ -78,8 +78,8 @@ public final class ExpandDims extends RawOp implements Operand< @Endpoint(describeByClass = true) public static ExpandDims create(Scope scope, Operand input, Operand axis) { OperationBuilder opBuilder = scope.env().opBuilder("ExpandDims", scope.makeOpName("ExpandDims")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ExpandDims(opBuilder.build()); } @@ -93,7 +93,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 6816275860b..78f589a8bf3 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Extract `patches` from `input` and put them in the "depth" output dimension. 3D extension of `extract_image_patches`. @@ -58,7 +57,7 @@ public final class ExtractVolumePatches extends RawOp impleme @Endpoint(describeByClass = true) public static ExtractVolumePatches create(Scope scope, Operand input, List ksizes, List strides, String padding) { OperationBuilder opBuilder = scope.env().opBuilder("ExtractVolumePatches", scope.makeOpName("ExtractVolumePatches")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizesArray = new long[ksizes.size()]; for (int i = 0; i < ksizesArray.length; ++i) { @@ -86,7 +85,7 @@ public Output patches() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return patches; } 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 adbcc23f363..48f1128fa9c 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 @@ -74,8 +74,8 @@ public final class Fill extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Fill create(Scope scope, Operand dims, Operand value) { OperationBuilder opBuilder = scope.env().opBuilder("Fill", scope.makeOpName("Fill")); - opBuilder.addInput(dims.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(dims.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Fill(opBuilder.build()); } @@ -87,7 +87,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4aca6b0201e..805470b9090 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 @@ -76,8 +76,8 @@ public final class Fingerprint extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Fingerprint create(Scope scope, Operand data, Operand method) { OperationBuilder opBuilder = scope.env().opBuilder("Fingerprint", scope.makeOpName("Fingerprint")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(method.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(method.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Fingerprint(opBuilder.build()); } @@ -92,7 +92,7 @@ public Output fingerprint() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return fingerprint; } 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 8eaec57f813..869f2aa7b9a 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 @@ -96,9 +96,9 @@ private Options() { @Endpoint(describeByClass = true) public static Gather create(Scope scope, Operand params, Operand indices, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("GatherV2", scope.makeOpName("Gather")); - opBuilder.addInput(params.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(params.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -126,7 +126,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 917db87705f..9252c66d2f6 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 @@ -140,8 +140,8 @@ public final class GatherNd extends RawOp implements Operand @Endpoint(describeByClass = true) public static GatherNd create(Scope scope, Operand params, Operand indices) { OperationBuilder opBuilder = scope.env().opBuilder("GatherNd", scope.makeOpName("GatherNd")); - opBuilder.addInput(params.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(params.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new GatherNd(opBuilder.build()); } @@ -155,7 +155,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 57754705177..6c594068b02 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 @@ -43,7 +43,7 @@ public final class GetSessionHandle extends RawOp implements Operand { @Endpoint(describeByClass = true) public static GetSessionHandle create(Scope scope, Operand value) { OperationBuilder opBuilder = scope.env().opBuilder("GetSessionHandleV2", scope.makeOpName("GetSessionHandle")); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new GetSessionHandle(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 634b23ed56c..09623f69e75 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 @@ -48,7 +48,7 @@ public final class GetSessionTensor extends RawOp implements Op @Endpoint(describeByClass = true) public static GetSessionTensor create(Scope scope, Operand handle, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("GetSessionTensor", scope.makeOpName("GetSessionTensor")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new GetSessionTensor(opBuilder.build()); @@ -62,7 +62,7 @@ public Output value() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return value; } 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 ff9064f3ac9..d1a9cfae678 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 @@ -52,7 +52,7 @@ public final class GuaranteeConst extends RawOp implements Oper @Endpoint(describeByClass = true) public static GuaranteeConst create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("GuaranteeConst", scope.makeOpName("GuaranteeConst")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new GuaranteeConst(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 2b097647e32..c6596ce9ce3 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 @@ -142,7 +142,7 @@ public Output tableHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) tableHandle; } 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 b7f7a90a90d..163f36b6edf 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Return histogram of values. @@ -69,9 +68,9 @@ public final class HistogramFixedWidth extends RawOp implemen @Endpoint(describeByClass = true) public static HistogramFixedWidth create(Scope scope, Operand values, Operand valueRange, Operand nbins, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("HistogramFixedWidth", scope.makeOpName("HistogramFixedWidth")); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(valueRange.asOutput()); - opBuilder.addInput(nbins.asOutput()); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(valueRange.asOutput(scope)); + opBuilder.addInput(nbins.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new HistogramFixedWidth(opBuilder.build()); @@ -101,7 +100,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 32c3d0d4cab..f72d6c30e1a 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 @@ -45,7 +45,7 @@ public final class Identity extends RawOp implements Operand @Endpoint(describeByClass = true) public static Identity create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("Identity", scope.makeOpName("Identity")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Identity(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4ad5ab1f261..3cb1097e328 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 @@ -63,7 +63,7 @@ public final class IdentityN extends RawOp implements Iterable> { @Endpoint(describeByClass = true) public static IdentityN create(Scope scope, Iterable> input) { OperationBuilder opBuilder = scope.env().opBuilder("IdentityN", scope.makeOpName("IdentityN")); - opBuilder.addInputList(Operands.asOutputs(input)); + opBuilder.addInputList(Operands.asOutputs(scope, input)); opBuilder = scope.applyControlDependencies(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 c301ab66ca4..c5cbe6b86ac 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 @@ public Output tensor() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return tensor; } 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 2ffb3c37290..75b8d08e0de 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 @@ -44,9 +44,9 @@ public final class InitializeTable extends RawOp { @Endpoint(describeByClass = true) public static InitializeTable create(Scope scope, Operand tableHandle, Operand keys, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("InitializeTableV2", scope.makeOpName("InitializeTable")); - opBuilder.addInput(tableHandle.asOutput()); - opBuilder.addInput(keys.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); + opBuilder.addInput(keys.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InitializeTable(opBuilder.build()); } 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 672bf052e49..7497f72375c 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 @@ -86,8 +86,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(tableHandle.asOutput()); - opBuilder.addInput(filename.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); + opBuilder.addInput(filename.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("key_index", keyIndex); opBuilder.setAttr("value_index", valueIndex); 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 5eab2e36d95..326ffc75b00 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 @@ -50,9 +50,9 @@ public final class InplaceAdd extends RawOp implements Operand< @Endpoint(describeByClass = true) public static InplaceAdd create(Scope scope, Operand x, Operand i, Operand v) { OperationBuilder opBuilder = scope.env().opBuilder("InplaceAdd", scope.makeOpName("InplaceAdd")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(i.asOutput()); - opBuilder.addInput(v.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(i.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InplaceAdd(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 7ff3c5ef9bc..aab7ceb3411 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 @@ -50,9 +50,9 @@ public final class InplaceSub extends RawOp implements Operand< @Endpoint(describeByClass = true) public static InplaceSub create(Scope scope, Operand x, Operand i, Operand v) { OperationBuilder opBuilder = scope.env().opBuilder("InplaceSub", scope.makeOpName("InplaceSub")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(i.asOutput()); - opBuilder.addInput(v.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(i.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InplaceSub(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 877c9400f7f..e7697124fe6 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 @@ -50,9 +50,9 @@ public final class InplaceUpdate extends RawOp implements Opera @Endpoint(describeByClass = true) public static InplaceUpdate create(Scope scope, Operand x, Operand i, Operand v) { OperationBuilder opBuilder = scope.env().opBuilder("InplaceUpdate", scope.makeOpName("InplaceUpdate")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(i.asOutput()); - opBuilder.addInput(v.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(i.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InplaceUpdate(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 f4f6bf5fe36..f5d4cc53b57 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 @@ -46,7 +46,7 @@ public final class IsVariableInitialized extends RawOp implements Operand @Endpoint(describeByClass = true) public static IsVariableInitialized create(Scope scope, Operand ref) { OperationBuilder opBuilder = scope.env().opBuilder("IsVariableInitialized", scope.makeOpName("IsVariableInitialized")); - opBuilder.addInput(ref.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IsVariableInitialized(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output isInitialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return isInitialized; } 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 c8b4d2dfa95..d2061ea6553 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Generates values in an interval. @@ -58,9 +57,9 @@ public final class LinSpace extends RawOp implements Operand< @Endpoint(describeByClass = true) public static LinSpace create(Scope scope, Operand start, Operand stop, Operand num) { OperationBuilder opBuilder = scope.env().opBuilder("LinSpace", scope.makeOpName("LinSpace")); - opBuilder.addInput(start.asOutput()); - opBuilder.addInput(stop.asOutput()); - opBuilder.addInput(num.asOutput()); + opBuilder.addInput(start.asOutput(scope)); + opBuilder.addInput(stop.asOutput(scope)); + opBuilder.addInput(num.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LinSpace(opBuilder.build()); } @@ -73,7 +72,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0f31790fe45..cc49d7b0584 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 @@ -49,7 +49,7 @@ public final class LookupTableExport extends R @Endpoint(describeByClass = true) public static LookupTableExport create(Scope scope, Operand tableHandle, DataType Tkeys, DataType Tvalues) { OperationBuilder opBuilder = scope.env().opBuilder("LookupTableExportV2", scope.makeOpName("LookupTableExport")); - opBuilder.addInput(tableHandle.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tkeys", Tkeys); opBuilder.setAttr("Tvalues", Tvalues); 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 e0dbead12d2..a0005ceccf2 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 @@ -53,9 +53,9 @@ public final class LookupTableFind extends RawOp implements Ope @Endpoint(describeByClass = true) public static LookupTableFind create(Scope scope, Operand tableHandle, Operand keys, Operand defaultValue) { OperationBuilder opBuilder = scope.env().opBuilder("LookupTableFindV2", scope.makeOpName("LookupTableFind")); - opBuilder.addInput(tableHandle.asOutput()); - opBuilder.addInput(keys.asOutput()); - opBuilder.addInput(defaultValue.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); + opBuilder.addInput(keys.asOutput(scope)); + opBuilder.addInput(defaultValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LookupTableFind(opBuilder.build()); } @@ -69,7 +69,7 @@ public Output values() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return values; } 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 3df4d4653e0..93f03cec838 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 @@ -47,9 +47,9 @@ public final class LookupTableImport extends RawOp { @Endpoint(describeByClass = true) public static LookupTableImport create(Scope scope, Operand tableHandle, Operand keys, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("LookupTableImportV2", scope.makeOpName("LookupTableImport")); - opBuilder.addInput(tableHandle.asOutput()); - opBuilder.addInput(keys.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); + opBuilder.addInput(keys.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LookupTableImport(opBuilder.build()); } 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 9e355312479..d698ad21a2b 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 @@ -47,9 +47,9 @@ public final class LookupTableInsert extends RawOp { @Endpoint(describeByClass = true) public static LookupTableInsert create(Scope scope, Operand tableHandle, Operand keys, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("LookupTableInsertV2", scope.makeOpName("LookupTableInsert")); - opBuilder.addInput(tableHandle.asOutput()); - opBuilder.addInput(keys.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); + opBuilder.addInput(keys.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LookupTableInsert(opBuilder.build()); } 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 875bbfa486c..2533d50a1dd 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 @@ -45,8 +45,8 @@ public final class LookupTableRemove extends RawOp { @Endpoint(describeByClass = true) public static LookupTableRemove create(Scope scope, Operand tableHandle, Operand keys) { OperationBuilder opBuilder = scope.env().opBuilder("LookupTableRemoveV2", scope.makeOpName("LookupTableRemove")); - opBuilder.addInput(tableHandle.asOutput()); - opBuilder.addInput(keys.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); + opBuilder.addInput(keys.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LookupTableRemove(opBuilder.build()); } 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 441c2208bd3..177cbfa202d 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 @@ -43,7 +43,7 @@ public final class LookupTableSize extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LookupTableSize create(Scope scope, Operand tableHandle) { OperationBuilder opBuilder = scope.env().opBuilder("LookupTableSizeV2", scope.makeOpName("LookupTableSize")); - opBuilder.addInput(tableHandle.asOutput()); + opBuilder.addInput(tableHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LookupTableSize(opBuilder.build()); } @@ -56,7 +56,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 bef80f40840..54e7c9c10e1 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 @@ -46,7 +46,7 @@ public final class LoopCond extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LoopCond create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("LoopCond", scope.makeOpName("LoopCond")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LoopCond(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 dfce8ac4d1f..98d2aa86af8 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 @@ -68,8 +68,8 @@ public final class LowerBound extends RawOp implements Operan @Endpoint(describeByClass = true) public static LowerBound create(Scope scope, Operand sortedInputs, Operand values, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("LowerBound", scope.makeOpName("LowerBound")); - opBuilder.addInput(sortedInputs.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(sortedInputs.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new LowerBound(opBuilder.build()); @@ -99,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a4522bb2993..3267bb3b931 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 @@ -152,7 +152,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 38087a7b46f..1fde7d050de 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 @@ -101,8 +101,8 @@ private Options() { @Endpoint(describeByClass = true) public static MapPeek create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MapPeek", scope.makeOpName("MapPeek")); - opBuilder.addInput(key.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(key.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 20a2b619d1e..50b5a31a9c1 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 @@ -152,7 +152,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 cc09bdf78a2..80e92c3fad3 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 @@ -99,9 +99,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(key.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInputList(Operands.asOutputs(values)); + opBuilder.addInput(key.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 932c1f4f970..31d43156baf 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 @@ -101,8 +101,8 @@ private Options() { @Endpoint(describeByClass = true) public static MapUnstage create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MapUnstage", scope.makeOpName("MapUnstage")); - opBuilder.addInput(key.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(key.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 a915362108e..0c465f9f4c2 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 @@ -98,7 +98,7 @@ private Options() { @Endpoint(describeByClass = true) public static MapUnstageNoKey create(Scope scope, Operand indices, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MapUnstageNoKey", scope.makeOpName("MapUnstageNoKey")); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 e97fc9d17ca..56547e63cc3 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static Max create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Max", scope.makeOpName("Max")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 476253b5601..7712333963d 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 @@ -53,7 +53,7 @@ public final class Merge extends RawOp { @Endpoint(describeByClass = true) public static Merge create(Scope scope, Iterable> inputs) { OperationBuilder opBuilder = scope.env().opBuilder("Merge", scope.makeOpName("Merge")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(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 c19b8eaefdf..4bd92de204a 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static Min create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Min", scope.makeOpName("Min")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 beb9448138c..c7ef1099f86 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 @@ -79,8 +79,8 @@ public final class MirrorPad extends RawOp implements Operand MirrorPad create(Scope scope, Operand input, Operand paddings, String mode) { OperationBuilder opBuilder = scope.env().opBuilder("MirrorPad", scope.makeOpName("MirrorPad")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(paddings.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("mode", mode); return new MirrorPad(opBuilder.build()); @@ -94,7 +94,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ee3a76eab9f..720cfb98545 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 @@ -67,8 +67,8 @@ public final class MirrorPadGrad extends RawOp implements Opera @Endpoint(describeByClass = true) public static MirrorPadGrad create(Scope scope, Operand input, Operand paddings, String mode) { OperationBuilder opBuilder = scope.env().opBuilder("MirrorPadGrad", scope.makeOpName("MirrorPadGrad")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(paddings.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("mode", mode); return new MirrorPadGrad(opBuilder.build()); @@ -82,7 +82,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fc482784607..c43407e2e1b 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 @@ -80,7 +80,7 @@ public final class MlirPassthroughOp extends RawOp implements Iterable> inputs, String mlirModule, List> Toutputs) { OperationBuilder opBuilder = scope.env().opBuilder("MlirPassthroughOp", scope.makeOpName("MlirPassthroughOp")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("mlir_module", mlirModule); DataType[] ToutputsArray = new DataType[Toutputs.size()]; 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 1b5fca24ce2..022ca0627ff 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 @@ -124,8 +124,8 @@ private Options() { @Endpoint(describeByClass = true) public static MutableDenseHashTable create(Scope scope, Operand emptyKey, Operand deletedKey, DataType valueDtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MutableDenseHashTableV2", scope.makeOpName("MutableDenseHashTable")); - opBuilder.addInput(emptyKey.asOutput()); - opBuilder.addInput(deletedKey.asOutput()); + opBuilder.addInput(emptyKey.asOutput(scope)); + opBuilder.addInput(deletedKey.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("value_dtype", valueDtype); if (options != null) { @@ -208,7 +208,7 @@ public Output tableHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) tableHandle; } 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 74d304d82ab..9ef0ae419bd 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 @@ -142,7 +142,7 @@ public Output tableHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) tableHandle; } 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 6ef45423fba..5722231a2ab 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 @@ -160,7 +160,7 @@ public Output tableHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) tableHandle; } 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 41f57d9a755..98a79430da9 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 @@ -112,7 +112,7 @@ public Output resource() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) resource; } 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 e67ea7a228b..e1adfbb5a7e 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 @@ -79,7 +79,7 @@ public final class MutexLock extends RawOp implements Operand { @Endpoint(describeByClass = true) public static MutexLock create(Scope scope, Operand mutex) { OperationBuilder opBuilder = scope.env().opBuilder("MutexLock", scope.makeOpName("MutexLock")); - opBuilder.addInput(mutex.asOutput()); + opBuilder.addInput(mutex.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MutexLock(opBuilder.build()); } @@ -95,7 +95,7 @@ public Output mutexLock() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) mutexLock; } 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 179e8f08e1d..4c0f79434a3 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs a tensor containing the reduction across all input tensors. @@ -61,7 +60,7 @@ public final class NcclAllReduce extends RawOp implements Ope @Endpoint(describeByClass = true) public static NcclAllReduce create(Scope scope, Operand input, String reduction, Long numDevices, String sharedName) { OperationBuilder opBuilder = scope.env().opBuilder("NcclAllReduce", scope.makeOpName("NcclAllReduce")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("reduction", reduction); opBuilder.setAttr("num_devices", numDevices); @@ -76,7 +75,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 70339b3853a..aa02635dd52 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Sends `input` to all devices that are connected to the output. @@ -57,7 +56,7 @@ public final class NcclBroadcast extends RawOp implements Ope @Endpoint(describeByClass = true) public static NcclBroadcast create(Scope scope, Operand input, Shape shape) { OperationBuilder opBuilder = scope.env().opBuilder("NcclBroadcast", scope.makeOpName("NcclBroadcast")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("shape", shape); return new NcclBroadcast(opBuilder.build()); @@ -70,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c6376f1a908..4b052fc268b 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Reduces `input` from `num_devices` using `reduction` to a single device. @@ -56,7 +55,7 @@ public final class NcclReduce extends RawOp implements Operan @Endpoint(describeByClass = true) public static NcclReduce create(Scope scope, Iterable> input, String reduction) { OperationBuilder opBuilder = scope.env().opBuilder("NcclReduce", scope.makeOpName("NcclReduce")); - opBuilder.addInputList(Operands.asOutputs(input)); + opBuilder.addInputList(Operands.asOutputs(scope, input)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("reduction", reduction); return new NcclReduce(opBuilder.build()); @@ -69,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 99f0fa0dd1b..a45c79cb0c8 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 @@ -45,7 +45,7 @@ public final class NextIteration extends RawOp implements Opera @Endpoint(describeByClass = true) public static NextIteration create(Scope scope, Operand data) { OperationBuilder opBuilder = scope.env().opBuilder("NextIteration", scope.makeOpName("NextIteration")); - opBuilder.addInput(data.asOutput()); + opBuilder.addInput(data.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new NextIteration(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9b4d6a4927d..da0d820f8c3 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 @@ -151,10 +151,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(depth.asOutput()); - opBuilder.addInput(onValue.asOutput()); - opBuilder.addInput(offValue.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(depth.asOutput(scope)); + opBuilder.addInput(onValue.asOutput(scope)); + opBuilder.addInput(offValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -181,7 +181,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5d9ce5861c2..71f7365ac05 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 @@ -45,7 +45,7 @@ public final class OnesLike extends RawOp implements Operand @Endpoint(describeByClass = true) public static OnesLike create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("OnesLike", scope.makeOpName("OnesLike")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new OnesLike(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 9ae3fd09642..a408ef2780f 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 @@ -152,7 +152,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 dd7fc0e3f40..0402c281e1e 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 @@ -102,8 +102,8 @@ private Options() { @Endpoint(describeByClass = true) public static OrderedMapPeek create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapPeek", scope.makeOpName("OrderedMapPeek")); - opBuilder.addInput(key.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(key.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 d16383393f4..3579f28aa11 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 @@ -152,7 +152,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 c752a0dd84e..1d5e66552d8 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 @@ -101,9 +101,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(key.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInputList(Operands.asOutputs(values)); + opBuilder.addInput(key.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 c44e344638d..70b2e7c569a 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 @@ -101,8 +101,8 @@ private Options() { @Endpoint(describeByClass = true) public static OrderedMapUnstage create(Scope scope, Operand key, Operand indices, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapUnstage", scope.makeOpName("OrderedMapUnstage")); - opBuilder.addInput(key.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(key.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 d0fa6beea68..57982014c0d 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 @@ -98,7 +98,7 @@ private Options() { @Endpoint(describeByClass = true) public static OrderedMapUnstageNoKey create(Scope scope, Operand indices, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("OrderedMapUnstageNoKey", scope.makeOpName("OrderedMapUnstageNoKey")); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 c21f7aa9a58..d7343a5b940 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 @@ -73,9 +73,9 @@ public final class Pad extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Pad create(Scope scope, Operand input, Operand paddings, Operand constantValues) { OperationBuilder opBuilder = scope.env().opBuilder("PadV2", scope.makeOpName("Pad")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(paddings.asOutput()); - opBuilder.addInput(constantValues.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); + opBuilder.addInput(constantValues.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Pad(opBuilder.build()); } @@ -87,7 +87,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ed9af9dde57..a94dce2409d 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 @@ -65,7 +65,7 @@ public final class ParallelConcat extends RawOp implements Oper @Endpoint(describeByClass = true) public static ParallelConcat create(Scope scope, Iterable> values, Shape shape) { OperationBuilder opBuilder = scope.env().opBuilder("ParallelConcat", scope.makeOpName("ParallelConcat")); - opBuilder.addInputList(Operands.asOutputs(values)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("shape", shape); return new ParallelConcat(opBuilder.build()); @@ -79,7 +79,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3fd6514f285..b0b9c50b30e 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 @@ -102,8 +102,8 @@ public final class ParallelDynamicStitch extends RawOp implemen @Endpoint(describeByClass = true) public static ParallelDynamicStitch create(Scope scope, Iterable> indices, Iterable> data) { OperationBuilder opBuilder = scope.env().opBuilder("ParallelDynamicStitch", scope.makeOpName("ParallelDynamicStitch")); - opBuilder.addInputList(Operands.asOutputs(indices)); - opBuilder.addInputList(Operands.asOutputs(data)); + opBuilder.addInputList(Operands.asOutputs(scope, indices)); + opBuilder.addInputList(Operands.asOutputs(scope, data)); opBuilder = scope.applyControlDependencies(opBuilder); return new ParallelDynamicStitch(opBuilder.build()); } @@ -115,7 +115,7 @@ public Output merged() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return merged; } 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 c9c7727fcf8..f32043f33e8 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 @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e794a0623cb..a4c27af09dd 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 @@ -47,7 +47,7 @@ public final class PlaceholderWithDefault extends RawOp impleme @Endpoint(describeByClass = true) public static PlaceholderWithDefault create(Scope scope, Operand input, Shape shape) { OperationBuilder opBuilder = scope.env().opBuilder("PlaceholderWithDefault", scope.makeOpName("PlaceholderWithDefault")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("shape", shape); return new PlaceholderWithDefault(opBuilder.build()); @@ -61,7 +61,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1f341e11de5..5b0feeee10c 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 @@ -73,7 +73,7 @@ private Options() { @Endpoint(describeByClass = true) public static Print create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("PrintV2", scope.makeOpName("Print")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 b9b7b8b65a4..c2310032f0e 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static Prod create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Prod", scope.makeOpName("Prod")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f4996cd8875..24bfb366f82 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 @@ -52,10 +52,10 @@ public final class QuantizedReshape extends RawOp { @Endpoint(describeByClass = true) public static QuantizedReshape create(Scope scope, Operand tensor, Operand shape, Operand inputMin, Operand inputMax) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedReshape", scope.makeOpName("QuantizedReshape")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new QuantizedReshape(opBuilder.build()); } 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 5134f49c314..b843c8d0347 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Creates a sequence of numbers. @@ -60,9 +59,9 @@ public final class Range extends RawOp implements Operand @Endpoint(describeByClass = true) public static Range create(Scope scope, Operand start, Operand limit, Operand delta) { OperationBuilder opBuilder = scope.env().opBuilder("Range", scope.makeOpName("Range")); - opBuilder.addInput(start.asOutput()); - opBuilder.addInput(limit.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(start.asOutput(scope)); + opBuilder.addInput(limit.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Range(opBuilder.build()); } @@ -75,7 +74,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f7e1959280d..5f7f0d8bb09 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 @@ -56,7 +56,7 @@ public final class Rank extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Rank create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("Rank", scope.makeOpName("Rank")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Rank(opBuilder.build()); } @@ -68,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c535547a925..a8eb8abbcf1 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 @@ -54,7 +54,7 @@ public final class ReadVariableOp extends RawOp implements Oper @Endpoint(describeByClass = true) public static ReadVariableOp create(Scope scope, Operand resource, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("ReadVariableOp", scope.makeOpName("ReadVariableOp")); - opBuilder.addInput(resource.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new ReadVariableOp(opBuilder.build()); @@ -67,7 +67,7 @@ public Output value() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return value; } 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 5feb610b6fd..e1ac23f5aba 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 @@ -106,7 +106,7 @@ public Output tensor() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return tensor; } 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 195a7bbbce8..356ab230b44 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the "logical and" of elements across dimensions of a tensor. @@ -72,8 +71,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceAll create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("All", scope.makeOpName("ReduceAll")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9dde0ff6238..97ca39bec67 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the "logical or" of elements across dimensions of a tensor. @@ -72,8 +71,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceAny create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Any", scope.makeOpName("ReduceAny")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1df06cb441d..f39b1d2d30f 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceMax create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Max", scope.makeOpName("ReduceMax")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 2ebdaa01247..ec838d15a3f 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceMin create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Min", scope.makeOpName("ReduceMin")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 37fcf044469..1595f26edbc 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceProd create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Prod", scope.makeOpName("ReduceProd")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 82bf9d35558..55bd4428494 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceSum create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Sum", scope.makeOpName("ReduceSum")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 bec8abb5f80..7bbe531842c 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 @@ -79,7 +79,7 @@ private Options() { @Endpoint(describeByClass = true) public static RefEnter create(Scope scope, Operand data, String frameName, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RefEnter", scope.makeOpName("RefEnter")); - opBuilder.addInput(data.asOutput()); + opBuilder.addInput(data.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("frame_name", frameName); if (options != null) { @@ -117,7 +117,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 80399854da4..d4a0d014fb1 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 @@ -46,7 +46,7 @@ public final class RefExit extends RawOp implements Operand @Endpoint(describeByClass = true) public static RefExit create(Scope scope, Operand data) { OperationBuilder opBuilder = scope.env().opBuilder("RefExit", scope.makeOpName("RefExit")); - opBuilder.addInput(data.asOutput()); + opBuilder.addInput(data.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RefExit(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e3840bfa886..6e281e94100 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 @@ -44,7 +44,7 @@ public final class RefIdentity extends RawOp implements Operand @Endpoint(describeByClass = true) public static RefIdentity create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("RefIdentity", scope.makeOpName("RefIdentity")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RefIdentity(opBuilder.build()); } @@ -56,7 +56,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 eab96521ea6..ee8caf89364 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 @@ -52,7 +52,7 @@ public final class RefMerge extends RawOp { @Endpoint(describeByClass = true) public static RefMerge create(Scope scope, Iterable> inputs) { OperationBuilder opBuilder = scope.env().opBuilder("RefMerge", scope.makeOpName("RefMerge")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(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 bb1423440fd..26d45692767 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 @@ -45,7 +45,7 @@ public final class RefNextIteration extends RawOp implements Op @Endpoint(describeByClass = true) public static RefNextIteration create(Scope scope, Operand data) { OperationBuilder opBuilder = scope.env().opBuilder("RefNextIteration", scope.makeOpName("RefNextIteration")); - opBuilder.addInput(data.asOutput()); + opBuilder.addInput(data.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RefNextIteration(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 23864ed4820..90ddf899dca 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 @@ -48,8 +48,8 @@ public final class RefSelect extends RawOp implements Operand RefSelect create(Scope scope, Operand index, Iterable> inputs) { OperationBuilder opBuilder = scope.env().opBuilder("RefSelect", scope.makeOpName("RefSelect")); - opBuilder.addInput(index.asOutput()); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInput(index.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); return new RefSelect(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b45250bb083..4b1218bdc53 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 @@ -52,8 +52,8 @@ public final class RefSwitch extends RawOp { @Endpoint(describeByClass = true) public static RefSwitch create(Scope scope, Operand data, Operand pred) { OperationBuilder opBuilder = scope.env().opBuilder("RefSwitch", scope.makeOpName("RefSwitch")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(pred.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(pred.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RefSwitch(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteFusedGraphExecute.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteFusedGraphExecute.java index 0242749bda6..b474c5b1f4e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteFusedGraphExecute.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/RemoteFusedGraphExecute.java @@ -59,7 +59,7 @@ public final class RemoteFusedGraphExecute extends RawOp implements Iterable> inputs, List> Toutputs, String serializedRemoteFusedGraphExecuteInfo) { OperationBuilder opBuilder = scope.env().opBuilder("RemoteFusedGraphExecute", scope.makeOpName("RemoteFusedGraphExecute")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] ToutputsArray = new DataType[Toutputs.size()]; for (int i = 0; i < ToutputsArray.length; ++i) { 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 eaeaa5ded4e..ccfa83a761a 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 @@ -107,8 +107,8 @@ public final class Reshape extends RawOp implements Operand @Endpoint(describeByClass = true) public static Reshape create(Scope scope, Operand tensor, Operand shape) { OperationBuilder opBuilder = scope.env().opBuilder("Reshape", scope.makeOpName("Reshape")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Reshape(opBuilder.build()); } @@ -120,7 +120,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 cce86ab05ce..21252c85ac4 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Increments variable pointed to by 'resource' until it reaches 'limit'. @@ -50,7 +49,7 @@ public final class ResourceCountUpTo extends RawOp implements @Endpoint(describeByClass = true) public static ResourceCountUpTo create(Scope scope, Operand resource, Long limit, DataType T) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceCountUpTo", scope.makeOpName("ResourceCountUpTo")); - opBuilder.addInput(resource.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("limit", limit); opBuilder.setAttr("T", T); @@ -66,7 +65,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fd8ccc35cfa..eff124ec0a6 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 @@ -92,8 +92,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceGather create(Scope scope, Operand resource, Operand indices, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceGather", scope.makeOpName("ResourceGather")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -130,7 +130,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f2c501ec524..5b192243f66 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 @@ -47,8 +47,8 @@ public final class ResourceGatherNd extends RawOp implements Op @Endpoint(describeByClass = true) public static ResourceGatherNd create(Scope scope, Operand resource, Operand indices, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceGatherNd", scope.makeOpName("ResourceGatherNd")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new ResourceGatherNd(opBuilder.build()); @@ -61,7 +61,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 630a3716695..bd595ce39c9 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 @@ -65,9 +65,9 @@ public final class ResourceScatterAdd extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterAdd create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterAdd", scope.makeOpName("ResourceScatterAdd")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterAdd(opBuilder.build()); } 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 dba2e37ec12..616a3bcac77 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 @@ -65,9 +65,9 @@ public final class ResourceScatterDiv extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterDiv create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterDiv", scope.makeOpName("ResourceScatterDiv")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterDiv(opBuilder.build()); } 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 6068660a905..50c2140dde2 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 @@ -65,9 +65,9 @@ public final class ResourceScatterMax extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterMax create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMax", scope.makeOpName("ResourceScatterMax")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterMax(opBuilder.build()); } 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 3e0ffeae23a..8195d72d646 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 @@ -65,9 +65,9 @@ public final class ResourceScatterMin extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterMin create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMin", scope.makeOpName("ResourceScatterMin")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterMin(opBuilder.build()); } 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 1a8feb21838..077955dd6bc 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 @@ -65,9 +65,9 @@ public final class ResourceScatterMul extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterMul create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterMul", scope.makeOpName("ResourceScatterMul")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterMul(opBuilder.build()); } 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 a230b7d58bf..571b7a94bb9 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 @@ -99,9 +99,9 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceScatterNdAdd create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdAdd", scope.makeOpName("ResourceScatterNdAdd")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 9912c63f129..6462a1049e8 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 @@ -99,9 +99,9 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceScatterNdSub create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdSub", scope.makeOpName("ResourceScatterNdSub")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 625010c6aac..3938402a8a9 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 @@ -101,9 +101,9 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceScatterNdUpdate create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterNdUpdate", scope.makeOpName("ResourceScatterNdUpdate")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 727dc01ab32..c95d8015e40 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 @@ -65,9 +65,9 @@ public final class ResourceScatterSub extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterSub create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterSub", scope.makeOpName("ResourceScatterSub")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterSub(opBuilder.build()); } 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 c75107a4bb7..80613d7850f 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 @@ -56,9 +56,9 @@ public final class ResourceScatterUpdate extends RawOp { @Endpoint(describeByClass = true) public static ResourceScatterUpdate create(Scope scope, Operand resource, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceScatterUpdate", scope.makeOpName("ResourceScatterUpdate")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceScatterUpdate(opBuilder.build()); } 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 10c93185348..8987ccb0afa 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 @@ -110,11 +110,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(begin.asOutput()); - opBuilder.addInput(end.asOutput()); - opBuilder.addInput(strides.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(begin.asOutput(scope)); + opBuilder.addInput(end.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e64e165182f..6a4ea9c4731 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 @@ -95,8 +95,8 @@ public final class Reverse extends RawOp implements Operand @Endpoint(describeByClass = true) public static Reverse create(Scope scope, Operand tensor, Operand axis) { OperationBuilder opBuilder = scope.env().opBuilder("ReverseV2", scope.makeOpName("Reverse")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Reverse(opBuilder.build()); } @@ -109,7 +109,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a78de7f9a4c..b74c988479a 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 @@ -122,8 +122,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReverseSequence create(Scope scope, Operand input, Operand seqLengths, Long seqDim, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ReverseSequence", scope.makeOpName("ReverseSequence")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(seqLengths.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(seqLengths.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("seq_dim", seqDim); if (options != null) { @@ -151,7 +151,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8f6559ca09f..26fe13130e8 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 @@ -75,9 +75,9 @@ public final class Roll extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Roll create(Scope scope, Operand input, Operand shift, Operand axis) { OperationBuilder opBuilder = scope.env().opBuilder("Roll", scope.makeOpName("Roll")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(shift.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(shift.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Roll(opBuilder.build()); } @@ -92,7 +92,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rpc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rpc.java index 2d753afec51..9e5261a29fe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rpc.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Rpc.java @@ -138,9 +138,9 @@ private Options() { @Endpoint(describeByClass = true) public static Rpc create(Scope scope, Operand address, Operand method, Operand request, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Rpc", scope.makeOpName("Rpc")); - opBuilder.addInput(address.asOutput()); - opBuilder.addInput(method.asOutput()); - opBuilder.addInput(request.asOutput()); + opBuilder.addInput(address.asOutput(scope)); + opBuilder.addInput(method.asOutput(scope)); + opBuilder.addInput(request.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -192,7 +192,7 @@ public Output response() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return response; } 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 5d18510e225..cbff38eccdf 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 @@ -92,9 +92,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterAdd create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterAdd", scope.makeOpName("ScatterAdd")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -123,7 +123,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 800dada981d..b5e55e43461 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 @@ -88,9 +88,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterDiv create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterDiv", scope.makeOpName("ScatterDiv")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -119,7 +119,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 99e97ee0d23..be6e2af9a31 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Reduces sparse updates into a variable reference using the `max` operation. @@ -92,9 +91,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterMax create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterMax", scope.makeOpName("ScatterMax")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -123,7 +122,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 3b96560077a..4c8ffa1cd07 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Reduces sparse updates into a variable reference using the `min` operation. @@ -92,9 +91,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterMin create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterMin", scope.makeOpName("ScatterMin")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -123,7 +122,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 38305790fb5..c27d4718bcd 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 @@ -88,9 +88,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterMul create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterMul", scope.makeOpName("ScatterMul")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -119,7 +119,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 c59c526ca86..24a23bf8883 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 @@ -125,9 +125,9 @@ public final class ScatterNd extends RawOp implements Operand ScatterNd create(Scope scope, Operand indices, Operand updates, Operand shape) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterNd", scope.makeOpName("ScatterNd")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ScatterNd(opBuilder.build()); } @@ -141,7 +141,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 11b1ddc0ef8..ba73d6d3318 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 @@ -102,9 +102,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterNdAdd create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdAdd", scope.makeOpName("ScatterNdAdd")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -134,7 +134,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 400f7e8b11c..91967219b75 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 @@ -84,9 +84,9 @@ public final class ScatterNdNonAliasingAdd extends RawOp implem @Endpoint(describeByClass = true) public static ScatterNdNonAliasingAdd create(Scope scope, Operand input, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdNonAliasingAdd", scope.makeOpName("ScatterNdNonAliasingAdd")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ScatterNdNonAliasingAdd(opBuilder.build()); } @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 bbeafdaa08b..fa11f76c173 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 @@ -104,9 +104,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterNdSub create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdSub", scope.makeOpName("ScatterNdSub")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -136,7 +136,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 c715f6c1c92..7ca30617491 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 @@ -106,9 +106,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterNdUpdate create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterNdUpdate", scope.makeOpName("ScatterNdUpdate")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -138,7 +138,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 5bdb1e39081..7c6ddabdc2e 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 @@ -91,9 +91,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterSub create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterSub", scope.makeOpName("ScatterSub")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -122,7 +122,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 fc548962aa7..2f51aeab5fa 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 @@ -95,9 +95,9 @@ private Options() { @Endpoint(describeByClass = true) public static ScatterUpdate create(Scope scope, Operand ref, Operand indices, Operand updates, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScatterUpdate", scope.makeOpName("ScatterUpdate")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -126,7 +126,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 fff55e1cf71..5dced3f7e92 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 @@ -46,9 +46,9 @@ public final class Select extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Select create(Scope scope, Operand condition, Operand t, Operand e) { OperationBuilder opBuilder = scope.env().opBuilder("SelectV2", scope.makeOpName("Select")); - opBuilder.addInput(condition.asOutput()); - opBuilder.addInput(t.asOutput()); - opBuilder.addInput(e.asOutput()); + opBuilder.addInput(condition.asOutput(scope)); + opBuilder.addInput(t.asOutput(scope)); + opBuilder.addInput(e.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Select(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 04f1f5813b3..4887e672356 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 @@ -68,7 +68,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("tensor_name", tensorName); opBuilder.setAttr("send_device", sendDevice); 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 1b13994eebc..00a5e555f41 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 @@ -71,8 +71,8 @@ public final class SetDiff1d extends RawOp { @Endpoint(describeByClass = true) public static SetDiff1d create(Scope scope, Operand x, Operand y, DataType outIdx) { OperationBuilder opBuilder = scope.env().opBuilder("ListDiff", scope.makeOpName("SetDiff1d")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_idx", outIdx); return new SetDiff1d(opBuilder.build()); 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 bd666afe4b2..b82a4272561 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 @@ -74,9 +74,9 @@ private Options() { @Endpoint(describeByClass = true) public static SetSize create(Scope scope, Operand setIndices, Operand setValues, Operand setShape, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SetSize", scope.makeOpName("SetSize")); - opBuilder.addInput(setIndices.asOutput()); - opBuilder.addInput(setValues.asOutput()); - opBuilder.addInput(setShape.asOutput()); + opBuilder.addInput(setIndices.asOutput(scope)); + opBuilder.addInput(setValues.asOutput(scope)); + opBuilder.addInput(setShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -105,7 +105,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 aef7aec2816..921887e774b 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 @@ -58,7 +58,7 @@ public final class Shape extends RawOp implements Operand @Endpoint(describeByClass = true) public static Shape create(Scope scope, Operand input, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("Shape", scope.makeOpName("Shape")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new Shape(opBuilder.build()); @@ -83,7 +83,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 307e86b38a2..3e137bf5f63 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 @@ -55,7 +55,7 @@ public final class ShapeN extends RawOp implements Iterable ShapeN create(Scope scope, Iterable> input, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("ShapeN", scope.makeOpName("ShapeN")); - opBuilder.addInputList(Operands.asOutputs(input)); + opBuilder.addInputList(Operands.asOutputs(scope, input)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new ShapeN(opBuilder.build()); 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 d79f317a591..1eb98f4ad0a 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 @@ -59,7 +59,7 @@ public final class Size extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Size create(Scope scope, Operand input, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("Size", scope.makeOpName("Size")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new Size(opBuilder.build()); @@ -84,7 +84,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e141b0a2243..ce33b0fae3a 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 @@ -59,9 +59,9 @@ public final class Slice extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Slice create(Scope scope, Operand input, Operand begin, Operand size) { OperationBuilder opBuilder = scope.env().opBuilder("Slice", scope.makeOpName("Slice")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(begin.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(begin.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Slice(opBuilder.build()); } @@ -73,7 +73,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8599dac37e6..efac77a720b 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 @@ -45,7 +45,7 @@ public final class Snapshot extends RawOp implements Operand @Endpoint(describeByClass = true) public static Snapshot create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("Snapshot", scope.makeOpName("Snapshot")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Snapshot(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 80e9a72e37f..f3678adee79 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 @@ -149,9 +149,9 @@ public final class SpaceToBatchNd extends RawOp implements Oper @Endpoint(describeByClass = true) public static SpaceToBatchNd create(Scope scope, Operand input, Operand blockShape, Operand paddings) { OperationBuilder opBuilder = scope.env().opBuilder("SpaceToBatchND", scope.makeOpName("SpaceToBatchNd")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(blockShape.asOutput()); - opBuilder.addInput(paddings.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(blockShape.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SpaceToBatchNd(opBuilder.build()); } @@ -163,7 +163,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f810c353427..5607f2019cd 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 @@ -53,8 +53,8 @@ public final class Split extends RawOp implements Iterable Split create(Scope scope, Operand axis, Operand value, Long numSplit) { OperationBuilder opBuilder = scope.env().opBuilder("Split", scope.makeOpName("Split")); - opBuilder.addInput(axis.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(axis.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_split", numSplit); return new Split(opBuilder.build()); 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 49646eecfc2..e7d7c5d4ff7 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 @@ -56,9 +56,9 @@ public final class SplitV extends RawOp implements Iterable SplitV create(Scope scope, Operand value, Operand sizeSplits, Operand axis, Long numSplit) { OperationBuilder opBuilder = scope.env().opBuilder("SplitV", scope.makeOpName("SplitV")); - opBuilder.addInput(value.asOutput()); - opBuilder.addInput(sizeSplits.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(value.asOutput(scope)); + opBuilder.addInput(sizeSplits.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_split", numSplit); return new SplitV(opBuilder.build()); 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 5bc2ba50645..dec4d298172 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 @@ -85,7 +85,7 @@ private Options() { @Endpoint(describeByClass = true) public static Squeeze create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Squeeze", scope.makeOpName("Squeeze")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -119,7 +119,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 6e98ac9ab4b..49e183e7925 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 @@ -85,7 +85,7 @@ private Options() { @Endpoint(describeByClass = true) public static Stack create(Scope scope, Iterable> values, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Pack", scope.makeOpName("Stack")); - opBuilder.addInputList(Operands.asOutputs(values)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -113,7 +113,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c741a3ae391..e9c6b34e880 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 @@ -96,7 +96,7 @@ private Options() { @Endpoint(describeByClass = true) public static Stage create(Scope scope, Iterable> values, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Stage", scope.makeOpName("Stage")); - opBuilder.addInputList(Operands.asOutputs(values)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 0d00e7f1db9..3eb8676e7e6 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 @@ -100,7 +100,7 @@ private Options() { @Endpoint(describeByClass = true) public static StagePeek create(Scope scope, Operand index, List> dtypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StagePeek", scope.makeOpName("StagePeek")); - opBuilder.addInput(index.asOutput()); + opBuilder.addInput(index.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 a6069a51690..8129027982a 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 @@ -152,7 +152,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 f884e7b98f7..8572768171e 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 @@ -70,7 +70,7 @@ public final class StopGradient extends RawOp implements Operan @Endpoint(describeByClass = true) public static StopGradient create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("StopGradient", scope.makeOpName("StopGradient")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StopGradient(opBuilder.build()); } @@ -82,7 +82,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e19467389c2..140f42ac313 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 @@ -216,10 +216,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(begin.asOutput()); - opBuilder.addInput(end.asOutput()); - opBuilder.addInput(strides.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(begin.asOutput(scope)); + opBuilder.addInput(end.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -300,7 +300,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e89e6657ad7..49750f21d9c 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 @@ -113,11 +113,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(ref.asOutput()); - opBuilder.addInput(begin.asOutput()); - opBuilder.addInput(end.asOutput()); - opBuilder.addInput(strides.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(ref.asOutput(scope)); + opBuilder.addInput(begin.asOutput(scope)); + opBuilder.addInput(end.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -183,7 +183,7 @@ public Output outputRef() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputRef; } 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 f475104bc81..4cd96b37efc 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 @@ -115,11 +115,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(begin.asOutput()); - opBuilder.addInput(end.asOutput()); - opBuilder.addInput(strides.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(begin.asOutput(scope)); + opBuilder.addInput(end.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -185,7 +185,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4fe6e275bad..1c1568d55f7 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static Sum create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Sum", scope.makeOpName("Sum")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b0abd4c0d55..04e500366b9 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 @@ -52,8 +52,8 @@ public final class SwitchCond extends RawOp { @Endpoint(describeByClass = true) public static SwitchCond create(Scope scope, Operand data, Operand pred) { OperationBuilder opBuilder = scope.env().opBuilder("Switch", scope.makeOpName("SwitchCond")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(pred.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(pred.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SwitchCond(opBuilder.build()); } 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 dedd9f6d588..20490d1a014 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 @@ -113,7 +113,7 @@ public Output ref() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return ref; } 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 24b9a610f1f..a8a44fe49b4 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 @@ -118,7 +118,7 @@ private Options() { @Endpoint(describeByClass = true) public static TensorArray create(Scope scope, Operand size, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayV3", scope.makeOpName("TensorArray")); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { 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 fe58e12dd65..c90d5bb4f21 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 @@ -44,7 +44,7 @@ public final class TensorArrayClose extends RawOp { @Endpoint(describeByClass = true) public static TensorArrayClose create(Scope scope, Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayCloseV3", scope.makeOpName("TensorArrayClose")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 1c39d8922bb..ae637665e2c 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 @@ -85,8 +85,8 @@ private Options() { @Endpoint(describeByClass = true) public static TensorArrayConcat create(Scope scope, Operand handle, Operand flowIn, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayConcatV3", scope.makeOpName("TensorArrayConcat")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { 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 cd697f550d3..53185496cd9 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 @@ -76,9 +76,9 @@ private Options() { @Endpoint(describeByClass = true) public static TensorArrayGather create(Scope scope, Operand handle, Operand indices, Operand flowIn, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayGatherV3", scope.makeOpName("TensorArrayGather")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -109,7 +109,7 @@ public Output value() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return value; } 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 a4cf654bdcc..f701ce717e3 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 @@ -83,8 +83,8 @@ public final class TensorArrayGrad extends RawOp { @Endpoint(describeByClass = true) public static TensorArrayGrad create(Scope scope, Operand handle, Operand flowIn, String source) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayGradV3", scope.makeOpName("TensorArrayGrad")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("source", source); return new TensorArrayGrad(opBuilder.build()); 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 7ffbc95fac5..17c53872bee 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 @@ -55,9 +55,9 @@ public final class TensorArrayGradWithShape extends RawOp { @Endpoint(describeByClass = true) public static TensorArrayGradWithShape create(Scope scope, Operand handle, Operand flowIn, Operand shapeToPrepend, String source) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayGradWithShape", scope.makeOpName("TensorArrayGradWithShape")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(flowIn.asOutput()); - opBuilder.addInput(shapeToPrepend.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); + opBuilder.addInput(shapeToPrepend.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("source", source); return new TensorArrayGradWithShape(opBuilder.build()); 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 05643c5d774..bea95b5d862 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 @@ -69,8 +69,8 @@ private Options() { @Endpoint(describeByClass = true) public static TensorArrayPack create(Scope scope, Operand handle, Operand flowIn, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayPack", scope.makeOpName("TensorArrayPack")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -97,7 +97,7 @@ public Output value() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return value; } 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 22065261a6a..332093b8d88 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 @@ -51,9 +51,9 @@ public final class TensorArrayRead extends RawOp implements Ope @Endpoint(describeByClass = true) public static TensorArrayRead create(Scope scope, Operand handle, Operand index, Operand flowIn, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayReadV3", scope.makeOpName("TensorArrayRead")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(index.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new TensorArrayRead(opBuilder.build()); @@ -67,7 +67,7 @@ public Output value() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return value; } 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 f31f6b1428a..56633a97ddb 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 @@ -50,10 +50,10 @@ public final class TensorArrayScatter extends RawOp implements Operand @Endpoint(describeByClass = true) public static TensorArrayScatter create(Scope scope, Operand handle, Operand indices, Operand value, Operand flowIn) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayScatterV3", scope.makeOpName("TensorArrayScatter")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(value.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorArrayScatter(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output flowOut() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return flowOut; } 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 89642346996..4cc2cd541af 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 @@ -45,8 +45,8 @@ public final class TensorArraySize extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorArraySize create(Scope scope, Operand handle, Operand flowIn) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArraySizeV3", scope.makeOpName("TensorArraySize")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorArraySize(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 ca755929b77..fe3332e4e42 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 @@ -71,10 +71,10 @@ public final class TensorArraySplit extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorArraySplit create(Scope scope, Operand handle, Operand value, Operand lengths, Operand flowIn) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArraySplitV3", scope.makeOpName("TensorArraySplit")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(value.asOutput()); - opBuilder.addInput(lengths.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); + opBuilder.addInput(lengths.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorArraySplit(opBuilder.build()); } @@ -87,7 +87,7 @@ public Output flowOut() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return flowOut; } 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 7d9e2b68ae1..7609029568d 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 @@ -46,9 +46,9 @@ public final class TensorArrayUnpack extends RawOp implements Operand @Endpoint(describeByClass = true) public static TensorArrayUnpack create(Scope scope, Operand handle, Operand value, Operand flowIn) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayUnpack", scope.makeOpName("TensorArrayUnpack")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(value.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorArrayUnpack(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output flowOut() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return flowOut; } 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 8f5c56e524a..c1657fa7766 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 @@ -48,10 +48,10 @@ public final class TensorArrayWrite extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorArrayWrite create(Scope scope, Operand handle, Operand index, Operand value, Operand flowIn) { OperationBuilder opBuilder = scope.env().opBuilder("TensorArrayWriteV3", scope.makeOpName("TensorArrayWrite")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(index.asOutput()); - opBuilder.addInput(value.asOutput()); - opBuilder.addInput(flowIn.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); + opBuilder.addInput(flowIn.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorArrayWrite(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output flowOut() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return flowOut; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestCreateTreeVariable.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestCreateTreeVariable.java index ec0df709465..60ecc0a167f 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestCreateTreeVariable.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestCreateTreeVariable.java @@ -42,8 +42,8 @@ public final class TensorForestCreateTreeVariable extends RawOp { @Endpoint(describeByClass = true) public static TensorForestCreateTreeVariable create(Scope scope, Operand treeHandle, Operand treeConfig) { OperationBuilder opBuilder = scope.env().opBuilder("TensorForestCreateTreeVariable", scope.makeOpName("TensorForestCreateTreeVariable")); - opBuilder.addInput(treeHandle.asOutput()); - opBuilder.addInput(treeConfig.asOutput()); + opBuilder.addInput(treeHandle.asOutput(scope)); + opBuilder.addInput(treeConfig.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorForestCreateTreeVariable(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeDeserialize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeDeserialize.java index a7585be7577..333c82856fc 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeDeserialize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeDeserialize.java @@ -42,8 +42,8 @@ public final class TensorForestTreeDeserialize extends RawOp { @Endpoint(describeByClass = true) public static TensorForestTreeDeserialize create(Scope scope, Operand treeHandle, Operand treeConfig) { OperationBuilder opBuilder = scope.env().opBuilder("TensorForestTreeDeserialize", scope.makeOpName("TensorForestTreeDeserialize")); - opBuilder.addInput(treeHandle.asOutput()); - opBuilder.addInput(treeConfig.asOutput()); + opBuilder.addInput(treeHandle.asOutput(scope)); + opBuilder.addInput(treeConfig.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorForestTreeDeserialize(opBuilder.build()); } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeIsInitializedOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeIsInitializedOp.java index d0c39ab0de9..bb9198e81da 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeIsInitializedOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeIsInitializedOp.java @@ -42,7 +42,7 @@ public final class TensorForestTreeIsInitializedOp extends RawOp implements Oper @Endpoint(describeByClass = true) public static TensorForestTreeIsInitializedOp create(Scope scope, Operand treeHandle) { OperationBuilder opBuilder = scope.env().opBuilder("TensorForestTreeIsInitializedOp", scope.makeOpName("TensorForestTreeIsInitializedOp")); - opBuilder.addInput(treeHandle.asOutput()); + opBuilder.addInput(treeHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorForestTreeIsInitializedOp(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output isInitialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return isInitialized; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreePredict.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreePredict.java index 3b8dc79c2d9..9bf84d12204 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreePredict.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreePredict.java @@ -44,8 +44,8 @@ public final class TensorForestTreePredict extends RawOp implements Operand treeHandle, Operand denseFeatures, Long logitsDimension) { OperationBuilder opBuilder = scope.env().opBuilder("TensorForestTreePredict", scope.makeOpName("TensorForestTreePredict")); - opBuilder.addInput(treeHandle.asOutput()); - opBuilder.addInput(denseFeatures.asOutput()); + opBuilder.addInput(treeHandle.asOutput(scope)); + opBuilder.addInput(denseFeatures.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); return new TensorForestTreePredict(opBuilder.build()); @@ -59,7 +59,7 @@ public Output logits() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return logits; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeResourceHandleOp.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeResourceHandleOp.java index f56d34d8df0..933ff61790b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeResourceHandleOp.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeResourceHandleOp.java @@ -106,7 +106,7 @@ public Output resource() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) resource; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSerialize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSerialize.java index 07838bb9028..e5fc809035b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSerialize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSerialize.java @@ -42,7 +42,7 @@ public final class TensorForestTreeSerialize extends RawOp implements Operand treeHandle) { OperationBuilder opBuilder = scope.env().opBuilder("TensorForestTreeSerialize", scope.makeOpName("TensorForestTreeSerialize")); - opBuilder.addInput(treeHandle.asOutput()); + opBuilder.addInput(treeHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorForestTreeSerialize(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output treeConfig() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return treeConfig; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSize.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSize.java index 03eddda317e..fad4fa80df1 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSize.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TensorForestTreeSize.java @@ -42,7 +42,7 @@ public final class TensorForestTreeSize extends RawOp implements Operand @Endpoint(describeByClass = true) public static TensorForestTreeSize create(Scope scope, Operand treeHandle) { OperationBuilder opBuilder = scope.env().opBuilder("TensorForestTreeSize", scope.makeOpName("TensorForestTreeSize")); - opBuilder.addInput(treeHandle.asOutput()); + opBuilder.addInput(treeHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorForestTreeSize(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output treeSize() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return treeSize; } 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 249e6a07b1d..c6656f14939 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 @@ -64,9 +64,9 @@ public final class TensorListConcat extends RawOp { @Endpoint(describeByClass = true) public static TensorListConcat create(Scope scope, Operand inputHandle, Operand elementShape, Operand leadingDims, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListConcatV2", scope.makeOpName("TensorListConcat")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(elementShape.asOutput()); - opBuilder.addInput(leadingDims.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); + opBuilder.addInput(leadingDims.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new TensorListConcat(opBuilder.build()); 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 3d685a10b34..2f8982530dc 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 @@ -45,8 +45,8 @@ public final class TensorListConcatLists extends RawOp implements Operand @Endpoint(describeByClass = true) public static TensorListConcatLists create(Scope scope, Operand inputA, Operand inputB, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListConcatLists", scope.makeOpName("TensorListConcatLists")); - opBuilder.addInput(inputA.asOutput()); - opBuilder.addInput(inputB.asOutput()); + opBuilder.addInput(inputA.asOutput(scope)); + opBuilder.addInput(inputB.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new TensorListConcatLists(opBuilder.build()); @@ -60,7 +60,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 4115dfebda5..f54f8f3bd3c 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * The shape of the elements of the given list, as a tensor. @@ -51,7 +50,7 @@ public final class TensorListElementShape extends RawOp imple @Endpoint(describeByClass = true) public static TensorListElementShape create(Scope scope, Operand inputHandle, DataType shapeType) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListElementShape", scope.makeOpName("TensorListElementShape")); - opBuilder.addInput(inputHandle.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("shape_type", shapeType); return new TensorListElementShape(opBuilder.build()); @@ -64,7 +63,7 @@ public Output elementShape() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return elementShape; } 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 8569b6b936c..4d5a77d3e36 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 @@ -50,8 +50,8 @@ public final class TensorListFromTensor extends RawOp implements Operand @Endpoint(describeByClass = true) public static TensorListFromTensor create(Scope scope, Operand tensor, Operand elementShape) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListFromTensor", scope.makeOpName("TensorListFromTensor")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(elementShape.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListFromTensor(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 b1c4aa520fb..e1bd049ad99 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 @@ -57,9 +57,9 @@ public final class TensorListGather extends RawOp implements Op @Endpoint(describeByClass = true) public static TensorListGather create(Scope scope, Operand inputHandle, Operand indices, Operand elementShape, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListGather", scope.makeOpName("TensorListGather")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(elementShape.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new TensorListGather(opBuilder.build()); @@ -72,7 +72,7 @@ public Output values() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return values; } 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 1ee5e084768..265e0838da4 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 @@ -48,9 +48,9 @@ public final class TensorListGetItem extends RawOp implements O @Endpoint(describeByClass = true) public static TensorListGetItem create(Scope scope, Operand inputHandle, Operand index, Operand elementShape, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListGetItem", scope.makeOpName("TensorListGetItem")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(index.asOutput()); - opBuilder.addInput(elementShape.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new TensorListGetItem(opBuilder.build()); @@ -63,7 +63,7 @@ public Output item() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return item; } 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 c901d022f64..9d1ff503777 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 @@ -46,7 +46,7 @@ public final class TensorListLength extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListLength create(Scope scope, Operand inputHandle) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListLength", scope.makeOpName("TensorListLength")); - opBuilder.addInput(inputHandle.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListLength(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output length() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return length; } 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 f4fb817b2fc..c3844fb4560 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 @@ -56,8 +56,8 @@ public final class TensorListPopBack extends RawOp { @Endpoint(describeByClass = true) public static TensorListPopBack create(Scope scope, Operand inputHandle, Operand elementShape, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListPopBack", scope.makeOpName("TensorListPopBack")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(elementShape.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new TensorListPopBack(opBuilder.build()); 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 216a5d44c4b..e0b2d2cbdd3 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 @@ -50,8 +50,8 @@ public final class TensorListPushBack extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListPushBack create(Scope scope, Operand inputHandle, Operand tensor) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListPushBack", scope.makeOpName("TensorListPushBack")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListPushBack(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 065e7d0b6ed..4b401f22d64 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 @@ -43,8 +43,8 @@ public final class TensorListPushBackBatch extends RawOp implements Operand TensorListPushBackBatch create(Scope scope, Operand inputHandles, Operand tensor) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListPushBackBatch", scope.makeOpName("TensorListPushBackBatch")); - opBuilder.addInput(inputHandles.asOutput()); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(inputHandles.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListPushBackBatch(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output outputHandles() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandles; } 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 0c3294795c1..1b16a2bd139 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 @@ -53,8 +53,8 @@ public final class TensorListReserve extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListReserve create(Scope scope, Operand elementShape, Operand numElements, DataType elementDtype) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListReserve", scope.makeOpName("TensorListReserve")); - opBuilder.addInput(elementShape.asOutput()); - opBuilder.addInput(numElements.asOutput()); + opBuilder.addInput(elementShape.asOutput(scope)); + opBuilder.addInput(numElements.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); return new TensorListReserve(opBuilder.build()); @@ -68,7 +68,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 fb0380aa5a7..5722d10c881 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 @@ -50,8 +50,8 @@ public final class TensorListResize extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListResize create(Scope scope, Operand inputHandle, Operand size) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListResize", scope.makeOpName("TensorListResize")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListResize(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 12fd2667321..94a5ee7cbd1 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 @@ -60,10 +60,10 @@ public final class TensorListScatter extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListScatter create(Scope scope, Operand tensor, Operand indices, Operand elementShape, Operand numElements) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListScatterV2", scope.makeOpName("TensorListScatter")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(elementShape.asOutput()); - opBuilder.addInput(numElements.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); + opBuilder.addInput(numElements.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListScatter(opBuilder.build()); } @@ -76,7 +76,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 4d8d27ed14a..1ab6e03be7f 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 @@ -54,9 +54,9 @@ public final class TensorListScatterIntoExistingList extends RawOp implements Op @Endpoint(describeByClass = true) public static TensorListScatterIntoExistingList create(Scope scope, Operand inputHandle, Operand tensor, Operand indices) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListScatterIntoExistingList", scope.makeOpName("TensorListScatterIntoExistingList")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListScatterIntoExistingList(opBuilder.build()); } @@ -69,7 +69,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 d570a3083a4..e1da3a7f29b 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 @@ -45,9 +45,9 @@ public final class TensorListSetItem extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListSetItem create(Scope scope, Operand inputHandle, Operand index, Operand item) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListSetItem", scope.makeOpName("TensorListSetItem")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(index.asOutput()); - opBuilder.addInput(item.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); + opBuilder.addInput(item.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListSetItem(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 aed272880fb..75ab46e90fd 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 @@ -55,9 +55,9 @@ public final class TensorListSplit extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorListSplit create(Scope scope, Operand tensor, Operand elementShape, Operand lengths) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListSplit", scope.makeOpName("TensorListSplit")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(elementShape.asOutput()); - opBuilder.addInput(lengths.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); + opBuilder.addInput(lengths.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorListSplit(opBuilder.build()); } @@ -70,7 +70,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 95075e1bb6d..3b48a056663 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 @@ -76,8 +76,8 @@ private Options() { @Endpoint(describeByClass = true) public static TensorListStack create(Scope scope, Operand inputHandle, Operand elementShape, DataType elementDtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TensorListStack", scope.makeOpName("TensorListStack")); - opBuilder.addInput(inputHandle.asOutput()); - opBuilder.addInput(elementShape.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); + opBuilder.addInput(elementShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("element_dtype", elementDtype); if (options != null) { @@ -104,7 +104,7 @@ public Output tensor() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return tensor; } 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 77ffefde6f5..3e79b0e5269 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 @@ -107,9 +107,9 @@ public final class TensorScatterNdAdd extends RawOp implements @Endpoint(describeByClass = true) public static TensorScatterNdAdd create(Scope scope, Operand tensor, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterAdd", scope.makeOpName("TensorScatterNdAdd")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorScatterNdAdd(opBuilder.build()); } @@ -122,7 +122,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 307a2d4b801..8d4d4398f6d 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 @@ -107,9 +107,9 @@ public final class TensorScatterNdSub extends RawOp implements @Endpoint(describeByClass = true) public static TensorScatterNdSub create(Scope scope, Operand tensor, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterSub", scope.makeOpName("TensorScatterNdSub")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorScatterNdSub(opBuilder.build()); } @@ -122,7 +122,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ac7d0635b66..33aa0d6a34f 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 @@ -122,9 +122,9 @@ public final class TensorScatterNdUpdate extends RawOp implemen @Endpoint(describeByClass = true) public static TensorScatterNdUpdate create(Scope scope, Operand tensor, Operand indices, Operand updates) { OperationBuilder opBuilder = scope.env().opBuilder("TensorScatterUpdate", scope.makeOpName("TensorScatterNdUpdate")); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorScatterNdUpdate(opBuilder.build()); } @@ -138,7 +138,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d3bf1403073..d2bffce1369 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 @@ -113,11 +113,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(begin.asOutput()); - opBuilder.addInput(end.asOutput()); - opBuilder.addInput(strides.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(begin.asOutput(scope)); + opBuilder.addInput(end.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -183,7 +183,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 abd9d462993..8e0f93011fd 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 @@ -74,8 +74,8 @@ public final class Tile extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Tile create(Scope scope, Operand input, Operand multiples) { OperationBuilder opBuilder = scope.env().opBuilder("Tile", scope.makeOpName("Tile")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(multiples.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(multiples.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Tile(opBuilder.build()); } @@ -87,7 +87,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ef460f466cd..197fe72b838 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 @@ public Output ts() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return ts; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TryRpc.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TryRpc.java index acb69b45d48..a3cf48ed4fa 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TryRpc.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/TryRpc.java @@ -141,9 +141,9 @@ private Options() { @Endpoint(describeByClass = true) public static TryRpc create(Scope scope, Operand address, Operand method, Operand request, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TryRpc", scope.makeOpName("TryRpc")); - opBuilder.addInput(address.asOutput()); - opBuilder.addInput(method.asOutput()); - opBuilder.addInput(request.asOutput()); + opBuilder.addInput(address.asOutput(scope)); + opBuilder.addInput(method.asOutput(scope)); + opBuilder.addInput(request.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 5cb23e99e7e..49c01d6c04a 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 @@ -97,9 +97,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(batchedTensor.asOutput()); - opBuilder.addInput(batchIndex.asOutput()); - opBuilder.addInput(id.asOutput()); + opBuilder.addInput(batchedTensor.asOutput(scope)); + opBuilder.addInput(batchIndex.asOutput(scope)); + opBuilder.addInput(id.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("timeout_micros", timeoutMicros); if (options != null) { @@ -136,7 +136,7 @@ public Output unbatchedTensor() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return unbatchedTensor; } 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 1309c7e80c8..db1b637fb75 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 @@ -93,10 +93,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(originalInput.asOutput()); - opBuilder.addInput(batchIndex.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(id.asOutput()); + opBuilder.addInput(originalInput.asOutput(scope)); + opBuilder.addInput(batchIndex.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(id.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -132,7 +132,7 @@ public Output batchedGrad() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return batchedGrad; } 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 9f203229625..6767929f009 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 @@ -92,8 +92,8 @@ public final class Unique extends RawOp { @Endpoint(describeByClass = true) public static Unique create(Scope scope, Operand x, Operand axis, DataType outIdx) { OperationBuilder opBuilder = scope.env().opBuilder("UniqueV2", scope.makeOpName("Unique")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_idx", outIdx); return new Unique(opBuilder.build()); 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 a98e6736594..334f4755345 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 @@ -96,8 +96,8 @@ public final class UniqueWithCounts extends @Endpoint(describeByClass = true) public static UniqueWithCounts create(Scope scope, Operand x, Operand axis, DataType outIdx) { OperationBuilder opBuilder = scope.env().opBuilder("UniqueWithCountsV2", scope.makeOpName("UniqueWithCounts")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_idx", outIdx); return new UniqueWithCounts(opBuilder.build()); 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 e272d05ec2a..5b02cc366db 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Converts an array of flat indices into a tuple of coordinate arrays. @@ -68,8 +67,8 @@ public final class UnravelIndex extends RawOp implements Oper @Endpoint(describeByClass = true) public static UnravelIndex create(Scope scope, Operand indices, Operand dims) { OperationBuilder opBuilder = scope.env().opBuilder("UnravelIndex", scope.makeOpName("UnravelIndex")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(dims.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(dims.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnravelIndex(opBuilder.build()); } @@ -83,7 +82,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fcf759828b7..b458f81540f 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 @@ -83,7 +83,7 @@ private Options() { @Endpoint(describeByClass = true) public static Unstack create(Scope scope, Operand value, Long num, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Unpack", scope.makeOpName("Unstack")); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num", num); 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 7f978707572..f6ba0f622f2 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 @@ -68,8 +68,8 @@ public final class UpperBound extends RawOp implements Operan @Endpoint(describeByClass = true) public static UpperBound create(Scope scope, Operand sortedInputs, Operand values, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("UpperBound", scope.makeOpName("UpperBound")); - opBuilder.addInput(sortedInputs.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(sortedInputs.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new UpperBound(opBuilder.build()); @@ -99,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 93a48a32093..91ec6da6944 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 @@ -114,7 +114,7 @@ public Output resource() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) resource; } 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 0aaf43a2f1b..064206518e8 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 @@ -43,7 +43,7 @@ public final class VarIsInitializedOp extends RawOp implements Operand { @Endpoint(describeByClass = true) public static VarIsInitializedOp create(Scope scope, Operand resource) { OperationBuilder opBuilder = scope.env().opBuilder("VarIsInitializedOp", scope.makeOpName("VarIsInitializedOp")); - opBuilder.addInput(resource.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new VarIsInitializedOp(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output isInitialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return isInitialized; } 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 4f663493860..474d3887f41 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 @@ -123,7 +123,7 @@ public Output ref() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return ref; } 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 76fb3c770d0..1e3b852bb68 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the shape of the variable pointed to by `resource`. @@ -58,7 +57,7 @@ public final class VariableShape extends RawOp implements Ope @Endpoint(describeByClass = true) public static VariableShape create(Scope scope, Operand input, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("VariableShape", scope.makeOpName("VariableShape")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new VariableShape(opBuilder.build()); @@ -83,7 +82,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 2e22fe12311..bcca08fb719 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 @@ -104,7 +104,7 @@ public final class Where extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Where create(Scope scope, Operand condition) { OperationBuilder opBuilder = scope.env().opBuilder("Where", scope.makeOpName("Where")); - opBuilder.addInput(condition.asOutput()); + opBuilder.addInput(condition.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Where(opBuilder.build()); } @@ -116,7 +116,7 @@ public Output index() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return index; } 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 60767fe78bf..ab9b74a1d30 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 @@ -45,7 +45,7 @@ public final class ZerosLike extends RawOp implements Operand ZerosLike create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("ZerosLike", scope.makeOpName("ZerosLike")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ZerosLike(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 0dff0c406cc..12096ed388c 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 @@ -60,8 +60,8 @@ public final class AssertNextDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static AssertNextDataset create(Scope scope, Operand inputDataset, Operand transformations, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("AssertNextDataset", scope.makeOpName("AssertNextDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(transformations.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(transformations.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -84,7 +84,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 ab9d7753834..99945419100 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 @@ -78,9 +78,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numWorkers.asOutput()); - opBuilder.addInput(index.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numWorkers.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -117,7 +117,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 f85b08a64c5..4f626e386a6 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 @@ -73,9 +73,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(batchSize.asOutput()); - opBuilder.addInput(dropRemainder.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(batchSize.asOutput(scope)); + opBuilder.addInput(dropRemainder.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -112,7 +112,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a92c52ce5fd..8acddcd2a98 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 @@ -49,8 +49,8 @@ public final class BytesProducedStatsDataset extends RawOp implements Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("BytesProducedStatsDataset", scope.makeOpName("BytesProducedStatsDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(tag.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 2374a884850..8db1416bc72 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 @@ -57,15 +57,15 @@ public final class CSVDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(filenames.asOutput()); - opBuilder.addInput(compressionType.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); - opBuilder.addInput(header.asOutput()); - opBuilder.addInput(fieldDelim.asOutput()); - opBuilder.addInput(useQuoteDelim.asOutput()); - opBuilder.addInput(naValue.asOutput()); - opBuilder.addInput(selectCols.asOutput()); - opBuilder.addInputList(Operands.asOutputs(recordDefaults)); + opBuilder.addInput(filenames.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); + opBuilder.addInput(header.asOutput(scope)); + opBuilder.addInput(fieldDelim.asOutput(scope)); + opBuilder.addInput(useQuoteDelim.asOutput(scope)); + opBuilder.addInput(naValue.asOutput(scope)); + opBuilder.addInput(selectCols.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, recordDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; for (int i = 0; i < outputShapesArray.length; ++i) { @@ -83,7 +83,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 798519589d0..c450343e4ee 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 @@ -55,8 +55,8 @@ public final class CacheDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static CacheDataset create(Scope scope, Operand inputDataset, Operand filename, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("CacheDataset", scope.makeOpName("CacheDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(filename.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(filename.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -79,7 +79,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 f75ce86e7d0..af4eec131a3 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 @@ -49,9 +49,9 @@ public final class CacheDatasetV2 extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(filename.asOutput()); - opBuilder.addInput(cache.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(filename.asOutput(scope)); + opBuilder.addInput(cache.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -74,7 +74,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e0acfa0e521..22f063aad70 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 @@ -48,7 +48,7 @@ public final class ChooseFastestDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static ChooseFastestDataset create(Scope scope, Iterable> inputDatasets, Long numExperiments, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ChooseFastestDataset", scope.makeOpName("ChooseFastestDataset")); - opBuilder.addInputList(Operands.asOutputs(inputDatasets)); + opBuilder.addInputList(Operands.asOutputs(scope, inputDatasets)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_experiments", numExperiments); DataType[] outputTypesArray = new DataType[outputTypes.size()]; @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 0a9b49b8fe6..e8b481c1a2c 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 @@ -49,8 +49,8 @@ public final class ConcatenateDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ConcatenateDataset create(Scope scope, Operand inputDataset, Operand anotherDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ConcatenateDataset", scope.makeOpName("ConcatenateDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(anotherDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(anotherDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 44d118b6d32..e73ffba8596 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 @@ -44,7 +44,7 @@ public final class DatasetCardinality extends RawOp implements Operand { @Endpoint(describeByClass = true) public static DatasetCardinality create(Scope scope, Operand inputDataset) { OperationBuilder opBuilder = scope.env().opBuilder("DatasetCardinality", scope.makeOpName("DatasetCardinality")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DatasetCardinality(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output cardinality() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return cardinality; } 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 fa931c0cd72..f6480004fd4 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 @@ -45,7 +45,7 @@ public final class DatasetFromGraph extends RawOp implements Operand { @Endpoint(describeByClass = true) public static DatasetFromGraph create(Scope scope, Operand graphDef) { OperationBuilder opBuilder = scope.env().opBuilder("DatasetFromGraph", scope.makeOpName("DatasetFromGraph")); - opBuilder.addInput(graphDef.asOutput()); + opBuilder.addInput(graphDef.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DatasetFromGraph(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 908aea9eb42..f280467d0ae 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 @@ -73,7 +73,7 @@ private Options() { @Endpoint(describeByClass = true) public static DatasetToGraph create(Scope scope, Operand inputDataset, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DatasetToGraphV2", scope.makeOpName("DatasetToGraph")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -110,7 +110,7 @@ public Output graph() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return graph; } 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 a37b7e51a96..2d3cc56f0d6 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 @@ -49,7 +49,7 @@ public final class DatasetToSingleElement extends RawOp implements Iterable dataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("DatasetToSingleElement", scope.makeOpName("DatasetToSingleElement")); - opBuilder.addInput(dataset.asOutput()); + opBuilder.addInput(dataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { 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 237f73b12a3..de989d4e59d 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 @@ -44,9 +44,9 @@ public final class DatasetToTfRecord extends RawOp { @Endpoint(describeByClass = true) public static DatasetToTfRecord create(Scope scope, Operand inputDataset, Operand filename, Operand compressionType) { OperationBuilder opBuilder = scope.env().opBuilder("DatasetToTFRecord", scope.makeOpName("DatasetToTfRecord")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(filename.asOutput()); - opBuilder.addInput(compressionType.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(filename.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DatasetToTfRecord(opBuilder.build()); } 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 5a92fcb5f82..81a53aaff6c 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 @@ -42,8 +42,8 @@ public final class DeleteIterator extends RawOp { @Endpoint(describeByClass = true) public static DeleteIterator create(Scope scope, Operand handle, Operand deleter) { OperationBuilder opBuilder = scope.env().opBuilder("DeleteIterator", scope.makeOpName("DeleteIterator")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(deleter.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(deleter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DeleteIterator(opBuilder.build()); } 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 06077aae830..5d499301e4a 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 @@ -40,8 +40,8 @@ public final class DeleteMemoryCache extends RawOp { @Endpoint(describeByClass = true) public static DeleteMemoryCache create(Scope scope, Operand handle, Operand deleter) { OperationBuilder opBuilder = scope.env().opBuilder("DeleteMemoryCache", scope.makeOpName("DeleteMemoryCache")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(deleter.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(deleter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DeleteMemoryCache(opBuilder.build()); } 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 5786255bfa5..1edde97b078 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 @@ -43,9 +43,9 @@ public final class DeleteMultiDeviceIterator extends RawOp { @Endpoint(describeByClass = true) public static DeleteMultiDeviceIterator create(Scope scope, Operand multiDeviceIterator, Iterable> iterators, Operand deleter) { OperationBuilder opBuilder = scope.env().opBuilder("DeleteMultiDeviceIterator", scope.makeOpName("DeleteMultiDeviceIterator")); - opBuilder.addInput(multiDeviceIterator.asOutput()); - opBuilder.addInputList(Operands.asOutputs(iterators)); - opBuilder.addInput(deleter.asOutput()); + opBuilder.addInput(multiDeviceIterator.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, iterators)); + opBuilder.addInput(deleter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DeleteMultiDeviceIterator(opBuilder.build()); } 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 fe69f57646a..3dfb1268882 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 @@ -53,9 +53,9 @@ public final class DenseToSparseBatchDataset extends RawOp implements Operand inputDataset, Operand batchSize, Operand rowShape, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("DenseToSparseBatchDataset", scope.makeOpName("DenseToSparseBatchDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(batchSize.asOutput()); - opBuilder.addInput(rowShape.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(batchSize.asOutput(scope)); + opBuilder.addInput(rowShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -78,7 +78,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a8c05b2d5ad..f7834b6d1c0 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 @@ -43,8 +43,8 @@ public final class DeserializeIterator extends RawOp { @Endpoint(describeByClass = true) public static DeserializeIterator create(Scope scope, Operand resourceHandle, Operand serialized) { OperationBuilder opBuilder = scope.env().opBuilder("DeserializeIterator", scope.makeOpName("DeserializeIterator")); - opBuilder.addInput(resourceHandle.asOutput()); - opBuilder.addInput(serialized.asOutput()); + opBuilder.addInput(resourceHandle.asOutput(scope)); + opBuilder.addInput(serialized.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DeserializeIterator(opBuilder.build()); } 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 b2031c8fc11..88064eafa0e 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 @@ -51,8 +51,8 @@ public final class DirectedInterleaveDataset extends RawOp implements Operand selectorInputDataset, Iterable> dataInputDatasets, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("DirectedInterleaveDataset", scope.makeOpName("DirectedInterleaveDataset")); - opBuilder.addInput(selectorInputDataset.asOutput()); - opBuilder.addInputList(Operands.asOutputs(dataInputDatasets)); + opBuilder.addInput(selectorInputDataset.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, dataInputDatasets)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 2adf749ab8a..8116c65ccf0 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 @@ -47,7 +47,7 @@ public final class FilterByLastComponentDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static FilterByLastComponentDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("FilterByLastComponentDataset", scope.makeOpName("FilterByLastComponentDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 47dbcf7c9ab..962ad96daad 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 @@ -48,12 +48,12 @@ public final class FixedLengthRecordDataset extends RawOp implements Operand filenames, Operand headerBytes, Operand recordBytes, Operand footerBytes, Operand bufferSize, Operand compressionType) { OperationBuilder opBuilder = scope.env().opBuilder("FixedLengthRecordDatasetV2", scope.makeOpName("FixedLengthRecordDataset")); - opBuilder.addInput(filenames.asOutput()); - opBuilder.addInput(headerBytes.asOutput()); - opBuilder.addInput(recordBytes.asOutput()); - opBuilder.addInput(footerBytes.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); - opBuilder.addInput(compressionType.asOutput()); + opBuilder.addInput(filenames.asOutput(scope)); + opBuilder.addInput(headerBytes.asOutput(scope)); + opBuilder.addInput(recordBytes.asOutput(scope)); + opBuilder.addInput(footerBytes.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new FixedLengthRecordDataset(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e7a4c8d69dd..ebba0ba4367 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 @@ -47,7 +47,7 @@ public final class IgnoreErrorsDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IgnoreErrorsDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("IgnoreErrorsDataset", scope.makeOpName("IgnoreErrorsDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 5ada431831c..24ceb94472f 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 @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e394c9b347a..8950b22db06 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 @@ -66,7 +66,7 @@ private Options() { @Endpoint(describeByClass = true) public static IteratorFromStringHandle create(Scope scope, Operand stringHandle, List> outputTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("IteratorFromStringHandleV2", scope.makeOpName("IteratorFromStringHandle")); - opBuilder.addInput(stringHandle.asOutput()); + opBuilder.addInput(stringHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -102,7 +102,7 @@ public Output resourceHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) resourceHandle; } 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 d1ac024b6b2..e2b4895501d 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 @@ -42,7 +42,7 @@ public final class IteratorGetDevice extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IteratorGetDevice create(Scope scope, Operand resource) { OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetDevice", scope.makeOpName("IteratorGetDevice")); - opBuilder.addInput(resource.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IteratorGetDevice(opBuilder.build()); } @@ -54,7 +54,7 @@ public Output device() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return device; } 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 2b8e80de880..ecba5e71b91 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 @@ -50,7 +50,7 @@ public final class IteratorGetNext extends RawOp implements Iterable iterator, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetNext", scope.makeOpName("IteratorGetNext")); - opBuilder.addInput(iterator.asOutput()); + opBuilder.addInput(iterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { 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 41382765531..b0eef7da752 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 @@ -48,7 +48,7 @@ public final class IteratorGetNextAsOptional extends RawOp implements Operand iterator, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetNextAsOptional", scope.makeOpName("IteratorGetNextAsOptional")); - opBuilder.addInput(iterator.asOutput()); + opBuilder.addInput(iterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -71,7 +71,7 @@ public Output optional() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) optional; } 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 97f1ee35918..13e3fd73513 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 @@ -55,7 +55,7 @@ public final class IteratorGetNextSync extends RawOp implements Iterable iterator, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("IteratorGetNextSync", scope.makeOpName("IteratorGetNextSync")); - opBuilder.addInput(iterator.asOutput()); + opBuilder.addInput(iterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { 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 19e8fcf2ed4..c49ebfa2ebf 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 @@ -43,7 +43,7 @@ public final class IteratorToStringHandle extends RawOp implements Operand resourceHandle) { OperationBuilder opBuilder = scope.env().opBuilder("IteratorToStringHandle", scope.makeOpName("IteratorToStringHandle")); - opBuilder.addInput(resourceHandle.asOutput()); + opBuilder.addInput(resourceHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IteratorToStringHandle(opBuilder.build()); } @@ -56,7 +56,7 @@ public Output stringHandle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return stringHandle; } 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 9d8725757db..99becc6a664 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 @@ -60,7 +60,7 @@ public final class LMDBDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LMDBDataset create(Scope scope, Operand filenames, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("LMDBDataset", scope.makeOpName("LMDBDataset")); - opBuilder.addInput(filenames.asOutput()); + opBuilder.addInput(filenames.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -83,7 +83,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 5391e373273..0036ce2834a 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 @@ -49,8 +49,8 @@ public final class LatencyStatsDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LatencyStatsDataset create(Scope scope, Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("LatencyStatsDataset", scope.makeOpName("LatencyStatsDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(tag.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9832f573eda..45f9585b648 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes rectified linear gradients for a LeakyRelu operation. @@ -67,8 +66,8 @@ private Options() { @Endpoint(describeByClass = true) public static LeakyReluGrad create(Scope scope, Operand gradients, Operand features, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("LeakyReluGrad", scope.makeOpName("LeakyReluGrad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -95,7 +94,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 a2f380b0a49..4a2f76ef049 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 @@ -45,8 +45,8 @@ public final class MakeIterator extends RawOp { @Endpoint(describeByClass = true) public static MakeIterator create(Scope scope, Operand dataset, Operand iterator) { OperationBuilder opBuilder = scope.env().opBuilder("MakeIterator", scope.makeOpName("MakeIterator")); - opBuilder.addInput(dataset.asOutput()); - opBuilder.addInput(iterator.asOutput()); + opBuilder.addInput(dataset.asOutput(scope)); + opBuilder.addInput(iterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MakeIterator(opBuilder.build()); } 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 6a83be042c6..923e89bc7d3 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 @@ -42,7 +42,7 @@ public final class MatchingFilesDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static MatchingFilesDataset create(Scope scope, Operand patterns) { OperationBuilder opBuilder = scope.env().opBuilder("MatchingFilesDataset", scope.makeOpName("MatchingFilesDataset")); - opBuilder.addInput(patterns.asOutput()); + opBuilder.addInput(patterns.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MatchingFilesDataset(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 5f45170d93e..70f106190e4 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 @@ -49,8 +49,8 @@ public final class MaxIntraOpParallelismDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static MaxIntraOpParallelismDataset create(Scope scope, Operand inputDataset, Operand maxIntraOpParallelism, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("MaxIntraOpParallelismDataset", scope.makeOpName("MaxIntraOpParallelismDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(maxIntraOpParallelism.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(maxIntraOpParallelism.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 ca8566ff06f..302c21d0283 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 @@ -78,7 +78,7 @@ private Options() { @Endpoint(describeByClass = true) public static ModelDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ModelDataset", scope.makeOpName("ModelDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -125,7 +125,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e4de4452636..11381cb40e7 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 @@ -81,7 +81,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a80f5d9cdc2..a1db07d4fdc 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 @@ -67,7 +67,7 @@ private Options() { @Endpoint(describeByClass = true) public static MultiDeviceIteratorFromStringHandle create(Scope scope, Operand stringHandle, List> outputTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorFromStringHandle", scope.makeOpName("MultiDeviceIteratorFromStringHandle")); - opBuilder.addInput(stringHandle.asOutput()); + opBuilder.addInput(stringHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -104,7 +104,7 @@ public Output multiDeviceIterator() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) multiDeviceIterator; } 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 6f2eeb28daa..53f57853e82 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 @@ -53,9 +53,9 @@ public final class MultiDeviceIteratorGetNextFromShard extends RawOp implements @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(multiDeviceIterator.asOutput()); - opBuilder.addInput(shardNum.asOutput()); - opBuilder.addInput(incarnationId.asOutput()); + opBuilder.addInput(multiDeviceIterator.asOutput(scope)); + opBuilder.addInput(shardNum.asOutput(scope)); + opBuilder.addInput(incarnationId.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { 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 fec8ee78e0b..764ae8b6464 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 @@ -44,9 +44,9 @@ public final class MultiDeviceIteratorInit extends RawOp implements Operand dataset, Operand multiDeviceIterator, Operand maxBufferSize) { OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorInit", scope.makeOpName("MultiDeviceIteratorInit")); - opBuilder.addInput(dataset.asOutput()); - opBuilder.addInput(multiDeviceIterator.asOutput()); - opBuilder.addInput(maxBufferSize.asOutput()); + opBuilder.addInput(dataset.asOutput(scope)); + opBuilder.addInput(multiDeviceIterator.asOutput(scope)); + opBuilder.addInput(maxBufferSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MultiDeviceIteratorInit(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output incarnationId() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return incarnationId; } 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 6f6045a848c..06487f74111 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 @@ -42,7 +42,7 @@ public final class MultiDeviceIteratorToStringHandle extends RawOp implements Op @Endpoint(describeByClass = true) public static MultiDeviceIteratorToStringHandle create(Scope scope, Operand multiDeviceIterator) { OperationBuilder opBuilder = scope.env().opBuilder("MultiDeviceIteratorToStringHandle", scope.makeOpName("MultiDeviceIteratorToStringHandle")); - opBuilder.addInput(multiDeviceIterator.asOutput()); + opBuilder.addInput(multiDeviceIterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MultiDeviceIteratorToStringHandle(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output stringHandle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return stringHandle; } 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 e42a75dbf83..3e9694fab5e 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 @@ -46,7 +46,7 @@ public final class NonSerializableDataset extends RawOp implements Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("NonSerializableDataset", scope.makeOpName("NonSerializableDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -69,7 +69,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 b7e557c816d..f2e311409ed 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 @@ -71,8 +71,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(optimizations.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(optimizations.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -113,7 +113,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 7832d3cbd58..be8865ecbf7 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 @@ -44,7 +44,7 @@ public final class OptionalFromValue extends RawOp implements Operand { @Endpoint(describeByClass = true) public static OptionalFromValue create(Scope scope, Iterable> components) { OperationBuilder opBuilder = scope.env().opBuilder("OptionalFromValue", scope.makeOpName("OptionalFromValue")); - opBuilder.addInputList(Operands.asOutputs(components)); + opBuilder.addInputList(Operands.asOutputs(scope, components)); opBuilder = scope.applyControlDependencies(opBuilder); return new OptionalFromValue(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output optional() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) optional; } 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 c38d1177c28..396ad376b03 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 @@ -50,7 +50,7 @@ public final class OptionalGetValue extends RawOp implements Iterable optional, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("OptionalGetValue", scope.makeOpName("OptionalGetValue")); - opBuilder.addInput(optional.asOutput()); + opBuilder.addInput(optional.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { 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 d77f53ff5ca..82c206e1755 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 @@ -43,7 +43,7 @@ public final class OptionalHasValue extends RawOp implements Operand { @Endpoint(describeByClass = true) public static OptionalHasValue create(Scope scope, Operand optional) { OperationBuilder opBuilder = scope.env().opBuilder("OptionalHasValue", scope.makeOpName("OptionalHasValue")); - opBuilder.addInput(optional.asOutput()); + opBuilder.addInput(optional.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new OptionalHasValue(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output hasValue() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return hasValue; } 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 ee871daef2e..dae4fbf3b0e 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 @@ -54,7 +54,7 @@ public Output optional() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) optional; } 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 65da0acf0c8..b96c9519426 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 @@ -78,11 +78,11 @@ private Options() { @Endpoint(describeByClass = true) public static PaddedBatchDataset create(Scope scope, Operand inputDataset, Operand batchSize, Iterable> paddedShapes, Iterable> paddingValues, Operand dropRemainder, List outputShapes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("PaddedBatchDatasetV2", scope.makeOpName("PaddedBatchDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(batchSize.asOutput()); - opBuilder.addInputList(Operands.asOutputs(paddedShapes)); - opBuilder.addInputList(Operands.asOutputs(paddingValues)); - opBuilder.addInput(dropRemainder.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(batchSize.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, paddedShapes)); + opBuilder.addInputList(Operands.asOutputs(scope, paddingValues)); + opBuilder.addInput(dropRemainder.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; for (int i = 0; i < outputShapesArray.length; ++i) { @@ -114,7 +114,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a56c2e70054..720a06118a4 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 @@ -79,8 +79,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -127,7 +127,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 d637c1b081a..c50a380c847 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 @@ -49,8 +49,8 @@ public final class PrivateThreadPoolDataset extends RawOp implements Operand inputDataset, Operand numThreads, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("PrivateThreadPoolDataset", scope.makeOpName("PrivateThreadPoolDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numThreads.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numThreads.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 6549d26c515..b87f138310e 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 @@ -62,8 +62,8 @@ public final class RandomDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static RandomDataset create(Scope scope, Operand seed, Operand seed2, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("RandomDataset", scope.makeOpName("RandomDataset")); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(seed2.asOutput()); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(seed2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -86,7 +86,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 964d99e90e4..125ff8b8f81 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 @@ -51,9 +51,9 @@ public final class RangeDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(start.asOutput()); - opBuilder.addInput(stop.asOutput()); - opBuilder.addInput(step.asOutput()); + opBuilder.addInput(start.asOutput(scope)); + opBuilder.addInput(stop.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -76,7 +76,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 baa5d56fea3..a688e0de880 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 @@ -74,8 +74,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numReplicas.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numReplicas.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -112,7 +112,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 85d27c01df8..b04cbf38227 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 @@ -51,8 +51,8 @@ public final class RepeatDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static RepeatDataset create(Scope scope, Operand inputDataset, Operand count, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("RepeatDataset", scope.makeOpName("RepeatDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(count.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(count.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 b9a584f0ac0..d694f4136d0 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 @@ -59,10 +59,10 @@ public final class SamplingDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(rate.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(seed2.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(rate.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(seed2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -85,7 +85,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 8dc271706f3..e5dbb52d68d 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 @@ -63,7 +63,7 @@ private Options() { @Endpoint(describeByClass = true) public static SerializeIterator create(Scope scope, Operand resourceHandle, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SerializeIterator", scope.makeOpName("SerializeIterator")); - opBuilder.addInput(resourceHandle.asOutput()); + opBuilder.addInput(resourceHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -92,7 +92,7 @@ public Output serialized() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) serialized; } 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 b635c38df18..6050f9e3615 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 @@ -50,10 +50,10 @@ public final class SetStatsAggregatorDataset extends RawOp implements Operand inputDataset, Operand statsAggregator, Operand tag, Operand counterPrefix, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("SetStatsAggregatorDataset", scope.makeOpName("SetStatsAggregatorDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(statsAggregator.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(counterPrefix.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(statsAggregator.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(counterPrefix.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -76,7 +76,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 71864817d93..2180603b076 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 @@ -70,9 +70,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numShards.asOutput()); - opBuilder.addInput(index.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numShards.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -109,7 +109,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 67bf83b9b5d..13a629bb3c8 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 @@ -59,11 +59,11 @@ public final class ShuffleAndRepeatDataset extends RawOp implements Operand inputDataset, Operand bufferSize, Operand seed, Operand seed2, Operand count, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ShuffleAndRepeatDataset", scope.makeOpName("ShuffleAndRepeatDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(seed2.asOutput()); - opBuilder.addInput(count.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(seed2.asOutput(scope)); + opBuilder.addInput(count.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -86,7 +86,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 ccc51d49a37..1401683e34f 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 @@ -49,9 +49,9 @@ public final class ShuffleDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ShuffleDataset create(Scope scope, Operand inputDataset, Operand bufferSize, Operand seedGenerator, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ShuffleDatasetV2", scope.makeOpName("ShuffleDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); - opBuilder.addInput(seedGenerator.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); + opBuilder.addInput(seedGenerator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -74,7 +74,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 7de29fc4976..e114aa1c5bf 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 @@ -51,8 +51,8 @@ public final class SkipDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SkipDataset create(Scope scope, Operand inputDataset, Operand count, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("SkipDataset", scope.makeOpName("SkipDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(count.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(count.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 23f6e214ec4..d9e12b029d3 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 @@ -48,8 +48,8 @@ public final class SleepDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SleepDataset create(Scope scope, Operand inputDataset, Operand sleepMicroseconds, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("SleepDataset", scope.makeOpName("SleepDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(sleepMicroseconds.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(sleepMicroseconds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 2eb9ac29140..a0362984adb 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 @@ -54,10 +54,10 @@ public final class SlidingWindowDataset extends RawOp implements Operand @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(windowSize.asOutput()); - opBuilder.addInput(windowShift.asOutput()); - opBuilder.addInput(windowStride.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(windowSize.asOutput(scope)); + opBuilder.addInput(windowShift.asOutput(scope)); + opBuilder.addInput(windowStride.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -80,7 +80,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java index c166f4a4fd7..5cf1fc5873b 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/data/SnapshotDataset.java @@ -191,8 +191,8 @@ private Options() { @Endpoint(describeByClass = true) public static SnapshotDataset create(Scope scope, Operand inputDataset, Operand path, List> outputTypes, List outputShapes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SnapshotDataset", scope.makeOpName("SnapshotDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(path.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(path.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -359,7 +359,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9c45e99c9e3..911419a64ba 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 @@ -45,9 +45,9 @@ public final class SparseTensorSliceDataset extends RawOp implements Operand SparseTensorSliceDataset create(Scope scope, Operand indices, Operand values, Operand denseShape) { OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorSliceDataset", scope.makeOpName("SparseTensorSliceDataset")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(denseShape.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(denseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseTensorSliceDataset(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9c8ef660137..2df82612c50 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 @@ -50,9 +50,9 @@ public final class SqlDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(driverName.asOutput()); - opBuilder.addInput(dataSourceName.asOutput()); - opBuilder.addInput(query.asOutput()); + opBuilder.addInput(driverName.asOutput(scope)); + opBuilder.addInput(dataSourceName.asOutput(scope)); + opBuilder.addInput(query.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 b96fcb2a07e..7bb5c823219 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 @@ -106,7 +106,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9fb312ddac7..0cf2c0d99d9 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 @@ -52,8 +52,8 @@ public final class TakeDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TakeDataset create(Scope scope, Operand inputDataset, Operand count, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("TakeDataset", scope.makeOpName("TakeDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(count.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(count.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -76,7 +76,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 35f30f733ae..808b1f8c673 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 @@ -46,7 +46,7 @@ public final class TensorDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorDataset create(Scope scope, Iterable> components, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("TensorDataset", scope.makeOpName("TensorDataset")); - opBuilder.addInputList(Operands.asOutputs(components)); + opBuilder.addInputList(Operands.asOutputs(scope, components)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; for (int i = 0; i < outputShapesArray.length; ++i) { @@ -64,7 +64,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 45fc9c1eef5..ac393b022da 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 @@ -47,7 +47,7 @@ public final class TensorSliceDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorSliceDataset create(Scope scope, Iterable> components, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("TensorSliceDataset", scope.makeOpName("TensorSliceDataset")); - opBuilder.addInputList(Operands.asOutputs(components)); + opBuilder.addInputList(Operands.asOutputs(scope, components)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; for (int i = 0; i < outputShapesArray.length; ++i) { @@ -65,7 +65,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 614d3bc2b4c..1b1339a271b 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 @@ -49,9 +49,9 @@ public final class TextLineDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TextLineDataset create(Scope scope, Operand filenames, Operand compressionType, Operand bufferSize) { OperationBuilder opBuilder = scope.env().opBuilder("TextLineDataset", scope.makeOpName("TextLineDataset")); - opBuilder.addInput(filenames.asOutput()); - opBuilder.addInput(compressionType.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); + opBuilder.addInput(filenames.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TextLineDataset(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 ba889f8f3af..0e968b87686 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 @@ -50,9 +50,9 @@ public final class TfRecordDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TfRecordDataset create(Scope scope, Operand filenames, Operand compressionType, Operand bufferSize) { OperationBuilder opBuilder = scope.env().opBuilder("TFRecordDataset", scope.makeOpName("TfRecordDataset")); - opBuilder.addInput(filenames.asOutput()); - opBuilder.addInput(compressionType.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); + opBuilder.addInput(filenames.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TfRecordDataset(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 b0443de050e..5bc47af030d 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 @@ -48,8 +48,8 @@ public final class ThreadPoolDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ThreadPoolDataset create(Scope scope, Operand inputDataset, Operand threadPool, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ThreadPoolDataset", scope.makeOpName("ThreadPoolDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(threadPool.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(threadPool.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9c5ad809be0..b10e3c76935 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 @@ -135,7 +135,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e92d5a72d41..91e21a2a32d 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 @@ -47,7 +47,7 @@ public final class UnbatchDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static UnbatchDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("UnbatchDataset", scope.makeOpName("UnbatchDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 fc7796939c2..d076e5456b4 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 @@ -47,7 +47,7 @@ public final class UniqueDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static UniqueDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("UniqueDataset", scope.makeOpName("UniqueDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 1ba2fb16027..5763eb45264 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 @@ -41,7 +41,7 @@ public final class UnwrapDatasetVariant extends RawOp implements Operand @Endpoint(describeByClass = true) public static UnwrapDatasetVariant create(Scope scope, Operand inputHandle) { OperationBuilder opBuilder = scope.env().opBuilder("UnwrapDatasetVariant", scope.makeOpName("UnwrapDatasetVariant")); - opBuilder.addInput(inputHandle.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnwrapDatasetVariant(opBuilder.build()); } @@ -54,7 +54,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 c08069ff65f..9c7c3042e0a 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 @@ -100,11 +100,11 @@ public final class WindowDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static WindowDataset create(Scope scope, Operand inputDataset, Operand size, Operand shift, Operand stride, Operand dropRemainder, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("WindowDataset", scope.makeOpName("WindowDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(size.asOutput()); - opBuilder.addInput(shift.asOutput()); - opBuilder.addInput(stride.asOutput()); - opBuilder.addInput(dropRemainder.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); + opBuilder.addInput(shift.asOutput(scope)); + opBuilder.addInput(stride.asOutput(scope)); + opBuilder.addInput(dropRemainder.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -127,7 +127,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 94ab283621f..155a23aa49d 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 @@ -41,7 +41,7 @@ public final class WrapDatasetVariant extends RawOp implements Operand { @Endpoint(describeByClass = true) public static WrapDatasetVariant create(Scope scope, Operand inputHandle) { OperationBuilder opBuilder = scope.env().opBuilder("WrapDatasetVariant", scope.makeOpName("WrapDatasetVariant")); - opBuilder.addInput(inputHandle.asOutput()); + opBuilder.addInput(inputHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WrapDatasetVariant(opBuilder.build()); } @@ -54,7 +54,7 @@ public Output outputHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) outputHandle; } 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 0829a5435c3..51365e8db31 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 @@ -55,7 +55,7 @@ public final class ZipDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ZipDataset create(Scope scope, Iterable> inputDatasets, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ZipDataset", scope.makeOpName("ZipDataset")); - opBuilder.addInputList(Operands.asOutputs(inputDatasets)); + opBuilder.addInputList(Operands.asOutputs(scope, inputDatasets)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -78,7 +78,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 271026cab6c..b5fb8685fbb 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 @@ -48,8 +48,8 @@ public final class AssertCardinalityDataset extends RawOp implements Operand inputDataset, Operand cardinality, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("AssertCardinalityDataset", scope.makeOpName("AssertCardinalityDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(cardinality.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(cardinality.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 3ced6851207..cd98aff52bb 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 @@ -48,8 +48,8 @@ public final class AssertNextDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static AssertNextDataset create(Scope scope, Operand inputDataset, Operand transformations, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalAssertNextDataset", scope.makeOpName("AssertNextDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(transformations.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(transformations.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e1a8ffbffbe..816889d42dd 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 @@ -78,9 +78,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numWorkers.asOutput()); - opBuilder.addInput(index.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numWorkers.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -117,7 +117,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 aaf9e88a544..8b9e357c181 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 @@ -49,8 +49,8 @@ public final class BytesProducedStatsDataset extends RawOp implements Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalBytesProducedStatsDataset", scope.makeOpName("BytesProducedStatsDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(tag.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 764d02ab240..56c88ee8593 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 @@ -56,15 +56,15 @@ public final class CSVDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(filenames.asOutput()); - opBuilder.addInput(compressionType.asOutput()); - opBuilder.addInput(bufferSize.asOutput()); - opBuilder.addInput(header.asOutput()); - opBuilder.addInput(fieldDelim.asOutput()); - opBuilder.addInput(useQuoteDelim.asOutput()); - opBuilder.addInput(naValue.asOutput()); - opBuilder.addInput(selectCols.asOutput()); - opBuilder.addInputList(Operands.asOutputs(recordDefaults)); + opBuilder.addInput(filenames.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); + opBuilder.addInput(bufferSize.asOutput(scope)); + opBuilder.addInput(header.asOutput(scope)); + opBuilder.addInput(fieldDelim.asOutput(scope)); + opBuilder.addInput(useQuoteDelim.asOutput(scope)); + opBuilder.addInput(naValue.asOutput(scope)); + opBuilder.addInput(selectCols.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, recordDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] outputShapesArray = new Shape[outputShapes.size()]; for (int i = 0; i < outputShapesArray.length; ++i) { @@ -82,7 +82,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a4335e73817..ec8498d1294 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 @@ -48,7 +48,7 @@ public final class ChooseFastestDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static ChooseFastestDataset create(Scope scope, Iterable> inputDatasets, Long numExperiments, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalChooseFastestDataset", scope.makeOpName("ChooseFastestDataset")); - opBuilder.addInputList(Operands.asOutputs(inputDatasets)); + opBuilder.addInputList(Operands.asOutputs(scope, inputDatasets)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_experiments", numExperiments); DataType[] outputTypesArray = new DataType[outputTypes.size()]; @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 290bec84df8..8c80587f4b4 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 @@ -44,7 +44,7 @@ public final class DatasetCardinality extends RawOp implements Operand { @Endpoint(describeByClass = true) public static DatasetCardinality create(Scope scope, Operand inputDataset) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDatasetCardinality", scope.makeOpName("DatasetCardinality")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DatasetCardinality(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output cardinality() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return cardinality; } 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 3bb2bc62b4b..efc3c5c6692 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 @@ -44,9 +44,9 @@ public final class DatasetToTFRecord extends RawOp { @Endpoint(describeByClass = true) public static DatasetToTFRecord create(Scope scope, Operand inputDataset, Operand filename, Operand compressionType) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDatasetToTFRecord", scope.makeOpName("DatasetToTFRecord")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(filename.asOutput()); - opBuilder.addInput(compressionType.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(filename.asOutput(scope)); + opBuilder.addInput(compressionType.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DatasetToTFRecord(opBuilder.build()); } 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 550ddde8c54..e172458ca67 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 @@ -53,9 +53,9 @@ public final class DenseToSparseBatchDataset extends RawOp implements Operand inputDataset, Operand batchSize, Operand rowShape, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDenseToSparseBatchDataset", scope.makeOpName("DenseToSparseBatchDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(batchSize.asOutput()); - opBuilder.addInput(rowShape.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(batchSize.asOutput(scope)); + opBuilder.addInput(rowShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -78,7 +78,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 62ba3a97b7f..89f39d453d8 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 @@ -51,8 +51,8 @@ public final class DirectedInterleaveDataset extends RawOp implements Operand selectorInputDataset, Iterable> dataInputDatasets, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalDirectedInterleaveDataset", scope.makeOpName("DirectedInterleaveDataset")); - opBuilder.addInput(selectorInputDataset.asOutput()); - opBuilder.addInputList(Operands.asOutputs(dataInputDatasets)); + opBuilder.addInput(selectorInputDataset.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, dataInputDatasets)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 77c750ea775..26f6a8535b6 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 @@ -47,7 +47,7 @@ public final class IgnoreErrorsDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IgnoreErrorsDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalIgnoreErrorsDataset", scope.makeOpName("IgnoreErrorsDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 2e19177a58f..014abc5504e 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 @@ -42,7 +42,7 @@ public final class IteratorGetDevice extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IteratorGetDevice create(Scope scope, Operand resource) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalIteratorGetDevice", scope.makeOpName("IteratorGetDevice")); - opBuilder.addInput(resource.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IteratorGetDevice(opBuilder.build()); } @@ -54,7 +54,7 @@ public Output device() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return device; } 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 6a54aa3586c..bfc8ce1d9e2 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 @@ -49,8 +49,8 @@ public final class LatencyStatsDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LatencyStatsDataset create(Scope scope, Operand inputDataset, Operand tag, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalLatencyStatsDataset", scope.makeOpName("LatencyStatsDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(tag.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a7680b1cbe9..4f6a784df1c 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 @@ -47,7 +47,7 @@ public final class LmdbDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LmdbDataset create(Scope scope, Operand filenames, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalLMDBDataset", scope.makeOpName("LmdbDataset")); - opBuilder.addInput(filenames.asOutput()); + opBuilder.addInput(filenames.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 fcd78e95ee7..04f7b4757d3 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 @@ -42,7 +42,7 @@ public final class MatchingFilesDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static MatchingFilesDataset create(Scope scope, Operand patterns) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalMatchingFilesDataset", scope.makeOpName("MatchingFilesDataset")); - opBuilder.addInput(patterns.asOutput()); + opBuilder.addInput(patterns.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MatchingFilesDataset(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 f7db67ed8a8..d8160a70d31 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 @@ -49,8 +49,8 @@ public final class MaxIntraOpParallelismDataset extends RawOp implements Operand @Endpoint(describeByClass = true) public static MaxIntraOpParallelismDataset create(Scope scope, Operand inputDataset, Operand maxIntraOpParallelism, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalMaxIntraOpParallelismDataset", scope.makeOpName("MaxIntraOpParallelismDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(maxIntraOpParallelism.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(maxIntraOpParallelism.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 5d19824576d..60de23547c3 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 @@ -46,7 +46,7 @@ public final class NonSerializableDataset extends RawOp implements Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalNonSerializableDataset", scope.makeOpName("NonSerializableDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -69,7 +69,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 f87553458b2..1e1a7041a03 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 @@ -30,7 +30,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; -import org.tensorflow.types.family.TNumber; import org.tensorflow.types.family.TType; /** @@ -104,9 +103,9 @@ private Options() { @Endpoint(describeByClass = true) public static ParseExampleDataset create(Scope scope, Operand inputDataset, Operand numParallelCalls, Iterable> denseDefaults, List sparseKeys, List denseKeys, List> sparseTypes, List denseShapes, List> outputTypes, List outputShapes, List> raggedValueTypes, List> raggedSplitTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ParseExampleDatasetV2", scope.makeOpName("ParseExampleDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numParallelCalls.asOutput()); - opBuilder.addInputList(Operands.asOutputs(denseDefaults)); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numParallelCalls.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, denseDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); String[] sparseKeysArray = new String[sparseKeys.size()]; for (int i = 0; i < sparseKeysArray.length; ++i) { @@ -191,7 +190,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 963fb615d65..82c5b923ad6 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 @@ -49,8 +49,8 @@ public final class PrivateThreadPoolDataset extends RawOp implements Operand inputDataset, Operand numThreads, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalPrivateThreadPoolDataset", scope.makeOpName("PrivateThreadPoolDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numThreads.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numThreads.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -73,7 +73,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 aed4a2b7ee4..75b9531cda0 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 @@ -51,8 +51,8 @@ public final class RandomDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static RandomDataset create(Scope scope, Operand seed, Operand seed2, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalRandomDataset", scope.makeOpName("RandomDataset")); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(seed2.asOutput()); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(seed2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 cb33dd922e4..9f3dedc93af 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 @@ -74,8 +74,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(numReplicas.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(numReplicas.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -112,7 +112,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 705753f7835..368a8fcf6c6 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 @@ -50,10 +50,10 @@ public final class SetStatsAggregatorDataset extends RawOp implements Operand inputDataset, Operand statsAggregator, Operand tag, Operand counterPrefix, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalSetStatsAggregatorDataset", scope.makeOpName("SetStatsAggregatorDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(statsAggregator.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(counterPrefix.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(statsAggregator.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(counterPrefix.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -76,7 +76,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e953bcf3949..9bf865c5f15 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 @@ -48,8 +48,8 @@ public final class SleepDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SleepDataset create(Scope scope, Operand inputDataset, Operand sleepMicroseconds, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalSleepDataset", scope.makeOpName("SleepDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(sleepMicroseconds.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(sleepMicroseconds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 efe23924930..f7e7b55b243 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 @@ -54,10 +54,10 @@ public final class SlidingWindowDataset extends RawOp implements Operand @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(windowSize.asOutput()); - opBuilder.addInput(windowShift.asOutput()); - opBuilder.addInput(windowStride.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(windowSize.asOutput(scope)); + opBuilder.addInput(windowShift.asOutput(scope)); + opBuilder.addInput(windowStride.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -80,7 +80,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 ca01538ebdb..18bc863ae5a 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 @@ -50,9 +50,9 @@ public final class SqlDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(driverName.asOutput()); - opBuilder.addInput(dataSourceName.asOutput()); - opBuilder.addInput(query.asOutput()); + opBuilder.addInput(driverName.asOutput(scope)); + opBuilder.addInput(dataSourceName.asOutput(scope)); + opBuilder.addInput(query.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -75,7 +75,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 e3749bfc10b..818ed60f38a 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 @@ -105,7 +105,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 44acd09f14c..7bafeaf6632 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 @@ -41,8 +41,8 @@ public final class StatsAggregatorSetSummaryWriter extends RawOp { @Endpoint(describeByClass = true) public static StatsAggregatorSetSummaryWriter create(Scope scope, Operand statsAggregator, Operand summary) { OperationBuilder opBuilder = scope.env().opBuilder("StatsAggregatorSetSummaryWriter", scope.makeOpName("StatsAggregatorSetSummaryWriter")); - opBuilder.addInput(statsAggregator.asOutput()); - opBuilder.addInput(summary.asOutput()); + opBuilder.addInput(statsAggregator.asOutput(scope)); + opBuilder.addInput(summary.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StatsAggregatorSetSummaryWriter(opBuilder.build()); } 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 1a4d285dfe3..507d740558e 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 @@ -42,7 +42,7 @@ public final class StatsAggregatorSummary extends RawOp implements Operand iterator) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalStatsAggregatorSummary", scope.makeOpName("StatsAggregatorSummary")); - opBuilder.addInput(iterator.asOutput()); + opBuilder.addInput(iterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StatsAggregatorSummary(opBuilder.build()); } @@ -54,7 +54,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 a7daf34b40f..3cbf8c81b6e 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 @@ -48,8 +48,8 @@ public final class ThreadPoolDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ThreadPoolDataset create(Scope scope, Operand inputDataset, Operand threadPool, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalThreadPoolDataset", scope.makeOpName("ThreadPoolDataset")); - opBuilder.addInput(inputDataset.asOutput()); - opBuilder.addInput(threadPool.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); + opBuilder.addInput(threadPool.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -72,7 +72,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9a2527ec80e..239ef8ce600 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 @@ -135,7 +135,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 7fbcf202d9c..881ebf9c772 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 @@ -47,7 +47,7 @@ public final class UnbatchDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static UnbatchDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalUnbatchDataset", scope.makeOpName("UnbatchDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 853152d2760..a67d2733d18 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 @@ -47,7 +47,7 @@ public final class UniqueDataset extends RawOp implements Operand { @Endpoint(describeByClass = true) public static UniqueDataset create(Scope scope, Operand inputDataset, List> outputTypes, List outputShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ExperimentalUniqueDataset", scope.makeOpName("UniqueDataset")); - opBuilder.addInput(inputDataset.asOutput()); + opBuilder.addInput(inputDataset.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] outputTypesArray = new DataType[outputTypes.size()]; for (int i = 0; i < outputTypesArray.length; ++i) { @@ -70,7 +70,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 1124b625a73..fef0882267a 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Checks a tensor for NaN, -Inf and +Inf values. @@ -51,7 +50,7 @@ public final class CheckNumerics extends RawOp implements Ope @Endpoint(describeByClass = true) public static CheckNumerics create(Scope scope, Operand tensor, String message) { OperationBuilder opBuilder = scope.env().opBuilder("CheckNumericsV2", scope.makeOpName("CheckNumerics")); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("message", message); return new CheckNumerics(opBuilder.build()); @@ -64,7 +63,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9840b9b1607..161b05d7e7b 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 @@ -48,7 +48,7 @@ public final class DebugGradientIdentity extends RawOp implemen @Endpoint(describeByClass = true) public static DebugGradientIdentity create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("DebugGradientIdentity", scope.makeOpName("DebugGradientIdentity")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DebugGradientIdentity(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3746e4891f7..c187920fd57 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 @@ -48,7 +48,7 @@ public final class DebugGradientRefIdentity extends RawOp imple @Endpoint(describeByClass = true) public static DebugGradientRefIdentity create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("DebugGradientRefIdentity", scope.makeOpName("DebugGradientRefIdentity")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DebugGradientRefIdentity(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 cf3503ffca3..823f839bba6 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 @@ -114,7 +114,7 @@ private Options() { @Endpoint(describeByClass = true) public static DebugIdentity create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DebugIdentityV2", scope.makeOpName("DebugIdentity")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -187,7 +187,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 12e011c67ac..c5653b1d6cb 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 @@ -99,7 +99,7 @@ private Options() { @Endpoint(describeByClass = true) public static DebugNanCount create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DebugNanCount", scope.makeOpName("DebugNanCount")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -165,7 +165,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 32e3291a909..08a17016b43 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 @@ -134,7 +134,7 @@ private Options() { @Endpoint(describeByClass = true) public static DebugNumericsSummary create(Scope scope, Operand input, DataType outputDtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DebugNumericSummaryV2", scope.makeOpName("DebugNumericsSummary")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_dtype", outputDtype); if (options != null) { @@ -237,7 +237,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 6a3cac82067..645d0d9e034 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 @@ -118,7 +118,7 @@ private Options() { @Endpoint(describeByClass = true) public static AsString create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AsString", scope.makeOpName("AsString")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -189,7 +189,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5acd9c542f6..c1e56d64237 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 @@ -67,7 +67,7 @@ private Options() { @Endpoint(describeByClass = true) public static Cast create(Scope scope, Operand x, DataType DstT, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Cast", scope.makeOpName("Cast")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("DstT", DstT); if (options != null) { @@ -94,7 +94,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 a342009290f..5a68610b28f 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 @@ -64,8 +64,8 @@ public final class Complex extends RawOp implements Operand @Endpoint(describeByClass = true) public static Complex create(Scope scope, Operand real, Operand imag, DataType Tout) { OperationBuilder opBuilder = scope.env().opBuilder("Complex", scope.makeOpName("Complex")); - opBuilder.addInput(real.asOutput()); - opBuilder.addInput(imag.asOutput()); + opBuilder.addInput(real.asOutput(scope)); + opBuilder.addInput(imag.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tout", Tout); return new Complex(opBuilder.build()); @@ -78,7 +78,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 2130c1279a6..59f0684d400 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 @@ -56,7 +56,7 @@ public final class ToBool extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ToBool create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("ToBool", scope.makeOpName("ToBool")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ToBool(opBuilder.build()); } @@ -68,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8a89bc639ba..33caeb9e658 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 @@ -50,10 +50,10 @@ public final class BoostedTreesAggregateStats extends RawOp implements Operand nodeIds, Operand gradients, Operand hessians, Operand feature, Long maxSplits, Long numBuckets) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesAggregateStats", scope.makeOpName("BoostedTreesAggregateStats")); - opBuilder.addInput(nodeIds.asOutput()); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(hessians.asOutput()); - opBuilder.addInput(feature.asOutput()); + opBuilder.addInput(nodeIds.asOutput(scope)); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(hessians.asOutput(scope)); + opBuilder.addInput(feature.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("max_splits", maxSplits); opBuilder.setAttr("num_buckets", numBuckets); @@ -69,7 +69,7 @@ public Output statsSummary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return statsSummary; } 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 1af298bc2c1..93e735ed33c 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 @@ -52,8 +52,8 @@ public final class BoostedTreesBucketize extends RawOp implements Iterable> floatValues, Iterable> bucketBoundaries) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesBucketize", scope.makeOpName("BoostedTreesBucketize")); - opBuilder.addInputList(Operands.asOutputs(floatValues)); - opBuilder.addInputList(Operands.asOutputs(bucketBoundaries)); + opBuilder.addInputList(Operands.asOutputs(scope, floatValues)); + opBuilder.addInputList(Operands.asOutputs(scope, bucketBoundaries)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesBucketize(opBuilder.build()); } 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 20de330cd53..fa794603578 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 @@ -79,12 +79,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(nodeIdRange.asOutput()); - opBuilder.addInput(statsSummary.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(treeComplexity.asOutput()); - opBuilder.addInput(minNodeWeight.asOutput()); + opBuilder.addInput(nodeIdRange.asOutput(scope)); + opBuilder.addInput(statsSummary.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(treeComplexity.asOutput(scope)); + opBuilder.addInput(minNodeWeight.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); if (options != null) { 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 69fe748a5cd..3873bc4dceb 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 @@ -62,14 +62,14 @@ public final class BoostedTreesCalculateBestFeatureSplitV2 extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesCalculateBestFeatureSplitV2 create(Scope scope, Operand nodeIdRange, Iterable> statsSummariesList, Operand splitTypes, Operand candidateFeatureIds, Operand l1, Operand l2, Operand treeComplexity, Operand minNodeWeight, Long logitsDimension) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCalculateBestFeatureSplitV2", scope.makeOpName("BoostedTreesCalculateBestFeatureSplitV2")); - opBuilder.addInput(nodeIdRange.asOutput()); - opBuilder.addInputList(Operands.asOutputs(statsSummariesList)); - opBuilder.addInput(splitTypes.asOutput()); - opBuilder.addInput(candidateFeatureIds.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(treeComplexity.asOutput()); - opBuilder.addInput(minNodeWeight.asOutput()); + opBuilder.addInput(nodeIdRange.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, statsSummariesList)); + opBuilder.addInput(splitTypes.asOutput(scope)); + opBuilder.addInput(candidateFeatureIds.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(treeComplexity.asOutput(scope)); + opBuilder.addInput(minNodeWeight.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); return new BoostedTreesCalculateBestFeatureSplitV2(opBuilder.build()); 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 fdf87628efb..c033e8951f0 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 @@ -61,12 +61,12 @@ public final class BoostedTreesCalculateBestGainsPerFeature extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(nodeIdRange.asOutput()); - opBuilder.addInputList(Operands.asOutputs(statsSummaryList)); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(treeComplexity.asOutput()); - opBuilder.addInput(minNodeWeight.asOutput()); + opBuilder.addInput(nodeIdRange.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, statsSummaryList)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(treeComplexity.asOutput(scope)); + opBuilder.addInput(minNodeWeight.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("max_splits", maxSplits); return new BoostedTreesCalculateBestGainsPerFeature(opBuilder.build()); 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 e1af20a1f14..82e9e00e143 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 @@ -47,11 +47,11 @@ public final class BoostedTreesCenterBias extends RawOp implements Operand treeEnsembleHandle, Operand meanGradients, Operand meanHessians, Operand l1, Operand l2) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCenterBias", scope.makeOpName("BoostedTreesCenterBias")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInput(meanGradients.asOutput()); - opBuilder.addInput(meanHessians.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInput(meanGradients.asOutput(scope)); + opBuilder.addInput(meanHessians.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesCenterBias(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output continueCentering() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return continueCentering; } 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 c0c9075f784..57e2fb0d4e2 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 @@ -44,9 +44,9 @@ public final class BoostedTreesCreateEnsemble extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesCreateEnsemble create(Scope scope, Operand treeEnsembleHandle, Operand stampToken, Operand treeEnsembleSerialized) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCreateEnsemble", scope.makeOpName("BoostedTreesCreateEnsemble")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInput(stampToken.asOutput()); - opBuilder.addInput(treeEnsembleSerialized.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInput(stampToken.asOutput(scope)); + opBuilder.addInput(treeEnsembleSerialized.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesCreateEnsemble(opBuilder.build()); } 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 d0ac0b0224d..ff0fb85b925 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 @@ -64,9 +64,9 @@ private Options() { @Endpoint(describeByClass = true) public static BoostedTreesCreateQuantileStreamResource create(Scope scope, Operand quantileStreamResourceHandle, Operand epsilon, Operand numStreams, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesCreateQuantileStreamResource", scope.makeOpName("BoostedTreesCreateQuantileStreamResource")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(numStreams.asOutput()); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(numStreams.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 8780ca997bd..2280be3a1c1 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 @@ -46,9 +46,9 @@ public final class BoostedTreesDeserializeEnsemble extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesDeserializeEnsemble create(Scope scope, Operand treeEnsembleHandle, Operand stampToken, Operand treeEnsembleSerialized) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesDeserializeEnsemble", scope.makeOpName("BoostedTreesDeserializeEnsemble")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInput(stampToken.asOutput()); - opBuilder.addInput(treeEnsembleSerialized.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInput(stampToken.asOutput(scope)); + opBuilder.addInput(treeEnsembleSerialized.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesDeserializeEnsemble(opBuilder.build()); } 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 d297ccebdb2..8f2f7b8aa41 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 @@ -106,7 +106,7 @@ public Output resource() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) resource; } 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 4902a23c9eb..336ad889335 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 @@ -52,8 +52,8 @@ public final class BoostedTreesExampleDebugOutputs extends RawOp implements Oper @Endpoint(describeByClass = true) public static BoostedTreesExampleDebugOutputs create(Scope scope, Operand treeEnsembleHandle, Iterable> bucketizedFeatures, Long logitsDimension) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesExampleDebugOutputs", scope.makeOpName("BoostedTreesExampleDebugOutputs")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures)); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, bucketizedFeatures)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); return new BoostedTreesExampleDebugOutputs(opBuilder.build()); @@ -67,7 +67,7 @@ public Output examplesDebugOutputsSerialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return examplesDebugOutputsSerialized; } 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 d520766a041..593dc4f0722 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 @@ -50,7 +50,7 @@ public final class BoostedTreesFlushQuantileSummaries extends RawOp implements I @Endpoint(describeByClass = true) public static BoostedTreesFlushQuantileSummaries create(Scope scope, Operand quantileStreamResourceHandle, Long numFeatures) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesFlushQuantileSummaries", scope.makeOpName("BoostedTreesFlushQuantileSummaries")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_features", numFeatures); return new BoostedTreesFlushQuantileSummaries(opBuilder.build()); 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 06ef0f63bfc..ced2a5449eb 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 @@ -43,7 +43,7 @@ public final class BoostedTreesGetEnsembleStates extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesGetEnsembleStates create(Scope scope, Operand treeEnsembleHandle) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesGetEnsembleStates", scope.makeOpName("BoostedTreesGetEnsembleStates")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 6bdbd64dd7a..f8e750db50a 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 @@ -51,9 +51,9 @@ public final class BoostedTreesMakeQuantileSummaries extends RawOp implements It @Endpoint(describeByClass = true) public static BoostedTreesMakeQuantileSummaries create(Scope scope, Iterable> floatValues, Operand exampleWeights, Operand epsilon) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesMakeQuantileSummaries", scope.makeOpName("BoostedTreesMakeQuantileSummaries")); - opBuilder.addInputList(Operands.asOutputs(floatValues)); - opBuilder.addInput(exampleWeights.asOutput()); - opBuilder.addInput(epsilon.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, floatValues)); + opBuilder.addInput(exampleWeights.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesMakeQuantileSummaries(opBuilder.build()); } 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 ed276f08b20..9832134f856 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 @@ -51,10 +51,10 @@ public final class BoostedTreesMakeStatsSummary extends RawOp implements Operand @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(nodeIds.asOutput()); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(hessians.asOutput()); - opBuilder.addInputList(Operands.asOutputs(bucketizedFeaturesList)); + opBuilder.addInput(nodeIds.asOutput(scope)); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(hessians.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, bucketizedFeaturesList)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("max_splits", maxSplits); opBuilder.setAttr("num_buckets", numBuckets); @@ -69,7 +69,7 @@ public Output statsSummary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return statsSummary; } 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 fc12d1cc2ed..10d7f4d1816 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 @@ -51,8 +51,8 @@ public final class BoostedTreesPredict extends RawOp implements Operand treeEnsembleHandle, Iterable> bucketizedFeatures, Long logitsDimension) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesPredict", scope.makeOpName("BoostedTreesPredict")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures)); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, bucketizedFeatures)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); return new BoostedTreesPredict(opBuilder.build()); @@ -66,7 +66,7 @@ public Output logits() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return logits; } 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 08bda03ea19..7b2dd36851b 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 @@ -47,8 +47,8 @@ public final class BoostedTreesQuantileStreamResourceAddSummaries extends RawOp @Endpoint(describeByClass = true) public static BoostedTreesQuantileStreamResourceAddSummaries create(Scope scope, Operand quantileStreamResourceHandle, Iterable> summaries) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceAddSummaries", scope.makeOpName("BoostedTreesQuantileStreamResourceAddSummaries")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(summaries)); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, summaries)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesQuantileStreamResourceAddSummaries(opBuilder.build()); } 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 58850d3e981..88f48b977d6 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 @@ -45,8 +45,8 @@ public final class BoostedTreesQuantileStreamResourceDeserialize extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesQuantileStreamResourceDeserialize create(Scope scope, Operand quantileStreamResourceHandle, Iterable> bucketBoundaries) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceDeserialize", scope.makeOpName("BoostedTreesQuantileStreamResourceDeserialize")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(bucketBoundaries)); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, bucketBoundaries)); opBuilder = scope.applyControlDependencies(opBuilder); return new BoostedTreesQuantileStreamResourceDeserialize(opBuilder.build()); } 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 4f3c4f561b8..12215d59d24 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 @@ -69,8 +69,8 @@ private Options() { @Endpoint(describeByClass = true) public static BoostedTreesQuantileStreamResourceFlush create(Scope scope, Operand quantileStreamResourceHandle, Operand numBuckets, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceFlush", scope.makeOpName("BoostedTreesQuantileStreamResourceFlush")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); - opBuilder.addInput(numBuckets.asOutput()); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); + opBuilder.addInput(numBuckets.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 711e3f6acd6..0d7809780ba 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 @@ -49,7 +49,7 @@ public final class BoostedTreesQuantileStreamResourceGetBucketBoundaries extends @Endpoint(describeByClass = true) public static BoostedTreesQuantileStreamResourceGetBucketBoundaries create(Scope scope, Operand quantileStreamResourceHandle, Long numFeatures) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesQuantileStreamResourceGetBucketBoundaries", scope.makeOpName("BoostedTreesQuantileStreamResourceGetBucketBoundaries")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_features", numFeatures); return new BoostedTreesQuantileStreamResourceGetBucketBoundaries(opBuilder.build()); 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 72898030449..9cc824da035 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 @@ -106,7 +106,7 @@ public Output resource() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) resource; } 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 8bf4df8541e..e28340862cf 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 @@ -43,7 +43,7 @@ public final class BoostedTreesSerializeEnsemble extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesSerializeEnsemble create(Scope scope, Operand treeEnsembleHandle) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesSerializeEnsemble", scope.makeOpName("BoostedTreesSerializeEnsemble")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 23ef1f4f01e..192be34efdd 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 @@ -58,12 +58,12 @@ public final class BoostedTreesSparseAggregateStats extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesSparseAggregateStats create(Scope scope, Operand nodeIds, Operand gradients, Operand hessians, Operand featureIndices, Operand featureValues, Operand featureShape, Long maxSplits, Long numBuckets) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesSparseAggregateStats", scope.makeOpName("BoostedTreesSparseAggregateStats")); - opBuilder.addInput(nodeIds.asOutput()); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(hessians.asOutput()); - opBuilder.addInput(featureIndices.asOutput()); - opBuilder.addInput(featureValues.asOutput()); - opBuilder.addInput(featureShape.asOutput()); + opBuilder.addInput(nodeIds.asOutput(scope)); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(hessians.asOutput(scope)); + opBuilder.addInput(featureIndices.asOutput(scope)); + opBuilder.addInput(featureValues.asOutput(scope)); + opBuilder.addInput(featureShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("max_splits", maxSplits); opBuilder.setAttr("num_buckets", numBuckets); 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 48afc375b67..e7e2c5ef83e 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 @@ -81,14 +81,14 @@ private Options() { @Endpoint(describeByClass = true) public static BoostedTreesSparseCalculateBestFeatureSplit create(Scope scope, Operand nodeIdRange, Operand statsSummaryIndices, 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")); - opBuilder.addInput(nodeIdRange.asOutput()); - opBuilder.addInput(statsSummaryIndices.asOutput()); - opBuilder.addInput(statsSummaryValues.asOutput()); - opBuilder.addInput(statsSummaryShape.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(treeComplexity.asOutput()); - opBuilder.addInput(minNodeWeight.asOutput()); + opBuilder.addInput(nodeIdRange.asOutput(scope)); + opBuilder.addInput(statsSummaryIndices.asOutput(scope)); + opBuilder.addInput(statsSummaryValues.asOutput(scope)); + opBuilder.addInput(statsSummaryShape.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(treeComplexity.asOutput(scope)); + opBuilder.addInput(minNodeWeight.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); if (options != null) { 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 2dd38c35c59..a3897fb4171 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 @@ -56,10 +56,10 @@ public final class BoostedTreesTrainingPredict extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInput(cachedTreeIds.asOutput()); - opBuilder.addInput(cachedNodeIds.asOutput()); - opBuilder.addInputList(Operands.asOutputs(bucketizedFeatures)); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInput(cachedTreeIds.asOutput(scope)); + opBuilder.addInput(cachedNodeIds.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, bucketizedFeatures)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("logits_dimension", logitsDimension); return new BoostedTreesTrainingPredict(opBuilder.build()); 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 05f2d9c1357..68ce111adff 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 @@ -62,15 +62,15 @@ public final class BoostedTreesUpdateEnsemble extends RawOp { @Endpoint(describeByClass = true) public static BoostedTreesUpdateEnsemble create(Scope scope, Operand treeEnsembleHandle, Operand featureIds, Iterable> nodeIds, Iterable> gains, Iterable> thresholds, Iterable> leftNodeContribs, Iterable> rightNodeContribs, Operand maxDepth, Operand learningRate, Long pruningMode) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesUpdateEnsemble", scope.makeOpName("BoostedTreesUpdateEnsemble")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInput(featureIds.asOutput()); - opBuilder.addInputList(Operands.asOutputs(nodeIds)); - opBuilder.addInputList(Operands.asOutputs(gains)); - opBuilder.addInputList(Operands.asOutputs(thresholds)); - opBuilder.addInputList(Operands.asOutputs(leftNodeContribs)); - opBuilder.addInputList(Operands.asOutputs(rightNodeContribs)); - opBuilder.addInput(maxDepth.asOutput()); - opBuilder.addInput(learningRate.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInput(featureIds.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, nodeIds)); + opBuilder.addInputList(Operands.asOutputs(scope, gains)); + opBuilder.addInputList(Operands.asOutputs(scope, thresholds)); + opBuilder.addInputList(Operands.asOutputs(scope, leftNodeContribs)); + opBuilder.addInputList(Operands.asOutputs(scope, rightNodeContribs)); + opBuilder.addInput(maxDepth.asOutput(scope)); + opBuilder.addInput(learningRate.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("pruning_mode", pruningMode); return new BoostedTreesUpdateEnsemble(opBuilder.build()); 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 0e7c81ed3a1..4e8aa0b698f 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 @@ -85,18 +85,18 @@ private Options() { @Endpoint(describeByClass = true) public static BoostedTreesUpdateEnsembleV2 create(Scope scope, Operand treeEnsembleHandle, Iterable> featureIds, Iterable> dimensionIds, Iterable> nodeIds, Iterable> gains, Iterable> thresholds, Iterable> leftNodeContribs, Iterable> rightNodeContribs, Iterable> splitTypes, Operand maxDepth, Operand learningRate, Operand pruningMode, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BoostedTreesUpdateEnsembleV2", scope.makeOpName("BoostedTreesUpdateEnsembleV2")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(featureIds)); - opBuilder.addInputList(Operands.asOutputs(dimensionIds)); - opBuilder.addInputList(Operands.asOutputs(nodeIds)); - opBuilder.addInputList(Operands.asOutputs(gains)); - opBuilder.addInputList(Operands.asOutputs(thresholds)); - opBuilder.addInputList(Operands.asOutputs(leftNodeContribs)); - opBuilder.addInputList(Operands.asOutputs(rightNodeContribs)); - opBuilder.addInputList(Operands.asOutputs(splitTypes)); - opBuilder.addInput(maxDepth.asOutput()); - opBuilder.addInput(learningRate.asOutput()); - opBuilder.addInput(pruningMode.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, featureIds)); + opBuilder.addInputList(Operands.asOutputs(scope, dimensionIds)); + opBuilder.addInputList(Operands.asOutputs(scope, nodeIds)); + opBuilder.addInputList(Operands.asOutputs(scope, gains)); + opBuilder.addInputList(Operands.asOutputs(scope, thresholds)); + opBuilder.addInputList(Operands.asOutputs(scope, leftNodeContribs)); + opBuilder.addInputList(Operands.asOutputs(scope, rightNodeContribs)); + opBuilder.addInputList(Operands.asOutputs(scope, splitTypes)); + opBuilder.addInput(maxDepth.asOutput(scope)); + opBuilder.addInput(learningRate.asOutput(scope)); + opBuilder.addInput(pruningMode.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 f7f78393822..1c8ff4e977a 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 @@ -42,7 +42,7 @@ public final class IsBoostedTreesEnsembleInitialized extends RawOp implements Op @Endpoint(describeByClass = true) public static IsBoostedTreesEnsembleInitialized create(Scope scope, Operand treeEnsembleHandle) { OperationBuilder opBuilder = scope.env().opBuilder("IsBoostedTreesEnsembleInitialized", scope.makeOpName("IsBoostedTreesEnsembleInitialized")); - opBuilder.addInput(treeEnsembleHandle.asOutput()); + opBuilder.addInput(treeEnsembleHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IsBoostedTreesEnsembleInitialized(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output isInitialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return isInitialized; } 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 6561f2d1eea..f00c788ded3 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 @@ -44,7 +44,7 @@ public final class IsBoostedTreesQuantileStreamResourceInitialized extends RawOp @Endpoint(describeByClass = true) public static IsBoostedTreesQuantileStreamResourceInitialized create(Scope scope, Operand quantileStreamResourceHandle) { OperationBuilder opBuilder = scope.env().opBuilder("IsBoostedTreesQuantileStreamResourceInitialized", scope.makeOpName("IsBoostedTreesQuantileStreamResourceInitialized")); - opBuilder.addInput(quantileStreamResourceHandle.asOutput()); + opBuilder.addInput(quantileStreamResourceHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IsBoostedTreesQuantileStreamResourceInitialized(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output isInitialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return isInitialized; } 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 acca1abe88b..a55f142c9bc 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Adjust the contrast of one or more images. @@ -58,8 +57,8 @@ public final class AdjustContrast extends RawOp implements Op @Endpoint(describeByClass = true) public static AdjustContrast create(Scope scope, Operand images, Operand contrastFactor) { OperationBuilder opBuilder = scope.env().opBuilder("AdjustContrastv2", scope.makeOpName("AdjustContrast")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(contrastFactor.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(contrastFactor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AdjustContrast(opBuilder.build()); } @@ -72,7 +71,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 39d96bec97e..6652f17fe35 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Adjust the hue of one or more images. @@ -55,8 +54,8 @@ public final class AdjustHue extends RawOp implements Operand @Endpoint(describeByClass = true) public static AdjustHue create(Scope scope, Operand images, Operand delta) { OperationBuilder opBuilder = scope.env().opBuilder("AdjustHue", scope.makeOpName("AdjustHue")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AdjustHue(opBuilder.build()); } @@ -69,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3fa15fc4716..6d6627aaf88 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Adjust the saturation of one or more images. @@ -55,8 +54,8 @@ public final class AdjustSaturation extends RawOp implements @Endpoint(describeByClass = true) public static AdjustSaturation create(Scope scope, Operand images, Operand scale) { OperationBuilder opBuilder = scope.env().opBuilder("AdjustSaturation", scope.makeOpName("AdjustSaturation")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(scale.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(scale.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AdjustSaturation(opBuilder.build()); } @@ -69,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1f1926163fc..0a9dded08a5 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 @@ -104,12 +104,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(boxes.asOutput()); - opBuilder.addInput(scores.asOutput()); - opBuilder.addInput(maxOutputSizePerClass.asOutput()); - opBuilder.addInput(maxTotalSize.asOutput()); - opBuilder.addInput(iouThreshold.asOutput()); - opBuilder.addInput(scoreThreshold.asOutput()); + opBuilder.addInput(boxes.asOutput(scope)); + opBuilder.addInput(scores.asOutput(scope)); + opBuilder.addInput(maxOutputSizePerClass.asOutput(scope)); + opBuilder.addInput(maxTotalSize.asOutput(scope)); + opBuilder.addInput(iouThreshold.asOutput(scope)); + opBuilder.addInput(scoreThreshold.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 19c93f95d4b..d0baeda5658 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Extracts crops from the input image tensor and resizes them. @@ -110,10 +109,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(image.asOutput()); - opBuilder.addInput(boxes.asOutput()); - opBuilder.addInput(boxInd.asOutput()); - opBuilder.addInput(cropSize.asOutput()); + opBuilder.addInput(image.asOutput(scope)); + opBuilder.addInput(boxes.asOutput(scope)); + opBuilder.addInput(boxInd.asOutput(scope)); + opBuilder.addInput(cropSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -152,7 +151,7 @@ public Output crops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return crops; } 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 e29c2a2c159..95b9932ff6a 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of the crop_and_resize op wrt the input boxes tensor. @@ -81,10 +80,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(grads.asOutput()); - opBuilder.addInput(image.asOutput()); - opBuilder.addInput(boxes.asOutput()); - opBuilder.addInput(boxInd.asOutput()); + opBuilder.addInput(grads.asOutput(scope)); + opBuilder.addInput(image.asOutput(scope)); + opBuilder.addInput(boxes.asOutput(scope)); + opBuilder.addInput(boxInd.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -112,7 +111,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 30b7f0b7ddf..e04f5519137 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of the crop_and_resize op wrt the input image tensor. @@ -86,10 +85,10 @@ private Options() { @Endpoint(describeByClass = true) public static CropAndResizeGradImage create(Scope scope, Operand grads, Operand boxes, Operand boxInd, Operand imageSize, DataType T, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("CropAndResizeGradImage", scope.makeOpName("CropAndResizeGradImage")); - opBuilder.addInput(grads.asOutput()); - opBuilder.addInput(boxes.asOutput()); - opBuilder.addInput(boxInd.asOutput()); - opBuilder.addInput(imageSize.asOutput()); + opBuilder.addInput(grads.asOutput(scope)); + opBuilder.addInput(boxes.asOutput(scope)); + opBuilder.addInput(boxInd.asOutput(scope)); + opBuilder.addInput(imageSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("T", T); if (options != null) { @@ -118,7 +117,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c7191af839a..4059611ae43 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 @@ -143,8 +143,8 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeAndCropJpeg create(Scope scope, Operand contents, Operand cropWindow, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeAndCropJpeg", scope.makeOpName("DecodeAndCropJpeg")); - opBuilder.addInput(contents.asOutput()); - opBuilder.addInput(cropWindow.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); + opBuilder.addInput(cropWindow.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -228,7 +228,7 @@ public Output image() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return image; } 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 23ade8ab9e9..07dbdc7855e 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 @@ -78,7 +78,7 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeBmp create(Scope scope, Operand contents, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeBmp", scope.makeOpName("DecodeBmp")); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -105,7 +105,7 @@ public Output image() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return image; } 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 c61b81f21c2..5f47c3482ff 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 @@ -53,7 +53,7 @@ public final class DecodeGif extends RawOp implements Operand { @Endpoint(describeByClass = true) public static DecodeGif create(Scope scope, Operand contents) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeGif", scope.makeOpName("DecodeGif")); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DecodeGif(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output image() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return image; } 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 4b30ea87bec..4a76c42ca80 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 @@ -141,7 +141,7 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeJpeg create(Scope scope, Operand contents, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeJpeg", scope.makeOpName("DecodeJpeg")); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -225,7 +225,7 @@ public Output image() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return image; } 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 6ff272fc487..68b85cc779e 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TString; import org.tensorflow.types.TUint8; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Decode a PNG-encoded image to a uint8 or uint16 tensor. @@ -94,7 +93,7 @@ private Options() { @Endpoint(describeByClass = true) public static DecodePng create(Scope scope, Operand contents, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodePng", scope.makeOpName("DecodePng")); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -135,7 +134,7 @@ public Output image() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return image; } 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 08d460a2985..05dbe8f6e26 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Draw bounding boxes on a batch of images. @@ -62,9 +61,9 @@ public final class DrawBoundingBoxes extends RawOp implements @Endpoint(describeByClass = true) public static DrawBoundingBoxes create(Scope scope, Operand images, Operand boxes, Operand colors) { OperationBuilder opBuilder = scope.env().opBuilder("DrawBoundingBoxesV2", scope.makeOpName("DrawBoundingBoxes")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(boxes.asOutput()); - opBuilder.addInput(colors.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(boxes.asOutput(scope)); + opBuilder.addInput(colors.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DrawBoundingBoxes(opBuilder.build()); } @@ -78,7 +77,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a08e1d0fbc8..aab7d0bfc88 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 @@ -163,7 +163,7 @@ private Options() { @Endpoint(describeByClass = true) public static EncodeJpeg create(Scope scope, Operand image, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EncodeJpeg", scope.makeOpName("EncodeJpeg")); - opBuilder.addInput(image.asOutput()); + opBuilder.addInput(image.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -271,7 +271,7 @@ public Output contents() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return contents; } 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 8c9fe1afd49..295630758d7 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 @@ -50,8 +50,8 @@ public final class EncodeJpegVariableQuality extends RawOp implements Operand images, Operand quality) { OperationBuilder opBuilder = scope.env().opBuilder("EncodeJpegVariableQuality", scope.makeOpName("EncodeJpegVariableQuality")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(quality.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(quality.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new EncodeJpegVariableQuality(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output contents() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return contents; } 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 0d01ff0f6f4..6f10fad9ecc 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * PNG-encode an image. @@ -85,7 +84,7 @@ private Options() { @Endpoint(describeByClass = true) public static EncodePng create(Scope scope, Operand image, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EncodePng", scope.makeOpName("EncodePng")); - opBuilder.addInput(image.asOutput()); + opBuilder.addInput(image.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -112,7 +111,7 @@ public Output contents() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return contents; } 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 74ac3be5a05..2f41f806d48 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 @@ -129,9 +129,9 @@ private Options() { @Endpoint(describeByClass = true) public static ExtractGlimpse create(Scope scope, Operand input, Operand size, Operand offsets, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ExtractGlimpse", scope.makeOpName("ExtractGlimpse")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(size.asOutput()); - opBuilder.addInput(offsets.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); + opBuilder.addInput(offsets.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -195,7 +195,7 @@ public Output glimpse() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return glimpse; } 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 59b3af03fbb..834b298369d 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 @@ -56,7 +56,7 @@ public final class ExtractImagePatches extends RawOp implements @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(images.asOutput()); + opBuilder.addInput(images.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizesArray = new long[ksizes.size()]; for (int i = 0; i < ksizesArray.length; ++i) { @@ -88,7 +88,7 @@ public Output patches() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return patches; } 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 3570c3a6dda..07b0d8b3576 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Extract the shape information of a JPEG-encoded image. @@ -53,7 +52,7 @@ public final class ExtractJpegShape extends RawOp implements @Endpoint(describeByClass = true) public static ExtractJpegShape create(Scope scope, Operand contents, DataType outputType) { OperationBuilder opBuilder = scope.env().opBuilder("ExtractJpegShape", scope.makeOpName("ExtractJpegShape")); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_type", outputType); return new ExtractJpegShape(opBuilder.build()); @@ -79,7 +78,7 @@ public Output imageShape() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return imageShape; } 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 16d71155a66..40abbd7105e 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,13 +82,13 @@ private Options() { @Endpoint(describeByClass = true) public static GenerateBoundingBoxProposals create(Scope scope, Operand scores, Operand bboxDeltas, Operand imageInfo, Operand anchors, Operand nmsThreshold, Operand preNmsTopn, Operand minSize, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("GenerateBoundingBoxProposals", scope.makeOpName("GenerateBoundingBoxProposals")); - opBuilder.addInput(scores.asOutput()); - opBuilder.addInput(bboxDeltas.asOutput()); - opBuilder.addInput(imageInfo.asOutput()); - opBuilder.addInput(anchors.asOutput()); - opBuilder.addInput(nmsThreshold.asOutput()); - opBuilder.addInput(preNmsTopn.asOutput()); - opBuilder.addInput(minSize.asOutput()); + opBuilder.addInput(scores.asOutput(scope)); + opBuilder.addInput(bboxDeltas.asOutput(scope)); + opBuilder.addInput(imageInfo.asOutput(scope)); + opBuilder.addInput(anchors.asOutput(scope)); + opBuilder.addInput(nmsThreshold.asOutput(scope)); + opBuilder.addInput(preNmsTopn.asOutput(scope)); + opBuilder.addInput(minSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 6a74b96f923..8dc9bc854d4 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Convert one or more images from HSV to RGB. @@ -52,7 +51,7 @@ public final class HsvToRgb extends RawOp implements Operand< @Endpoint(describeByClass = true) public static HsvToRgb create(Scope scope, Operand images) { OperationBuilder opBuilder = scope.env().opBuilder("HSVToRGB", scope.makeOpName("HsvToRgb")); - opBuilder.addInput(images.asOutput()); + opBuilder.addInput(images.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new HsvToRgb(opBuilder.build()); } @@ -65,7 +64,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 478d41f7943..9c77d95fc79 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Applies the given transform to each of the images. @@ -78,9 +77,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(transforms.asOutput()); - opBuilder.addInput(outputShape.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(transforms.asOutput(scope)); + opBuilder.addInput(outputShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("interpolation", interpolation); if (options != null) { @@ -109,7 +108,7 @@ public Output transformedImages() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return transformedImages; } 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 55eab58c7fc..773cce664c9 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 @@ -50,9 +50,9 @@ public final class NearestNeighbors extends RawOp { @Endpoint(describeByClass = true) public static NearestNeighbors create(Scope scope, Operand points, Operand centers, Operand k) { OperationBuilder opBuilder = scope.env().opBuilder("NearestNeighbors", scope.makeOpName("NearestNeighbors")); - opBuilder.addInput(points.asOutput()); - opBuilder.addInput(centers.asOutput()); - opBuilder.addInput(k.asOutput()); + opBuilder.addInput(points.asOutput(scope)); + opBuilder.addInput(centers.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new NearestNeighbors(opBuilder.build()); } 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 ee83c1d3f06..03e460a39e1 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Greedily selects a subset of bounding boxes in descending order of score, @@ -102,12 +101,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(boxes.asOutput()); - opBuilder.addInput(scores.asOutput()); - opBuilder.addInput(maxOutputSize.asOutput()); - opBuilder.addInput(iouThreshold.asOutput()); - opBuilder.addInput(scoreThreshold.asOutput()); - opBuilder.addInput(softNmsSigma.asOutput()); + opBuilder.addInput(boxes.asOutput(scope)); + opBuilder.addInput(scores.asOutput(scope)); + opBuilder.addInput(maxOutputSize.asOutput(scope)); + opBuilder.addInput(iouThreshold.asOutput(scope)); + opBuilder.addInput(scoreThreshold.asOutput(scope)); + opBuilder.addInput(softNmsSigma.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 97e14206922..ee5566cab42 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 @@ -68,11 +68,11 @@ public final class NonMaxSuppressionWithOverlaps extends RawOp implements Operan @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(overlaps.asOutput()); - opBuilder.addInput(scores.asOutput()); - opBuilder.addInput(maxOutputSize.asOutput()); - opBuilder.addInput(overlapThreshold.asOutput()); - opBuilder.addInput(scoreThreshold.asOutput()); + opBuilder.addInput(overlaps.asOutput(scope)); + opBuilder.addInput(scores.asOutput(scope)); + opBuilder.addInput(maxOutputSize.asOutput(scope)); + opBuilder.addInput(overlapThreshold.asOutput(scope)); + opBuilder.addInput(scoreThreshold.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new NonMaxSuppressionWithOverlaps(opBuilder.build()); } @@ -86,7 +86,7 @@ public Output selectedIndices() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return selectedIndices; } 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 9903ce2c265..3fb44255918 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 @@ -83,10 +83,10 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedResizeBilinear create(Scope scope, Operand images, Operand size, Operand min, Operand max, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedResizeBilinear", scope.makeOpName("QuantizedResizeBilinear")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(size.asOutput()); - opBuilder.addInput(min.asOutput()); - opBuilder.addInput(max.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); + opBuilder.addInput(min.asOutput(scope)); + opBuilder.addInput(max.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 855a60036d9..ed52374d83d 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Randomly crop `image`. @@ -86,8 +85,8 @@ private Options() { @Endpoint(describeByClass = true) public static RandomCrop create(Scope scope, Operand image, Operand size, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomCrop", scope.makeOpName("RandomCrop")); - opBuilder.addInput(image.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(image.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -126,7 +125,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 dd7d7335570..3d35691026d 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Resize `images` to `size` using area interpolation. @@ -81,8 +80,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeArea create(Scope scope, Operand images, Operand size, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeArea", scope.makeOpName("ResizeArea")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -111,7 +110,7 @@ public Output resizedImages() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return resizedImages; } 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 23fa5034437..f59af072e1b 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Resize `images` to `size` using bicubic interpolation. @@ -80,8 +79,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeBicubic create(Scope scope, Operand images, Operand size, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeBicubic", scope.makeOpName("ResizeBicubic")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -120,7 +119,7 @@ public Output resizedImages() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return resizedImages; } 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 d7cc678f8a4..3494bb6f46d 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of bicubic interpolation. @@ -78,8 +77,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeBicubicGrad create(Scope scope, Operand grads, Operand originalImage, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeBicubicGrad", scope.makeOpName("ResizeBicubicGrad")); - opBuilder.addInput(grads.asOutput()); - opBuilder.addInput(originalImage.asOutput()); + opBuilder.addInput(grads.asOutput(scope)); + opBuilder.addInput(originalImage.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -119,7 +118,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fb01887d6f5..dfa4674d755 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Resize `images` to `size` using bilinear interpolation. @@ -80,8 +79,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeBilinear create(Scope scope, Operand images, Operand size, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeBilinear", scope.makeOpName("ResizeBilinear")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -120,7 +119,7 @@ public Output resizedImages() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return resizedImages; } 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 85fb0ff85e6..47ae9c32df9 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of bilinear interpolation. @@ -78,8 +77,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeBilinearGrad create(Scope scope, Operand grads, Operand originalImage, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeBilinearGrad", scope.makeOpName("ResizeBilinearGrad")); - opBuilder.addInput(grads.asOutput()); - opBuilder.addInput(originalImage.asOutput()); + opBuilder.addInput(grads.asOutput(scope)); + opBuilder.addInput(originalImage.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -119,7 +118,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9183dd63544..9ed636036e0 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Resize `images` to `size` using nearest neighbor interpolation. @@ -79,8 +78,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeNearestNeighbor create(Scope scope, Operand images, Operand size, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeNearestNeighbor", scope.makeOpName("ResizeNearestNeighbor")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -119,7 +118,7 @@ public Output resizedImages() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return resizedImages; } 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 c8fb4f704f8..fedb0391be3 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of nearest neighbor interpolation. @@ -78,8 +77,8 @@ private Options() { @Endpoint(describeByClass = true) public static ResizeNearestNeighborGrad create(Scope scope, Operand grads, Operand size, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResizeNearestNeighborGrad", scope.makeOpName("ResizeNearestNeighborGrad")); - opBuilder.addInput(grads.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(grads.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -118,7 +117,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a0fdcc30ff8..4c053a6c673 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Converts one or more images from RGB to HSV. @@ -66,7 +65,7 @@ public final class RgbToHsv extends RawOp implements Operand< @Endpoint(describeByClass = true) public static RgbToHsv create(Scope scope, Operand images) { OperationBuilder opBuilder = scope.env().opBuilder("RGBToHSV", scope.makeOpName("RgbToHsv")); - opBuilder.addInput(images.asOutput()); + opBuilder.addInput(images.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RgbToHsv(opBuilder.build()); } @@ -79,7 +78,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8281880a8b0..f7df9dfa5c0 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Generate a single randomly distorted bounding box for an image. @@ -164,9 +163,9 @@ private Options() { @Endpoint(describeByClass = true) public static SampleDistortedBoundingBox create(Scope scope, Operand imageSize, Operand boundingBoxes, Operand minObjectCovered, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SampleDistortedBoundingBoxV2", scope.makeOpName("SampleDistortedBoundingBox")); - opBuilder.addInput(imageSize.asOutput()); - opBuilder.addInput(boundingBoxes.asOutput()); - opBuilder.addInput(minObjectCovered.asOutput()); + opBuilder.addInput(imageSize.asOutput(scope)); + opBuilder.addInput(boundingBoxes.asOutput(scope)); + opBuilder.addInput(minObjectCovered.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 bd4cc964f2f..4f0d8c54b11 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** */ @@ -77,10 +76,10 @@ private Options() { @Endpoint(describeByClass = true) public static ScaleAndTranslate create(Scope scope, Operand images, Operand size, Operand scale, Operand translation, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ScaleAndTranslate", scope.makeOpName("ScaleAndTranslate")); - opBuilder.addInput(images.asOutput()); - opBuilder.addInput(size.asOutput()); - opBuilder.addInput(scale.asOutput()); - opBuilder.addInput(translation.asOutput()); + opBuilder.addInput(images.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); + opBuilder.addInput(scale.asOutput(scope)); + opBuilder.addInput(translation.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -116,7 +115,7 @@ public Output resizedImages() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return resizedImages; } 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 8ab90449e1f..500875995a1 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -76,10 +75,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(grads.asOutput()); - opBuilder.addInput(originalImage.asOutput()); - opBuilder.addInput(scale.asOutput()); - opBuilder.addInput(translation.asOutput()); + opBuilder.addInput(grads.asOutput(scope)); + opBuilder.addInput(originalImage.asOutput(scope)); + opBuilder.addInput(scale.asOutput(scope)); + opBuilder.addInput(translation.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -115,7 +114,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7abe6aaa1f1..534d54393fd 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 @@ -46,7 +46,7 @@ public final class DecodeBase64 extends RawOp implements Operand { @Endpoint(describeByClass = true) public static DecodeBase64 create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeBase64", scope.makeOpName("DecodeBase64")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DecodeBase64(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 01a55de64ca..ee471060f38 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 @@ -71,7 +71,7 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeCompressed create(Scope scope, Operand bytes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeCompressed", scope.makeOpName("DecodeCompressed")); - opBuilder.addInput(bytes.asOutput()); + opBuilder.addInput(bytes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4825645c0eb..4ef472cbb33 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 @@ -105,8 +105,8 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeCsv create(Scope scope, Operand records, Iterable> recordDefaults, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeCSV", scope.makeOpName("DecodeCsv")); - opBuilder.addInput(records.asOutput()); - opBuilder.addInputList(Operands.asOutputs(recordDefaults)); + opBuilder.addInput(records.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, recordDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 0f5b155c267..2264d948124 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 @@ -51,7 +51,7 @@ public final class DecodeJsonExample extends RawOp implements Operand { @Endpoint(describeByClass = true) public static DecodeJsonExample create(Scope scope, Operand jsonExamples) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeJSONExample", scope.makeOpName("DecodeJsonExample")); - opBuilder.addInput(jsonExamples.asOutput()); + opBuilder.addInput(jsonExamples.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DecodeJsonExample(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output binaryExamples() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return binaryExamples; } 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 137f69f7015..00ddce41d9d 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Reinterpret the bytes of a string as a vector of numbers. @@ -73,8 +72,8 @@ private Options() { @Endpoint(describeByClass = true) public static DecodePaddedRaw create(Scope scope, Operand inputBytes, Operand fixedLength, DataType outType, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodePaddedRaw", scope.makeOpName("DecodePaddedRaw")); - opBuilder.addInput(inputBytes.asOutput()); - opBuilder.addInput(fixedLength.asOutput()); + opBuilder.addInput(inputBytes.asOutput(scope)); + opBuilder.addInput(fixedLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); if (options != null) { @@ -105,7 +104,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d42e9e79d6c..6af22467a5a 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 @@ -70,7 +70,7 @@ private Options() { @Endpoint(describeByClass = true) public static DecodeRaw create(Scope scope, Operand bytes, DataType outType, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DecodeRaw", scope.makeOpName("DecodeRaw")); - opBuilder.addInput(bytes.asOutput()); + opBuilder.addInput(bytes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); if (options != null) { @@ -102,7 +102,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1d80fd486df..cf2fab02a90 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 @@ -92,7 +92,7 @@ public final class DeserializeManySparse extends RawOp { @Endpoint(describeByClass = true) public static DeserializeManySparse create(Scope scope, Operand serializedSparse, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("DeserializeManySparse", scope.makeOpName("DeserializeManySparse")); - opBuilder.addInput(serializedSparse.asOutput()); + opBuilder.addInput(serializedSparse.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new DeserializeManySparse(opBuilder.build()); 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 9dbfbb079b2..958977db5da 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 @@ -70,7 +70,7 @@ private Options() { @Endpoint(describeByClass = true) public static EncodeBase64 create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EncodeBase64", scope.makeOpName("EncodeBase64")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -97,7 +97,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 95c5bfcd712..90f052bd212 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 @@ -171,7 +171,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 a091f665ba4..609b6cbc9f5 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 @@ -194,7 +194,7 @@ public Output readerHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) readerHandle; } 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 af9a6ca34e7..e402d71fe36 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 @@ -115,7 +115,7 @@ public Output readerHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) readerHandle; } 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 aa8c476a0c1..26c647c1e6a 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 @@ -111,7 +111,7 @@ public Output readerHandle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return readerHandle; } 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 5c9d5bcd681..5bf722771a1 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 @@ -47,7 +47,7 @@ public final class MatchingFiles extends RawOp implements Operand { @Endpoint(describeByClass = true) public static MatchingFiles create(Scope scope, Operand pattern) { OperationBuilder opBuilder = scope.env().opBuilder("MatchingFiles", scope.makeOpName("MatchingFiles")); - opBuilder.addInput(pattern.asOutput()); + opBuilder.addInput(pattern.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MatchingFiles(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output filenames() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return filenames; } 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 516ac396ad7..22c2fac5b0f 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 @@ -183,7 +183,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 1c0b73c5cca..7c1ecc98fbb 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 @@ -32,7 +32,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.TString; -import org.tensorflow.types.family.TNumber; /** * Transforms a vector of tf.Example protos (as strings) into typed tensors. @@ -99,12 +98,12 @@ public final class ParseExample extends RawOp { @Endpoint(describeByClass = true) public static ParseExample create(Scope scope, Operand serialized, Operand names, Operand sparseKeys, Operand denseKeys, Operand raggedKeys, Iterable> denseDefaults, Long numSparse, List> sparseTypes, List> raggedValueTypes, List> raggedSplitTypes, List denseShapes) { OperationBuilder opBuilder = scope.env().opBuilder("ParseExampleV2", scope.makeOpName("ParseExample")); - opBuilder.addInput(serialized.asOutput()); - opBuilder.addInput(names.asOutput()); - opBuilder.addInput(sparseKeys.asOutput()); - opBuilder.addInput(denseKeys.asOutput()); - opBuilder.addInput(raggedKeys.asOutput()); - opBuilder.addInputList(Operands.asOutputs(denseDefaults)); + opBuilder.addInput(serialized.asOutput(scope)); + opBuilder.addInput(names.asOutput(scope)); + opBuilder.addInput(sparseKeys.asOutput(scope)); + opBuilder.addInput(denseKeys.asOutput(scope)); + opBuilder.addInput(raggedKeys.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, denseDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_sparse", numSparse); DataType[] sparseTypesArray = new DataType[sparseTypes.size()]; 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 d7d83defcca..b5e3cc250c0 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 @@ -33,7 +33,6 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.TInt64; import org.tensorflow.types.TString; -import org.tensorflow.types.family.TNumber; /** * Transforms a vector of tf.io.SequenceExample protos (as strings) into @@ -155,16 +154,16 @@ private Options() { @Endpoint(describeByClass = true) public static ParseSequenceExample create(Scope scope, Operand serialized, Operand debugName, Operand contextSparseKeys, Operand contextDenseKeys, Operand contextRaggedKeys, Operand featureListSparseKeys, Operand featureListDenseKeys, Operand featureListRaggedKeys, Operand featureListDenseMissingAssumedEmpty, Iterable> contextDenseDefaults, List> contextSparseTypes, List> contextRaggedValueTypes, List> contextRaggedSplitTypes, List> featureListDenseTypes, List> featureListSparseTypes, List> featureListRaggedValueTypes, List> featureListRaggedSplitTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ParseSequenceExampleV2", scope.makeOpName("ParseSequenceExample")); - opBuilder.addInput(serialized.asOutput()); - opBuilder.addInput(debugName.asOutput()); - opBuilder.addInput(contextSparseKeys.asOutput()); - opBuilder.addInput(contextDenseKeys.asOutput()); - opBuilder.addInput(contextRaggedKeys.asOutput()); - opBuilder.addInput(featureListSparseKeys.asOutput()); - opBuilder.addInput(featureListDenseKeys.asOutput()); - opBuilder.addInput(featureListRaggedKeys.asOutput()); - opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput()); - opBuilder.addInputList(Operands.asOutputs(contextDenseDefaults)); + opBuilder.addInput(serialized.asOutput(scope)); + opBuilder.addInput(debugName.asOutput(scope)); + opBuilder.addInput(contextSparseKeys.asOutput(scope)); + opBuilder.addInput(contextDenseKeys.asOutput(scope)); + opBuilder.addInput(contextRaggedKeys.asOutput(scope)); + opBuilder.addInput(featureListSparseKeys.asOutput(scope)); + opBuilder.addInput(featureListDenseKeys.asOutput(scope)); + opBuilder.addInput(featureListRaggedKeys.asOutput(scope)); + opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, contextDenseDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] contextSparseTypesArray = new DataType[contextSparseTypes.size()]; for (int i = 0; i < contextSparseTypesArray.length; ++i) { 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 95e8f11018b..573470e2b92 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 @@ -78,8 +78,8 @@ public final class ParseSingleExample extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(serialized.asOutput()); - opBuilder.addInputList(Operands.asOutputs(denseDefaults)); + opBuilder.addInput(serialized.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, denseDefaults)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_sparse", numSparse); String[] sparseKeysArray = new String[sparseKeys.size()]; 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 4457e099ea8..2f3908de175 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 @@ -124,14 +124,14 @@ private Options() { @Endpoint(describeByClass = true) public static ParseSingleSequenceExample create(Scope scope, Operand serialized, Operand featureListDenseMissingAssumedEmpty, Iterable> contextSparseKeys, Iterable> contextDenseKeys, Iterable> featureListSparseKeys, Iterable> featureListDenseKeys, Iterable> contextDenseDefaults, Operand debugName, List> contextSparseTypes, List> featureListDenseTypes, List> featureListSparseTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ParseSingleSequenceExample", scope.makeOpName("ParseSingleSequenceExample")); - opBuilder.addInput(serialized.asOutput()); - opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput()); - opBuilder.addInputList(Operands.asOutputs(contextSparseKeys)); - opBuilder.addInputList(Operands.asOutputs(contextDenseKeys)); - opBuilder.addInputList(Operands.asOutputs(featureListSparseKeys)); - opBuilder.addInputList(Operands.asOutputs(featureListDenseKeys)); - opBuilder.addInputList(Operands.asOutputs(contextDenseDefaults)); - opBuilder.addInput(debugName.asOutput()); + opBuilder.addInput(serialized.asOutput(scope)); + opBuilder.addInput(featureListDenseMissingAssumedEmpty.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, contextSparseKeys)); + opBuilder.addInputList(Operands.asOutputs(scope, contextDenseKeys)); + opBuilder.addInputList(Operands.asOutputs(scope, featureListSparseKeys)); + opBuilder.addInputList(Operands.asOutputs(scope, featureListDenseKeys)); + opBuilder.addInputList(Operands.asOutputs(scope, contextDenseDefaults)); + opBuilder.addInput(debugName.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] contextSparseTypesArray = new DataType[contextSparseTypes.size()]; for (int i = 0; i < contextSparseTypesArray.length; ++i) { 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 bf2a8e62c2d..1b1f1d7c950 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 @@ -49,7 +49,7 @@ public final class ParseTensor extends RawOp implements Operand @Endpoint(describeByClass = true) public static ParseTensor create(Scope scope, Operand serialized, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("ParseTensor", scope.makeOpName("ParseTensor")); - opBuilder.addInput(serialized.asOutput()); + opBuilder.addInput(serialized.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new ParseTensor(opBuilder.build()); @@ -63,7 +63,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 587994bba0f..2f424d7e328 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 @@ -157,7 +157,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 d2bbb349ec0..da2a1b02b1d 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 @@ -68,7 +68,7 @@ private Options() { @Endpoint(describeByClass = true) public static QueueClose create(Scope scope, Operand handle, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QueueCloseV2", scope.makeOpName("QueueClose")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 d5c2f67db77..6108a7cd5cb 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 @@ -77,7 +77,7 @@ private Options() { @Endpoint(describeByClass = true) public static QueueDequeue create(Scope scope, Operand handle, List> componentTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QueueDequeueV2", scope.makeOpName("QueueDequeue")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] componentTypesArray = new DataType[componentTypes.size()]; for (int i = 0; i < componentTypesArray.length; ++i) { 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 f705e660c1b..a98c216a927 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 @@ -86,8 +86,8 @@ private Options() { @Endpoint(describeByClass = true) public static QueueDequeueMany create(Scope scope, Operand handle, Operand n, List> componentTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QueueDequeueManyV2", scope.makeOpName("QueueDequeueMany")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(n.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(n.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] componentTypesArray = new DataType[componentTypes.size()]; for (int i = 0; i < componentTypesArray.length; ++i) { 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 cd1406318ef..1e7a75ea1cf 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 @@ -90,8 +90,8 @@ private Options() { @Endpoint(describeByClass = true) public static QueueDequeueUpTo create(Scope scope, Operand handle, Operand n, List> componentTypes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QueueDequeueUpToV2", scope.makeOpName("QueueDequeueUpTo")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(n.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(n.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] componentTypesArray = new DataType[componentTypes.size()]; for (int i = 0; i < componentTypesArray.length; ++i) { 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 8bbe35eeada..25be64dc8b4 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 @@ -71,8 +71,8 @@ private Options() { @Endpoint(describeByClass = true) public static QueueEnqueue create(Scope scope, Operand handle, Iterable> components, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QueueEnqueueV2", scope.makeOpName("QueueEnqueue")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(components)); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, components)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 8f973f62260..dc4fe4c7ef4 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 @@ -76,8 +76,8 @@ private Options() { @Endpoint(describeByClass = true) public static QueueEnqueueMany create(Scope scope, Operand handle, Iterable> components, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QueueEnqueueManyV2", scope.makeOpName("QueueEnqueueMany")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInputList(Operands.asOutputs(components)); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, components)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 0326250f5a5..388af69f2ee 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 @@ -46,7 +46,7 @@ public final class QueueIsClosed extends RawOp implements Operand { @Endpoint(describeByClass = true) public static QueueIsClosed create(Scope scope, Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("QueueIsClosedV2", scope.makeOpName("QueueIsClosed")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new QueueIsClosed(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output isClosed() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return isClosed; } 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 cf904be8436..e29a9e90b87 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 @@ -43,7 +43,7 @@ public final class QueueSize extends RawOp implements Operand { @Endpoint(describeByClass = true) public static QueueSize create(Scope scope, Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("QueueSizeV2", scope.makeOpName("QueueSize")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new QueueSize(opBuilder.build()); } @@ -56,7 +56,7 @@ public Output size() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return size; } 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 ced52fc58cd..751fcae2f64 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 @@ -234,7 +234,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 9ba806c69ae..e8adea370a9 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 @@ -43,7 +43,7 @@ public final class ReadFile extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ReadFile create(Scope scope, Operand filename) { OperationBuilder opBuilder = scope.env().opBuilder("ReadFile", scope.makeOpName("ReadFile")); - opBuilder.addInput(filename.asOutput()); + opBuilder.addInput(filename.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReadFile(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output contents() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return contents; } 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 51ec23956fb..bb9ad57ab6d 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 @@ -46,7 +46,7 @@ public final class ReaderNumRecordsProduced extends RawOp implements Operand readerHandle) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderNumRecordsProducedV2", scope.makeOpName("ReaderNumRecordsProduced")); - opBuilder.addInput(readerHandle.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReaderNumRecordsProduced(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output recordsProduced() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return recordsProduced; } 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 848f1602cb3..6670c4bb800 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 @@ -43,7 +43,7 @@ public final class ReaderNumWorkUnitsCompleted extends RawOp implements Operand< @Endpoint(describeByClass = true) public static ReaderNumWorkUnitsCompleted create(Scope scope, Operand readerHandle) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderNumWorkUnitsCompletedV2", scope.makeOpName("ReaderNumWorkUnitsCompleted")); - opBuilder.addInput(readerHandle.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReaderNumWorkUnitsCompleted(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output unitsCompleted() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return unitsCompleted; } 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 33e1e7135e5..3d99b69d1a4 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 @@ -48,8 +48,8 @@ public final class ReaderRead extends RawOp { @Endpoint(describeByClass = true) public static ReaderRead create(Scope scope, Operand readerHandle, Operand queueHandle) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderReadV2", scope.makeOpName("ReaderRead")); - opBuilder.addInput(readerHandle.asOutput()); - opBuilder.addInput(queueHandle.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); + opBuilder.addInput(queueHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReaderRead(opBuilder.build()); } 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 897ca83dc9f..a0050f53aa2 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 @@ -51,9 +51,9 @@ public final class ReaderReadUpTo extends RawOp { @Endpoint(describeByClass = true) public static ReaderReadUpTo create(Scope scope, Operand readerHandle, Operand queueHandle, Operand numRecords) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderReadUpToV2", scope.makeOpName("ReaderReadUpTo")); - opBuilder.addInput(readerHandle.asOutput()); - opBuilder.addInput(queueHandle.asOutput()); - opBuilder.addInput(numRecords.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); + opBuilder.addInput(queueHandle.asOutput(scope)); + opBuilder.addInput(numRecords.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReaderReadUpTo(opBuilder.build()); } 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 f99a25a836a..30fb72bdd6b 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 @@ -41,7 +41,7 @@ public final class ReaderReset extends RawOp { @Endpoint(describeByClass = true) public static ReaderReset create(Scope scope, Operand readerHandle) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderResetV2", scope.makeOpName("ReaderReset")); - opBuilder.addInput(readerHandle.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 359c4d63284..2f111309401 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 @@ -47,8 +47,8 @@ public final class ReaderRestoreState extends RawOp { @Endpoint(describeByClass = true) public static ReaderRestoreState create(Scope scope, Operand readerHandle, Operand state) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderRestoreStateV2", scope.makeOpName("ReaderRestoreState")); - opBuilder.addInput(readerHandle.asOutput()); - opBuilder.addInput(state.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); + opBuilder.addInput(state.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReaderRestoreState(opBuilder.build()); } 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 d10ce99d2a8..5438d8981ea 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 @@ -46,7 +46,7 @@ public final class ReaderSerializeState extends RawOp implements Operand readerHandle) { OperationBuilder opBuilder = scope.env().opBuilder("ReaderSerializeStateV2", scope.makeOpName("ReaderSerializeState")); - opBuilder.addInput(readerHandle.asOutput()); + opBuilder.addInput(readerHandle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReaderSerializeState(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output state() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return state; } 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 5cb65e873cc..7068f84a11f 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 @@ -60,9 +60,9 @@ public final class SerializeManySparse extends RawOp implements @Endpoint(describeByClass = true) public static SerializeManySparse create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("SerializeManySparse", scope.makeOpName("SerializeManySparse")); - opBuilder.addInput(sparseIndices.asOutput()); - opBuilder.addInput(sparseValues.asOutput()); - opBuilder.addInput(sparseShape.asOutput()); + opBuilder.addInput(sparseIndices.asOutput(scope)); + opBuilder.addInput(sparseValues.asOutput(scope)); + opBuilder.addInput(sparseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new SerializeManySparse(opBuilder.build()); @@ -89,7 +89,7 @@ public Output serializedSparse() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return serializedSparse; } 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 d97317b00d4..6bd707aa17e 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 @@ -52,9 +52,9 @@ public final class SerializeSparse extends RawOp implements Ope @Endpoint(describeByClass = true) public static SerializeSparse create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("SerializeSparse", scope.makeOpName("SerializeSparse")); - opBuilder.addInput(sparseIndices.asOutput()); - opBuilder.addInput(sparseValues.asOutput()); - opBuilder.addInput(sparseShape.asOutput()); + opBuilder.addInput(sparseIndices.asOutput(scope)); + opBuilder.addInput(sparseValues.asOutput(scope)); + opBuilder.addInput(sparseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new SerializeSparse(opBuilder.build()); @@ -81,7 +81,7 @@ public Output serializedSparse() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return serializedSparse; } 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 07935a57d3f..348fe6e5a70 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 @@ -44,7 +44,7 @@ public final class SerializeTensor extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SerializeTensor create(Scope scope, Operand tensor) { OperationBuilder opBuilder = scope.env().opBuilder("SerializeTensor", scope.makeOpName("SerializeTensor")); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SerializeTensor(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output serialized() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return serialized; } 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 3febe213066..fdd4e0cb342 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 @@ -48,9 +48,9 @@ public final class ShardedFilename extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ShardedFilename create(Scope scope, Operand basename, Operand shard, Operand numShards) { OperationBuilder opBuilder = scope.env().opBuilder("ShardedFilename", scope.makeOpName("ShardedFilename")); - opBuilder.addInput(basename.asOutput()); - opBuilder.addInput(shard.asOutput()); - opBuilder.addInput(numShards.asOutput()); + opBuilder.addInput(basename.asOutput(scope)); + opBuilder.addInput(shard.asOutput(scope)); + opBuilder.addInput(numShards.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ShardedFilename(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output filename() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return filename; } 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 4c414afa0a4..b651b1a614f 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 @@ -45,8 +45,8 @@ public final class ShardedFilespec extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ShardedFilespec create(Scope scope, Operand basename, Operand numShards) { OperationBuilder opBuilder = scope.env().opBuilder("ShardedFilespec", scope.makeOpName("ShardedFilespec")); - opBuilder.addInput(basename.asOutput()); - opBuilder.addInput(numShards.asOutput()); + opBuilder.addInput(basename.asOutput(scope)); + opBuilder.addInput(numShards.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ShardedFilespec(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output filename() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return filename; } 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 963710a3708..34608e00e56 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 @@ -131,7 +131,7 @@ public Output readerHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) readerHandle; } 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 98d58836334..b1dad5432d2 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 @@ -131,7 +131,7 @@ public Output readerHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) readerHandle; } 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 444b36aec72..dbf5d806f4c 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 @@ -115,7 +115,7 @@ public Output readerHandle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) readerHandle; } 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 2d8f1ed4a1b..1cad173ee74 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 @@ -45,8 +45,8 @@ public final class WriteFile extends RawOp { @Endpoint(describeByClass = true) public static WriteFile create(Scope scope, Operand filename, Operand contents) { OperationBuilder opBuilder = scope.env().opBuilder("WriteFile", scope.makeOpName("WriteFile")); - opBuilder.addInput(filename.asOutput()); - opBuilder.addInput(contents.asOutput()); + opBuilder.addInput(filename.asOutput(scope)); + opBuilder.addInput(contents.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WriteFile(opBuilder.build()); } 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 6c4cc2cddba..41c9867b45b 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 @@ -88,9 +88,9 @@ public final class BandPart extends RawOp implements Operand @Endpoint(describeByClass = true) public static BandPart create(Scope scope, Operand input, Operand numLower, Operand numUpper) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixBandPart", scope.makeOpName("BandPart")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(numLower.asOutput()); - opBuilder.addInput(numUpper.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(numLower.asOutput(scope)); + opBuilder.addInput(numUpper.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BandPart(opBuilder.build()); } @@ -103,7 +103,7 @@ public Output band() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return band; } 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 988d5a23c7f..c5ffc3f8eec 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -44,7 +43,7 @@ public final class BatchCholesky extends RawOp implements Ope @Endpoint(describeByClass = true) public static BatchCholesky create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchCholesky", scope.makeOpName("BatchCholesky")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchCholesky(opBuilder.build()); } @@ -56,7 +55,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 71b533674a8..62d608aa9c2 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -45,8 +44,8 @@ public final class BatchCholeskyGrad extends RawOp implements @Endpoint(describeByClass = true) public static BatchCholeskyGrad create(Scope scope, Operand l, Operand grad) { OperationBuilder opBuilder = scope.env().opBuilder("BatchCholeskyGrad", scope.makeOpName("BatchCholeskyGrad")); - opBuilder.addInput(l.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(l.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchCholeskyGrad(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7b0a946e593..aa6e25614ca 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 @@ -46,9 +46,9 @@ public final class BatchMatrixBandPart extends RawOp implements @Endpoint(describeByClass = true) public static BatchMatrixBandPart create(Scope scope, Operand input, Operand numLower, Operand numUpper) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixBandPart", scope.makeOpName("BatchMatrixBandPart")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(numLower.asOutput()); - opBuilder.addInput(numUpper.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(numLower.asOutput(scope)); + opBuilder.addInput(numUpper.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchMatrixBandPart(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output band() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return band; } 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 c56dcebd836..06f738dbf17 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 @@ -43,7 +43,7 @@ public final class BatchMatrixDeterminant extends RawOp impleme @Endpoint(describeByClass = true) public static BatchMatrixDeterminant create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixDeterminant", scope.makeOpName("BatchMatrixDeterminant")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchMatrixDeterminant(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3cb73f6e451..931031c7bc2 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 @@ -43,7 +43,7 @@ public final class BatchMatrixDiag extends RawOp implements Ope @Endpoint(describeByClass = true) public static BatchMatrixDiag create(Scope scope, Operand diagonal) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixDiag", scope.makeOpName("BatchMatrixDiag")); - opBuilder.addInput(diagonal.asOutput()); + opBuilder.addInput(diagonal.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchMatrixDiag(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 99207f83e9c..af6be14c758 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 @@ -43,7 +43,7 @@ public final class BatchMatrixDiagPart extends RawOp implements @Endpoint(describeByClass = true) public static BatchMatrixDiagPart create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixDiagPart", scope.makeOpName("BatchMatrixDiagPart")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchMatrixDiagPart(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output diagonal() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return diagonal; } 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 bf8ca469f95..1be4013bbc5 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -64,7 +63,7 @@ private Options() { @Endpoint(describeByClass = true) public static BatchMatrixInverse create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixInverse", scope.makeOpName("BatchMatrixInverse")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -90,7 +89,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7f8508edbb0..a89aa017714 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 @@ -44,8 +44,8 @@ public final class BatchMatrixSetDiag extends RawOp implements @Endpoint(describeByClass = true) public static BatchMatrixSetDiag create(Scope scope, Operand input, Operand diagonal) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixSetDiag", scope.makeOpName("BatchMatrixSetDiag")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(diagonal.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(diagonal.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchMatrixSetDiag(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a4b086faa3f..c0736003ceb 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -65,8 +64,8 @@ private Options() { @Endpoint(describeByClass = true) public static BatchMatrixSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixSolve", scope.makeOpName("BatchMatrixSolve")); - opBuilder.addInput(matrix.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(matrix.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -92,7 +91,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c5a71d9481d..078f615da30 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -67,9 +66,9 @@ private Options() { @Endpoint(describeByClass = true) public static BatchMatrixSolveLs create(Scope scope, Operand matrix, Operand rhs, Operand l2Regularizer, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixSolveLs", scope.makeOpName("BatchMatrixSolveLs")); - opBuilder.addInput(matrix.asOutput()); - opBuilder.addInput(rhs.asOutput()); - opBuilder.addInput(l2Regularizer.asOutput()); + opBuilder.addInput(matrix.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); + opBuilder.addInput(l2Regularizer.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -95,7 +94,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 186d68a8f68..1d0be7a3200 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -74,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static BatchMatrixTriangularSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatrixTriangularSolve", scope.makeOpName("BatchMatrixTriangularSolve")); - opBuilder.addInput(matrix.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(matrix.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -111,7 +110,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d2c56803f3a..d55b50eb293 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code e()} output @@ -64,7 +63,7 @@ private Options() { @Endpoint(describeByClass = true) public static BatchSelfAdjointEig create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchSelfAdjointEigV2", scope.makeOpName("BatchSelfAdjointEig")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 25b8da69ab5..5058eff9c1d 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 @@ -72,7 +72,7 @@ private Options() { @Endpoint(describeByClass = true) public static BatchSvd create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchSvd", scope.makeOpName("BatchSvd")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 64216a5a5d3..bf71ea412ae 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 @@ -59,7 +59,7 @@ public final class Cholesky extends RawOp implements Operand @Endpoint(describeByClass = true) public static Cholesky create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("Cholesky", scope.makeOpName("Cholesky")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Cholesky(opBuilder.build()); } @@ -72,7 +72,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e60c7eee5fd..707b02915a8 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the reverse mode backpropagated gradient of the Cholesky algorithm. @@ -54,8 +53,8 @@ public final class CholeskyGrad extends RawOp implements Oper @Endpoint(describeByClass = true) public static CholeskyGrad create(Scope scope, Operand l, Operand grad) { OperationBuilder opBuilder = scope.env().opBuilder("CholeskyGrad", scope.makeOpName("CholeskyGrad")); - opBuilder.addInput(l.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(l.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new CholeskyGrad(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a1d82fd5d07..a1272fc19ef 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 @@ -51,8 +51,8 @@ public final class ConjugateTranspose extends RawOp implements @Endpoint(describeByClass = true) public static ConjugateTranspose create(Scope scope, Operand x, Operand perm) { OperationBuilder opBuilder = scope.env().opBuilder("ConjugateTranspose", scope.makeOpName("ConjugateTranspose")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(perm.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(perm.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ConjugateTranspose(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 1de44ceb714..b4409e99bdb 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the pairwise cross product. @@ -51,8 +50,8 @@ public final class Cross extends RawOp implements Operand @Endpoint(describeByClass = true) public static Cross create(Scope scope, Operand a, Operand b) { OperationBuilder opBuilder = scope.env().opBuilder("Cross", scope.makeOpName("Cross")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Cross(opBuilder.build()); } @@ -65,7 +64,7 @@ public Output product() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return product; } 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 4ae18c47148..ce2050bfd39 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 @@ -49,7 +49,7 @@ public final class Det extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Det create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixDeterminant", scope.makeOpName("Det")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Det(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 faaf6dd5972..0099466a6ac 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 @@ -80,7 +80,7 @@ private Options() { @Endpoint(describeByClass = true) public static Eig create(Scope scope, Operand input, DataType Tout, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Eig", scope.makeOpName("Eig")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tout", Tout); if (options != null) { 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 7471e13882c..48229fd4b92 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 @@ -124,7 +124,7 @@ public final class Einsum extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Einsum create(Scope scope, Iterable> inputs, String equation) { OperationBuilder opBuilder = scope.env().opBuilder("Einsum", scope.makeOpName("Einsum")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("equation", equation); return new Einsum(opBuilder.build()); @@ -138,7 +138,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 eeb65943fa3..19bc288eb8a 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static EuclideanNorm create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EuclideanNorm", scope.makeOpName("EuclideanNorm")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 46fbed05b63..a3b3c2da6d4 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 @@ -77,7 +77,7 @@ private Options() { @Endpoint(describeByClass = true) public static Inv create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixInverse", scope.makeOpName("Inv")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -108,7 +108,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 58482665ed7..4b5bd40be90 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 @@ -122,11 +122,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(ckptPath.asOutput()); - opBuilder.addInput(oldTensorName.asOutput()); - opBuilder.addInput(rowRemapping.asOutput()); - opBuilder.addInput(colRemapping.asOutput()); - opBuilder.addInput(initializingValues.asOutput()); + opBuilder.addInput(ckptPath.asOutput(scope)); + opBuilder.addInput(oldTensorName.asOutput(scope)); + opBuilder.addInput(rowRemapping.asOutput(scope)); + opBuilder.addInput(colRemapping.asOutput(scope)); + opBuilder.addInput(initializingValues.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_rows", numRows); opBuilder.setAttr("num_cols", numCols); @@ -158,7 +158,7 @@ public Output outputMatrix() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputMatrix; } 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 a19e1753007..111a427c11b 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 @@ -55,7 +55,7 @@ public final class LogMatrixDeterminant extends RawOp { @Endpoint(describeByClass = true) public static LogMatrixDeterminant create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("LogMatrixDeterminant", scope.makeOpName("LogMatrixDeterminant")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 f243cc902c9..cc0e5734555 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 @@ -69,7 +69,7 @@ public final class Lu extends RawOp { @Endpoint(describeByClass = true) public static Lu create(Scope scope, Operand input, DataType outputIdxType) { OperationBuilder opBuilder = scope.env().opBuilder("Lu", scope.makeOpName("Lu")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_idx_type", outputIdxType); return new Lu(opBuilder.build()); 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 72466aaceea..d16e2018d28 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 @@ -83,8 +83,8 @@ private Options() { @Endpoint(describeByClass = true) public static MatMul create(Scope scope, Operand a, Operand b, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatMul", scope.makeOpName("MatMul")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -120,7 +120,7 @@ public Output product() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return product; } 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 97e885f95e8..1a0621c60d6 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 @@ -143,11 +143,11 @@ public final class MatrixDiag extends RawOp implements Operand< @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(diagonal.asOutput()); - opBuilder.addInput(k.asOutput()); - opBuilder.addInput(numRows.asOutput()); - opBuilder.addInput(numCols.asOutput()); - opBuilder.addInput(paddingValue.asOutput()); + opBuilder.addInput(diagonal.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); + opBuilder.addInput(numRows.asOutput(scope)); + opBuilder.addInput(numCols.asOutput(scope)); + opBuilder.addInput(paddingValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MatrixDiag(opBuilder.build()); } @@ -160,7 +160,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 81a80bb0d5c..924235aa512 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 @@ -119,9 +119,9 @@ public final class MatrixDiagPart extends RawOp implements Oper @Endpoint(describeByClass = true) public static MatrixDiagPart create(Scope scope, Operand input, Operand k, Operand paddingValue) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixDiagPartV2", scope.makeOpName("MatrixDiagPart")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(k.asOutput()); - opBuilder.addInput(paddingValue.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); + opBuilder.addInput(paddingValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MatrixDiagPart(opBuilder.build()); } @@ -134,7 +134,7 @@ public Output diagonal() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return diagonal; } 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 d4c9adcf553..15d8b8bdbc6 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 @@ -176,9 +176,9 @@ private Options() { @Endpoint(describeByClass = true) public static MatrixDiagPartV3 create(Scope scope, Operand input, Operand k, Operand paddingValue, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixDiagPartV3", scope.makeOpName("MatrixDiagPartV3")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(k.asOutput()); - opBuilder.addInput(paddingValue.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); + opBuilder.addInput(paddingValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -211,7 +211,7 @@ public Output diagonal() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return diagonal; } 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 ef16e3195da..71ba07cdc96 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 @@ -198,11 +198,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(diagonal.asOutput()); - opBuilder.addInput(k.asOutput()); - opBuilder.addInput(numRows.asOutput()); - opBuilder.addInput(numCols.asOutput()); - opBuilder.addInput(paddingValue.asOutput()); + opBuilder.addInput(diagonal.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); + opBuilder.addInput(numRows.asOutput(scope)); + opBuilder.addInput(numCols.asOutput(scope)); + opBuilder.addInput(paddingValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -235,7 +235,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ba6adbaf0aa..bf3bf872def 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 @@ -60,7 +60,7 @@ public final class MatrixLogarithm extends RawOp implements Ope @Endpoint(describeByClass = true) public static MatrixLogarithm create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixLogarithm", scope.makeOpName("MatrixLogarithm")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MatrixLogarithm(opBuilder.build()); } @@ -77,7 +77,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fe7c7b42d35..a7a1f105c03 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 @@ -180,9 +180,9 @@ private Options() { @Endpoint(describeByClass = true) public static MatrixSetDiag create(Scope scope, Operand input, Operand diagonal, Operand k, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixSetDiagV3", scope.makeOpName("MatrixSetDiag")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(diagonal.asOutput()); - opBuilder.addInput(k.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(diagonal.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -215,7 +215,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3ed8ddf95d3..d04762be657 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 @@ -107,9 +107,9 @@ private Options() { @Endpoint(describeByClass = true) public static MatrixSolveLs create(Scope scope, Operand matrix, Operand rhs, Operand l2Regularizer, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixSolveLs", scope.makeOpName("MatrixSolveLs")); - opBuilder.addInput(matrix.asOutput()); - opBuilder.addInput(rhs.asOutput()); - opBuilder.addInput(l2Regularizer.asOutput()); + opBuilder.addInput(matrix.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); + opBuilder.addInput(l2Regularizer.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -136,7 +136,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e35661a5ae4..0c47eeeaca5 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 Options() { @Endpoint(describeByClass = true) public static Qr create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Qr", scope.makeOpName("Qr")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 749ba329ea1..c3c7233c2be 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 @@ -89,12 +89,12 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedMatMul create(Scope scope, Operand a, Operand b, Operand minA, Operand maxA, Operand minB, Operand maxB, DataType Toutput, DataType Tactivation, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMul", scope.makeOpName("QuantizedMatMul")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(minA.asOutput()); - opBuilder.addInput(maxA.asOutput()); - opBuilder.addInput(minB.asOutput()); - opBuilder.addInput(maxB.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(minA.asOutput(scope)); + opBuilder.addInput(maxA.asOutput(scope)); + opBuilder.addInput(minB.asOutput(scope)); + opBuilder.addInput(maxB.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); opBuilder.setAttr("Tactivation", Tactivation); 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 48ac255e7a5..16726d15117 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 @@ -99,13 +99,13 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedMatMulWithBias create(Scope scope, Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, DataType Toutput, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBias", scope.makeOpName("QuantizedMatMulWithBias")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minA.asOutput()); - opBuilder.addInput(maxA.asOutput()); - opBuilder.addInput(minB.asOutput()); - opBuilder.addInput(maxB.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minA.asOutput(scope)); + opBuilder.addInput(maxA.asOutput(scope)); + opBuilder.addInput(minB.asOutput(scope)); + opBuilder.addInput(maxB.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); if (options != null) { 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 6958b14a7f3..483d6ae3ec2 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 @@ -100,13 +100,13 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedMatMulWithBiasAndRelu create(Scope scope, Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, DataType Toutput, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndRelu", scope.makeOpName("QuantizedMatMulWithBiasAndRelu")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minA.asOutput()); - opBuilder.addInput(maxA.asOutput()); - opBuilder.addInput(minB.asOutput()); - opBuilder.addInput(maxB.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minA.asOutput(scope)); + opBuilder.addInput(maxA.asOutput(scope)); + opBuilder.addInput(minB.asOutput(scope)); + opBuilder.addInput(maxB.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); if (options != null) { 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 17d2b2a25d0..b2e26186ac6 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 @@ -103,15 +103,15 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedMatMulWithBiasAndReluAndRequantize create(Scope scope, Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, Operand minFreezedOutput, Operand maxFreezedOutput, DataType Toutput, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedMatMulWithBiasAndReluAndRequantize")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minA.asOutput()); - opBuilder.addInput(maxA.asOutput()); - opBuilder.addInput(minB.asOutput()); - opBuilder.addInput(maxB.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minA.asOutput(scope)); + opBuilder.addInput(maxA.asOutput(scope)); + opBuilder.addInput(minB.asOutput(scope)); + opBuilder.addInput(maxB.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); if (options != null) { 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 d0d3e8f4f5f..8ee5a7fdb13 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 @@ -78,7 +78,7 @@ private Options() { @Endpoint(describeByClass = true) public static SelfAdjointEig create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SelfAdjointEigV2", scope.makeOpName("SelfAdjointEig")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 087b8ef7991..f492bbcc6da 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 @@ -74,8 +74,8 @@ private Options() { @Endpoint(describeByClass = true) public static Solve create(Scope scope, Operand matrix, Operand rhs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixSolve", scope.makeOpName("Solve")); - opBuilder.addInput(matrix.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(matrix.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -103,7 +103,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 86d747a81a5..e22ee3ea09c 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 @@ -61,7 +61,7 @@ public final class Sqrtm extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sqrtm create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixSquareRoot", scope.makeOpName("Sqrtm")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sqrtm(opBuilder.build()); } @@ -78,7 +78,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 df0772367fd..e9d3107b592 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 @@ -91,7 +91,7 @@ private Options() { @Endpoint(describeByClass = true) public static Svd create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Svd", scope.makeOpName("Svd")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 40bf987f815..79c9b8b0817 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 @@ -63,7 +63,7 @@ public final class TensorDiag extends RawOp implements Operand< @Endpoint(describeByClass = true) public static TensorDiag create(Scope scope, Operand diagonal) { OperationBuilder opBuilder = scope.env().opBuilder("Diag", scope.makeOpName("TensorDiag")); - opBuilder.addInput(diagonal.asOutput()); + opBuilder.addInput(diagonal.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorDiag(opBuilder.build()); } @@ -75,7 +75,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c14b82af064..cda3b55e6a3 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 @@ -64,7 +64,7 @@ public final class TensorDiagPart extends RawOp implements Oper @Endpoint(describeByClass = true) public static TensorDiagPart create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("DiagPart", scope.makeOpName("TensorDiagPart")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorDiagPart(opBuilder.build()); } @@ -77,7 +77,7 @@ public Output diagonal() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return diagonal; } 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 5ce582563ea..48be84db8fb 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 @@ -50,8 +50,8 @@ public final class Transpose extends RawOp implements Operand Transpose create(Scope scope, Operand x, Operand perm) { OperationBuilder opBuilder = scope.env().opBuilder("Transpose", scope.makeOpName("Transpose")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(perm.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(perm.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Transpose(opBuilder.build()); } @@ -63,7 +63,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 ba5ce4f65c2..5bb07bb3991 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 @@ -128,8 +128,8 @@ private Options() { @Endpoint(describeByClass = true) public static TriangularSolve create(Scope scope, Operand matrix, Operand rhs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MatrixTriangularSolve", scope.makeOpName("TriangularSolve")); - opBuilder.addInput(matrix.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(matrix.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -172,7 +172,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7fb782724f9..f95fbbce959 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 @@ -53,10 +53,10 @@ public final class TridiagonalMatMul extends RawOp implements O @Endpoint(describeByClass = true) public static TridiagonalMatMul create(Scope scope, Operand superdiag, Operand maindiag, Operand subdiag, Operand rhs) { OperationBuilder opBuilder = scope.env().opBuilder("TridiagonalMatMul", scope.makeOpName("TridiagonalMatMul")); - opBuilder.addInput(superdiag.asOutput()); - opBuilder.addInput(maindiag.asOutput()); - opBuilder.addInput(subdiag.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(superdiag.asOutput(scope)); + opBuilder.addInput(maindiag.asOutput(scope)); + opBuilder.addInput(subdiag.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TridiagonalMatMul(opBuilder.build()); } @@ -69,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0ad614e24d2..8f8a745fd43 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 @@ -77,8 +77,8 @@ private Options() { @Endpoint(describeByClass = true) public static TridiagonalSolve create(Scope scope, Operand diagonals, Operand rhs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TridiagonalSolve", scope.makeOpName("TridiagonalSolve")); - opBuilder.addInput(diagonals.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(diagonals.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -106,7 +106,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 01e7c156baf..371e985fb19 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 @@ -51,8 +51,8 @@ public final class CSRSparseMatrixComponents extends RawOp { @Endpoint(describeByClass = true) public static CSRSparseMatrixComponents create(Scope scope, Operand csrSparseMatrix, Operand index, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("CSRSparseMatrixComponents", scope.makeOpName("CSRSparseMatrixComponents")); - opBuilder.addInput(csrSparseMatrix.asOutput()); - opBuilder.addInput(index.asOutput()); + opBuilder.addInput(csrSparseMatrix.asOutput(scope)); + opBuilder.addInput(index.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new CSRSparseMatrixComponents(opBuilder.build()); 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 f221c56fce1..2256538721b 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 @@ -46,7 +46,7 @@ public final class CSRSparseMatrixToDense extends RawOp impleme @Endpoint(describeByClass = true) public static CSRSparseMatrixToDense create(Scope scope, Operand sparseInput, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("CSRSparseMatrixToDense", scope.makeOpName("CSRSparseMatrixToDense")); - opBuilder.addInput(sparseInput.asOutput()); + opBuilder.addInput(sparseInput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new CSRSparseMatrixToDense(opBuilder.build()); @@ -60,7 +60,7 @@ public Output denseOutput() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return denseOutput; } 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 c9796bf7573..5894ad750cb 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 @@ -47,7 +47,7 @@ public final class CSRSparseMatrixToSparseTensor extends RawOp @Endpoint(describeByClass = true) public static CSRSparseMatrixToSparseTensor create(Scope scope, Operand sparseMatrix, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("CSRSparseMatrixToSparseTensor", scope.makeOpName("CSRSparseMatrixToSparseTensor")); - opBuilder.addInput(sparseMatrix.asOutput()); + opBuilder.addInput(sparseMatrix.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new CSRSparseMatrixToSparseTensor(opBuilder.build()); 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 93414b7e7f6..f0c8acbdac8 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 @@ -44,8 +44,8 @@ public final class DenseToCSRSparseMatrix extends RawOp implements Operand DenseToCSRSparseMatrix create(Scope scope, Operand denseInput, Operand indices) { OperationBuilder opBuilder = scope.env().opBuilder("DenseToCSRSparseMatrix", scope.makeOpName("DenseToCSRSparseMatrix")); - opBuilder.addInput(denseInput.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(denseInput.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DenseToCSRSparseMatrix(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output sparseOutput() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) sparseOutput; } 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 2e7b03b0fb6..dbcd0f94623 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 @@ -48,10 +48,10 @@ public final class SparseMatrixAdd extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SparseMatrixAdd create(Scope scope, Operand a, Operand b, Operand alpha, Operand beta) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixAdd", scope.makeOpName("SparseMatrixAdd")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(beta.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseMatrixAdd(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output c() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) c; } 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 999afbb7a1a..521542dbb55 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 @@ -135,8 +135,8 @@ private Options() { @Endpoint(describeByClass = true) public static SparseMatrixMatMul create(Scope scope, Operand a, Operand b, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixMatMul", scope.makeOpName("SparseMatrixMatMul")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -213,7 +213,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 cc6f936e661..ee4843090f3 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 @@ -52,8 +52,8 @@ public final class SparseMatrixMul extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SparseMatrixMul create(Scope scope, Operand a, Operand b) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixMul", scope.makeOpName("SparseMatrixMul")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseMatrixMul(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 613228d6272..810a5d4856b 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 @@ -42,7 +42,7 @@ public final class SparseMatrixNNZ extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SparseMatrixNNZ create(Scope scope, Operand sparseMatrix) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixNNZ", scope.makeOpName("SparseMatrixNNZ")); - opBuilder.addInput(sparseMatrix.asOutput()); + opBuilder.addInput(sparseMatrix.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseMatrixNNZ(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output nnz() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return nnz; } 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 9acf649aa94..0f95397cb75 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 @@ -90,7 +90,7 @@ public final class SparseMatrixOrderingAMD extends RawOp implements Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixOrderingAMD", scope.makeOpName("SparseMatrixOrderingAMD")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseMatrixOrderingAMD(opBuilder.build()); } @@ -103,7 +103,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 2d62bbb6899..fa9b213c97d 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 @@ -51,7 +51,7 @@ public final class SparseMatrixSoftmax extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SparseMatrixSoftmax create(Scope scope, Operand logits, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSoftmax", scope.makeOpName("SparseMatrixSoftmax")); - opBuilder.addInput(logits.asOutput()); + opBuilder.addInput(logits.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new SparseMatrixSoftmax(opBuilder.build()); @@ -66,7 +66,7 @@ public Output softmax() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) softmax; } 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 0a698bb7929..114d50a10e5 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 @@ -46,8 +46,8 @@ public final class SparseMatrixSoftmaxGrad extends RawOp implements Operand SparseMatrixSoftmaxGrad create(Scope scope, Operand softmax, Operand gradSoftmax, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSoftmaxGrad", scope.makeOpName("SparseMatrixSoftmaxGrad")); - opBuilder.addInput(softmax.asOutput()); - opBuilder.addInput(gradSoftmax.asOutput()); + opBuilder.addInput(softmax.asOutput(scope)); + opBuilder.addInput(gradSoftmax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new SparseMatrixSoftmaxGrad(opBuilder.build()); @@ -62,7 +62,7 @@ public Output gradient() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) gradient; } 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 603e4e30c9f..53c719fd496 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 @@ -117,8 +117,8 @@ public final class SparseMatrixSparseCholesky extends RawOp implements Operand SparseMatrixSparseCholesky create(Scope scope, Operand input, Operand permutation, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSparseCholesky", scope.makeOpName("SparseMatrixSparseCholesky")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(permutation.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(permutation.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new SparseMatrixSparseCholesky(opBuilder.build()); @@ -133,7 +133,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 2e8bafb9b0b..2053c365be5 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 @@ -165,8 +165,8 @@ private Options() { @Endpoint(describeByClass = true) public static SparseMatrixSparseMatMul create(Scope scope, Operand a, Operand b, DataType type, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixSparseMatMul", scope.makeOpName("SparseMatrixSparseMatMul")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); if (options != null) { @@ -225,7 +225,7 @@ public Output c() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) c; } 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 6801b45dd6d..560b0c08abd 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 @@ -67,7 +67,7 @@ private Options() { @Endpoint(describeByClass = true) public static SparseMatrixTranspose create(Scope scope, Operand input, DataType type, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixTranspose", scope.makeOpName("SparseMatrixTranspose")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); if (options != null) { @@ -96,7 +96,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 eab0d59e8c2..3ade941153b 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 @@ -45,7 +45,7 @@ public final class SparseMatrixZeros extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SparseMatrixZeros create(Scope scope, Operand denseShape, DataType type) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatrixZeros", scope.makeOpName("SparseMatrixZeros")); - opBuilder.addInput(denseShape.asOutput()); + opBuilder.addInput(denseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("type", type); return new SparseMatrixZeros(opBuilder.build()); @@ -60,7 +60,7 @@ public Output sparseMatrix() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) sparseMatrix; } 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 a14a09c9433..1e89f5ee4a8 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 @@ -45,9 +45,9 @@ public final class SparseTensorToCSRSparseMatrix extends RawOp implements Operan @Endpoint(describeByClass = true) public static SparseTensorToCSRSparseMatrix create(Scope scope, Operand indices, Operand values, Operand denseShape) { OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorToCSRSparseMatrix", scope.makeOpName("SparseTensorToCSRSparseMatrix")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(denseShape.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(denseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseTensorToCSRSparseMatrix(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output sparseMatrix() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) sparseMatrix; } 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 a04d249dc74..c3b72319f43 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the absolute value of a tensor. @@ -50,7 +49,7 @@ public final class Abs extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Abs create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Abs", scope.makeOpName("Abs")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Abs(opBuilder.build()); } @@ -62,7 +61,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 733a7546f57..2043aef98f1 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 @@ -57,7 +57,7 @@ public final class AccumulateN extends RawOp implements Operand @Endpoint(describeByClass = true) public static AccumulateN create(Scope scope, Iterable> inputs, Shape shape) { OperationBuilder opBuilder = scope.env().opBuilder("AccumulateNV2", scope.makeOpName("AccumulateN")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("shape", shape); return new AccumulateN(opBuilder.build()); @@ -70,7 +70,7 @@ public Output sum() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return sum; } 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 200fa10daad..05a47881120 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 @@ -45,7 +45,7 @@ public final class Acos extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Acos create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Acos", scope.makeOpName("Acos")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Acos(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 e26f402b14e..951a9f21021 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 @@ -53,7 +53,7 @@ public final class Acosh extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Acosh create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Acosh", scope.makeOpName("Acosh")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Acosh(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 2c3c69e735f..8b55b052933 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 @@ -49,8 +49,8 @@ public final class Add extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Add create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Add", scope.makeOpName("Add")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Add(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 aa6abe36421..5d38eb62e7a 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 @@ -54,7 +54,7 @@ public final class AddN extends RawOp implements Operand { @Endpoint(describeByClass = true) public static AddN create(Scope scope, Iterable> inputs) { OperationBuilder opBuilder = scope.env().opBuilder("AddN", scope.makeOpName("AddN")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); return new AddN(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output sum() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return sum; } 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 08c203e2625..a69a70842c8 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 @@ -65,7 +65,7 @@ public final class Angle extends RawOp implements Operand @Endpoint(describeByClass = true) public static Angle create(Scope scope, Operand input, DataType Tout) { OperationBuilder opBuilder = scope.env().opBuilder("Angle", scope.makeOpName("Angle")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tout", Tout); return new Angle(opBuilder.build()); @@ -90,7 +90,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 83762aa8117..92a0a84b0df 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 @@ -65,8 +65,8 @@ private Options() { @Endpoint(describeByClass = true) public static ApproximateEqual create(Scope scope, Operand x, Operand y, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ApproximateEqual", scope.makeOpName("ApproximateEqual")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -92,7 +92,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 9670f62b1a5..1213690ad73 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 @@ -65,8 +65,8 @@ public final class ArgMax extends RawOp implements Operand @Endpoint(describeByClass = true) public static ArgMax create(Scope scope, Operand input, Operand dimension, DataType outputType) { OperationBuilder opBuilder = scope.env().opBuilder("ArgMax", scope.makeOpName("ArgMax")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(dimension.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(dimension.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_type", outputType); return new ArgMax(opBuilder.build()); @@ -94,7 +94,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 00e84ed2dc3..d789f609eb0 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 @@ -65,8 +65,8 @@ public final class ArgMin extends RawOp implements Operand @Endpoint(describeByClass = true) public static ArgMin create(Scope scope, Operand input, Operand dimension, DataType outputType) { OperationBuilder opBuilder = scope.env().opBuilder("ArgMin", scope.makeOpName("ArgMin")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(dimension.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(dimension.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_type", outputType); return new ArgMin(opBuilder.build()); @@ -94,7 +94,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 6dd53582f63..64e98a18823 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 @@ -61,7 +61,7 @@ public final class Asin extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Asin create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Asin", scope.makeOpName("Asin")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Asin(opBuilder.build()); } @@ -73,7 +73,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 93131b0b597..66a1b70af20 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 @@ -55,7 +55,7 @@ public final class Asinh extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Asinh create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Asinh", scope.makeOpName("Asinh")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Asinh(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 ae1c0de475b..bdbb4229400 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 @@ -61,7 +61,7 @@ public final class Atan extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Atan create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Atan", scope.makeOpName("Atan")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Atan(opBuilder.build()); } @@ -73,7 +73,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 d77090da6a1..7cba9ee2011 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes arctangent of `y/x` element-wise, respecting signs of the arguments. @@ -53,8 +52,8 @@ public final class Atan2 extends RawOp implements Operand @Endpoint(describeByClass = true) public static Atan2 create(Scope scope, Operand y, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Atan2", scope.makeOpName("Atan2")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Atan2(opBuilder.build()); } @@ -66,7 +65,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 2d8596be938..57119b8129f 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 @@ -57,7 +57,7 @@ public final class Atanh extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Atanh create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Atanh", scope.makeOpName("Atanh")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Atanh(opBuilder.build()); } @@ -69,7 +69,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 b951b555fc9..fec91e77944 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the Bessel i0e function of `x` element-wise. @@ -51,7 +50,7 @@ public final class BesselI0e extends RawOp implements Operand @Endpoint(describeByClass = true) public static BesselI0e create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("BesselI0e", scope.makeOpName("BesselI0e")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BesselI0e(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 9d92b8a4d66..8d27f3b7bd1 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the Bessel i1e function of `x` element-wise. @@ -51,7 +50,7 @@ public final class BesselI1e extends RawOp implements Operand @Endpoint(describeByClass = true) public static BesselI1e create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("BesselI1e", scope.makeOpName("BesselI1e")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BesselI1e(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 bf42fa10faf..490b04879cd 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the regularized incomplete beta integral \\(I_x(a, b)\\). @@ -59,9 +58,9 @@ public final class Betainc extends RawOp implements Operand Betainc create(Scope scope, Operand a, Operand b, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Betainc", scope.makeOpName("Betainc")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Betainc(opBuilder.build()); } @@ -73,7 +72,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 30b96bf1b5d..96a95c87c84 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Counts the number of occurrences of each value in an integer array. @@ -59,9 +58,9 @@ public final class Bincount extends RawOp implements Operand< @Endpoint(describeByClass = true) public static Bincount create(Scope scope, Operand arr, Operand size, Operand weights) { OperationBuilder opBuilder = scope.env().opBuilder("Bincount", scope.makeOpName("Bincount")); - opBuilder.addInput(arr.asOutput()); - opBuilder.addInput(size.asOutput()); - opBuilder.addInput(weights.asOutput()); + opBuilder.addInput(arr.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); + opBuilder.addInput(weights.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Bincount(opBuilder.build()); } @@ -75,7 +74,7 @@ public Output bins() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return bins; } 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 36bcf7ce417..37fd93a6fc1 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns element-wise smallest integer not less than x. @@ -46,7 +45,7 @@ public final class Ceil extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Ceil create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Ceil", scope.makeOpName("Ceil")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Ceil(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 a00341d467d..44b2c0d2370 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 @@ -67,8 +67,8 @@ public final class CompareAndBitpack extends RawOp implements Operand { @Endpoint(describeByClass = true) public static CompareAndBitpack create(Scope scope, Operand input, Operand threshold) { OperationBuilder opBuilder = scope.env().opBuilder("CompareAndBitpack", scope.makeOpName("CompareAndBitpack")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(threshold.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(threshold.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new CompareAndBitpack(opBuilder.build()); } @@ -81,7 +81,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f72854aa5ed..d3a50e88bed 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 @@ -54,7 +54,7 @@ public final class ComplexAbs extends RawOp implements Operan @Endpoint(describeByClass = true) public static ComplexAbs create(Scope scope, Operand x, DataType Tout) { OperationBuilder opBuilder = scope.env().opBuilder("ComplexAbs", scope.makeOpName("ComplexAbs")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tout", Tout); return new ComplexAbs(opBuilder.build()); @@ -79,7 +79,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 c633957aeb2..be16314d8a0 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 @@ -59,7 +59,7 @@ public final class Conj extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Conj create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("Conj", scope.makeOpName("Conj")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Conj(opBuilder.build()); } @@ -71,7 +71,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8a61ed1db2a..2d8637b22aa 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 @@ -56,7 +56,7 @@ public final class Cos extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Cos create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Cos", scope.makeOpName("Cos")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Cos(opBuilder.build()); } @@ -68,7 +68,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 20f70fe2f0c..ef2b9d1ba68 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 @@ -55,7 +55,7 @@ public final class Cosh extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Cosh create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Cosh", scope.makeOpName("Cosh")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Cosh(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 faab91b5bd9..4c5aeadb4d7 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 @@ -102,8 +102,8 @@ private Options() { @Endpoint(describeByClass = true) public static Cumprod create(Scope scope, Operand x, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Cumprod", scope.makeOpName("Cumprod")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -139,7 +139,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 a1027a8b221..59ade631a4a 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 @@ -102,8 +102,8 @@ private Options() { @Endpoint(describeByClass = true) public static Cumsum create(Scope scope, Operand x, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Cumsum", scope.makeOpName("Cumsum")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -139,7 +139,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 82b702e4def..42e74f8e083 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the cumulative product of the tensor `x` along `axis`. @@ -94,8 +93,8 @@ private Options() { @Endpoint(describeByClass = true) public static CumulativeLogsumexp create(Scope scope, Operand x, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("CumulativeLogsumexp", scope.makeOpName("CumulativeLogsumexp")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -131,7 +130,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 c217acd7f51..e14ae8c88d0 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes Psi, the derivative of Lgamma (the log of the absolute value of @@ -48,7 +47,7 @@ public final class Digamma extends RawOp implements Operand Digamma create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Digamma", scope.makeOpName("Digamma")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Digamma(opBuilder.build()); } @@ -60,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 fb34257a1e8..e54d21d723f 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 @@ -49,8 +49,8 @@ public final class Div extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Div create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Div", scope.makeOpName("Div")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Div(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 373dcff32cb..ae147962cb6 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 @@ -50,8 +50,8 @@ public final class DivNoNan extends RawOp implements Operand @Endpoint(describeByClass = true) public static DivNoNan create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("DivNoNan", scope.makeOpName("DivNoNan")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DivNoNan(opBuilder.build()); } @@ -63,7 +63,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 971a44984c6..77fc951c423 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 @@ -78,8 +78,8 @@ private Options() { @Endpoint(describeByClass = true) public static Equal create(Scope scope, Operand x, Operand y, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Equal", scope.makeOpName("Equal")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -105,7 +105,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 2f8e2f8c302..1cf51551137 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the Gauss error function of `x` element-wise. @@ -46,7 +45,7 @@ public final class Erf extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Erf create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Erf", scope.makeOpName("Erf")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Erf(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 a1494ae42a7..e6e8930454d 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the complementary error function of `x` element-wise. @@ -46,7 +45,7 @@ public final class Erfc extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Erfc create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Erfc", scope.makeOpName("Erfc")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Erfc(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 16e93c8ec2c..e3997c7850a 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 @@ -71,7 +71,7 @@ public final class Exp extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Exp create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Exp", scope.makeOpName("Exp")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Exp(opBuilder.build()); } @@ -83,7 +83,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 6998e3d3fdb..677c2ace1f6 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 @@ -60,7 +60,7 @@ public final class Expm1 extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Expm1 create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Expm1", scope.makeOpName("Expm1")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Expm1(opBuilder.build()); } @@ -72,7 +72,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 7c8f8af6c95..968e6b2ee98 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 @@ -53,7 +53,7 @@ public Output fact() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return fact; } 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 fb1955c2e91..eafeab0bc8c 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns element-wise largest integer not greater than x. @@ -46,7 +45,7 @@ public final class Floor extends RawOp implements Operand @Endpoint(describeByClass = true) public static Floor create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Floor", scope.makeOpName("Floor")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Floor(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 b02797cde81..caaf3f502c8 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 @@ -49,8 +49,8 @@ public final class FloorDiv extends RawOp implements Operand @Endpoint(describeByClass = true) public static FloorDiv create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("FloorDiv", scope.makeOpName("FloorDiv")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new FloorDiv(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 79881c593bc..c1eba02f8ba 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns element-wise remainder of division. When `x < 0` xor `y < 0` is @@ -53,8 +52,8 @@ public final class FloorMod extends RawOp implements Operand< @Endpoint(describeByClass = true) public static FloorMod create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("FloorMod", scope.makeOpName("FloorMod")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new FloorMod(opBuilder.build()); } @@ -66,7 +65,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 a2aef106674..8414333218d 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the truth value of (x > y) element-wise. @@ -61,8 +60,8 @@ public final class Greater extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Greater create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Greater", scope.makeOpName("Greater")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Greater(opBuilder.build()); } @@ -74,7 +73,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 6097961d214..180276c51ea 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the truth value of (x >= y) element-wise. @@ -61,8 +60,8 @@ public final class GreaterEqual extends RawOp implements Operand { @Endpoint(describeByClass = true) public static GreaterEqual create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("GreaterEqual", scope.makeOpName("GreaterEqual")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new GreaterEqual(opBuilder.build()); } @@ -74,7 +73,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 e6492c17a8e..87533395fed 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the lower regularized incomplete Gamma function `P(a, x)`. @@ -60,8 +59,8 @@ public final class Igamma extends RawOp implements Operand @Endpoint(describeByClass = true) public static Igamma create(Scope scope, Operand a, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Igamma", scope.makeOpName("Igamma")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Igamma(opBuilder.build()); } @@ -73,7 +72,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 90e5b649dc5..a0251e5afe0 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of `igamma(a, x)` wrt `a`. @@ -46,8 +45,8 @@ public final class IgammaGradA extends RawOp implements Opera @Endpoint(describeByClass = true) public static IgammaGradA create(Scope scope, Operand a, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("IgammaGradA", scope.makeOpName("IgammaGradA")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IgammaGradA(opBuilder.build()); } @@ -59,7 +58,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 03c9ab28002..8ab45b4858b 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the upper regularized incomplete Gamma function `Q(a, x)`. @@ -60,8 +59,8 @@ public final class Igammac extends RawOp implements Operand Igammac create(Scope scope, Operand a, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Igammac", scope.makeOpName("Igammac")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Igammac(opBuilder.build()); } @@ -73,7 +72,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 dbd5b5b8406..12b6f2f89cf 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 @@ -61,7 +61,7 @@ public final class Imag extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Imag create(Scope scope, Operand input, DataType Tout) { OperationBuilder opBuilder = scope.env().opBuilder("Imag", scope.makeOpName("Imag")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tout", Tout); return new Imag(opBuilder.build()); @@ -86,7 +86,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 28d0a80d4ad..878f969449f 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the inverse permutation of a tensor. @@ -62,7 +61,7 @@ public final class InvertPermutation extends RawOp implements @Endpoint(describeByClass = true) public static InvertPermutation create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("InvertPermutation", scope.makeOpName("InvertPermutation")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InvertPermutation(opBuilder.build()); } @@ -75,7 +74,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 b8136095909..9d7198a36f0 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns which elements of x are finite. @@ -56,7 +55,7 @@ public final class IsFinite extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IsFinite create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("IsFinite", scope.makeOpName("IsFinite")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IsFinite(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 429e8aee411..9a7d8b43bef 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns which elements of x are Inf. @@ -56,7 +55,7 @@ public final class IsInf extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IsInf create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("IsInf", scope.makeOpName("IsInf")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IsInf(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 1c480c08336..c33accf07a7 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns which elements of x are NaN. @@ -56,7 +55,7 @@ public final class IsNan extends RawOp implements Operand { @Endpoint(describeByClass = true) public static IsNan create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("IsNan", scope.makeOpName("IsNan")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new IsNan(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 106040ab8b1..493b51a416b 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the truth value of (x < y) element-wise. @@ -61,8 +60,8 @@ public final class Less extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Less create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Less", scope.makeOpName("Less")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Less(opBuilder.build()); } @@ -74,7 +73,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 094bd19e36c..aa714c6bcf9 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TBool; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the truth value of (x <= y) element-wise. @@ -61,8 +60,8 @@ public final class LessEqual extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LessEqual create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("LessEqual", scope.makeOpName("LessEqual")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LessEqual(opBuilder.build()); } @@ -74,7 +73,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 42a5baad397..fb0399cad70 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the log of the absolute value of `Gamma(x)` element-wise. @@ -56,7 +55,7 @@ public final class Lgamma extends RawOp implements Operand @Endpoint(describeByClass = true) public static Lgamma create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Lgamma", scope.makeOpName("Lgamma")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Lgamma(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 1ee4bc3c6e2..aa382cdafbc 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 @@ -54,7 +54,7 @@ public final class Log extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Log create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Log", scope.makeOpName("Log")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Log(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 407cfa649ad..fe535170ced 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 @@ -54,7 +54,7 @@ public final class Log1p extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Log1p create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Log1p", scope.makeOpName("Log1p")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Log1p(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 410cd28dc9d..d527c0bef36 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 @@ -47,8 +47,8 @@ public final class LogicalAnd extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LogicalAnd create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("LogicalAnd", scope.makeOpName("LogicalAnd")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LogicalAnd(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 643af8caa45..664ab52ce71 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 @@ -43,7 +43,7 @@ public final class LogicalNot extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LogicalNot create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("LogicalNot", scope.makeOpName("LogicalNot")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LogicalNot(opBuilder.build()); } @@ -56,7 +56,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 a9f33397ae1..e542b9cdbb3 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 @@ -47,8 +47,8 @@ public final class LogicalOr extends RawOp implements Operand { @Endpoint(describeByClass = true) public static LogicalOr create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("LogicalOr", scope.makeOpName("LogicalOr")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LogicalOr(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 998e5fbc3bf..d8343eeef55 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the max of x and y (i.e. x > y ? x : y) element-wise. @@ -50,8 +49,8 @@ public final class Maximum extends RawOp implements Operand Maximum create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Maximum", scope.makeOpName("Maximum")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Maximum(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 301ff6b1c31..90af0e38cb0 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static Mean create(Scope scope, Operand input, Operand axis, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Mean", scope.makeOpName("Mean")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(axis.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(axis.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 33f6fe5d7af..e62f0d76715 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the min of x and y (i.e. x < y ? x : y) element-wise. @@ -50,8 +49,8 @@ public final class Minimum extends RawOp implements Operand Minimum create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Minimum", scope.makeOpName("Minimum")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Minimum(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 8cd9b2cd30d..9510c00a07e 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns element-wise remainder of division. This emulates C semantics in that @@ -53,8 +52,8 @@ public final class Mod extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Mod create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Mod", scope.makeOpName("Mod")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Mod(opBuilder.build()); } @@ -66,7 +65,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 d4cf53f8540..eda0a87907c 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 @@ -49,8 +49,8 @@ public final class Mul extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Mul create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Mul", scope.makeOpName("Mul")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Mul(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 157b5d1ead0..04b2f06d0fd 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 @@ -49,8 +49,8 @@ public final class MulNoNan extends RawOp implements Operand @Endpoint(describeByClass = true) public static MulNoNan create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("MulNoNan", scope.makeOpName("MulNoNan")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new MulNoNan(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 0330942d8b3..4fb1087097a 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -44,7 +43,7 @@ public final class Ndtri extends RawOp implements Operand @Endpoint(describeByClass = true) public static Ndtri create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Ndtri", scope.makeOpName("Ndtri")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Ndtri(opBuilder.build()); } @@ -56,7 +55,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 14a1544cb82..6e0f2bfc302 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 @@ -47,7 +47,7 @@ public final class Neg extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Neg create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Neg", scope.makeOpName("Neg")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Neg(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 4ac1cde3380..a8e3d0c1eb8 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the next representable value of `x1` in the direction of `x2`, element-wise. @@ -55,8 +54,8 @@ public final class NextAfter extends RawOp implements Operand @Endpoint(describeByClass = true) public static NextAfter create(Scope scope, Operand x1, Operand x2) { OperationBuilder opBuilder = scope.env().opBuilder("NextAfter", scope.makeOpName("NextAfter")); - opBuilder.addInput(x1.asOutput()); - opBuilder.addInput(x2.asOutput()); + opBuilder.addInput(x1.asOutput(scope)); + opBuilder.addInput(x2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new NextAfter(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 647b596f6be..a6e7143bd8f 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 @@ -68,8 +68,8 @@ private Options() { @Endpoint(describeByClass = true) public static NotEqual create(Scope scope, Operand x, Operand y, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("NotEqual", scope.makeOpName("NotEqual")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -95,7 +95,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 415b5b51837..98aae4656fe 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the polygamma function \\(\psi^{(n)}(x)\\). @@ -54,8 +53,8 @@ public final class Polygamma extends RawOp implements Operand @Endpoint(describeByClass = true) public static Polygamma create(Scope scope, Operand a, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Polygamma", scope.makeOpName("Polygamma")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Polygamma(opBuilder.build()); } @@ -67,7 +66,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 21b22d86fa5..33422655dab 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TUint8; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes element-wise population count (a.k.a. popcount, bitsum, bitcount). @@ -52,7 +51,7 @@ public final class PopulationCount extends RawOp implements Operand { @Endpoint(describeByClass = true) public static PopulationCount create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("PopulationCount", scope.makeOpName("PopulationCount")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new PopulationCount(opBuilder.build()); } @@ -64,7 +63,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 cd22d351e6e..0400c975445 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 @@ -55,8 +55,8 @@ public final class Pow extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Pow create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Pow", scope.makeOpName("Pow")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Pow(opBuilder.build()); } @@ -68,7 +68,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 fd2f5890d47..67de8d4c40d 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 @@ -53,12 +53,12 @@ public final class QuantizedAdd extends RawOp { @Endpoint(describeByClass = true) public static QuantizedAdd create(Scope scope, Operand x, Operand y, Operand minX, Operand maxX, Operand minY, Operand maxY, DataType Toutput) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedAdd", scope.makeOpName("QuantizedAdd")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(minX.asOutput()); - opBuilder.addInput(maxX.asOutput()); - opBuilder.addInput(minY.asOutput()); - opBuilder.addInput(maxY.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(minX.asOutput(scope)); + opBuilder.addInput(maxX.asOutput(scope)); + opBuilder.addInput(minY.asOutput(scope)); + opBuilder.addInput(maxY.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); return new QuantizedAdd(opBuilder.build()); 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 a629145fa62..54941712be3 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 @@ -53,12 +53,12 @@ public final class QuantizedMul extends RawOp { @Endpoint(describeByClass = true) public static QuantizedMul create(Scope scope, Operand x, Operand y, Operand minX, Operand maxX, Operand minY, Operand maxY, DataType Toutput) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMul", scope.makeOpName("QuantizedMul")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(minX.asOutput()); - opBuilder.addInput(maxX.asOutput()); - opBuilder.addInput(minY.asOutput()); - opBuilder.addInput(maxY.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(minX.asOutput(scope)); + opBuilder.addInput(maxX.asOutput(scope)); + opBuilder.addInput(minY.asOutput(scope)); + opBuilder.addInput(maxY.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); return new QuantizedMul(opBuilder.build()); 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 0b619946e0b..76afa38392a 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 @@ -61,7 +61,7 @@ public final class Real extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Real create(Scope scope, Operand input, DataType Tout) { OperationBuilder opBuilder = scope.env().opBuilder("Real", scope.makeOpName("Real")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tout", Tout); return new Real(opBuilder.build()); @@ -86,7 +86,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 32dcc8988fc..6b893498a05 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 @@ -51,8 +51,8 @@ public final class RealDiv extends RawOp implements Operand @Endpoint(describeByClass = true) public static RealDiv create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("RealDiv", scope.makeOpName("RealDiv")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RealDiv(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 b39118351c5..939d864d9e0 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 @@ -47,7 +47,7 @@ public final class Reciprocal extends RawOp implements Operand< @Endpoint(describeByClass = true) public static Reciprocal create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Reciprocal", scope.makeOpName("Reciprocal")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Reciprocal(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 9d9a1f03723..b57429e84f1 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 @@ -48,8 +48,8 @@ public final class ReciprocalGrad extends RawOp implements Oper @Endpoint(describeByClass = true) public static ReciprocalGrad create(Scope scope, Operand y, Operand dy) { OperationBuilder opBuilder = scope.env().opBuilder("ReciprocalGrad", scope.makeOpName("ReciprocalGrad")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReciprocalGrad(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 659dae182cf..b2d59b24c04 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 @@ -47,9 +47,9 @@ public final class RequantizationRangePerChannel extends RawOp { @Endpoint(describeByClass = true) public static RequantizationRangePerChannel create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Float clipValueMax) { OperationBuilder opBuilder = scope.env().opBuilder("RequantizationRangePerChannel", scope.makeOpName("RequantizationRangePerChannel")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("clip_value_max", clipValueMax); return new RequantizationRangePerChannel(opBuilder.build()); 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 793429b9779..18bbeb1e527 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 @@ -51,11 +51,11 @@ public final class RequantizePerChannel extends RawOp { @Endpoint(describeByClass = true) public static RequantizePerChannel create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Operand requestedOutputMin, Operand requestedOutputMax, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("RequantizePerChannel", scope.makeOpName("RequantizePerChannel")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); - opBuilder.addInput(requestedOutputMin.asOutput()); - opBuilder.addInput(requestedOutputMax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); + opBuilder.addInput(requestedOutputMin.asOutput(scope)); + opBuilder.addInput(requestedOutputMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new RequantizePerChannel(opBuilder.build()); 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 576508d7d30..a28b2a73f27 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns element-wise integer closest to x. @@ -56,7 +55,7 @@ public final class Rint extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Rint create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Rint", scope.makeOpName("Rint")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Rint(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 dbd546baf23..0465505efed 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 @@ -48,7 +48,7 @@ public final class Round extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Round create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Round", scope.makeOpName("Round")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Round(opBuilder.build()); } @@ -60,7 +60,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 43a6886684d..6d2ac552283 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 @@ -47,7 +47,7 @@ public final class Rsqrt extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Rsqrt create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Rsqrt", scope.makeOpName("Rsqrt")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Rsqrt(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 df8cdcfb392..652677c852f 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 @@ -48,8 +48,8 @@ public final class RsqrtGrad extends RawOp implements Operand RsqrtGrad create(Scope scope, Operand y, Operand dy) { OperationBuilder opBuilder = scope.env().opBuilder("RsqrtGrad", scope.makeOpName("RsqrtGrad")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RsqrtGrad(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 99c1bda676b..335047407e9 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the maximum along segments of a tensor. @@ -71,8 +70,8 @@ public final class SegmentMax extends RawOp implements Operan @Endpoint(describeByClass = true) public static SegmentMax create(Scope scope, Operand data, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SegmentMax", scope.makeOpName("SegmentMax")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SegmentMax(opBuilder.build()); } @@ -86,7 +85,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 263a550e74c..404119f58c1 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 @@ -72,8 +72,8 @@ public final class SegmentMean extends RawOp implements Operand @Endpoint(describeByClass = true) public static SegmentMean create(Scope scope, Operand data, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SegmentMean", scope.makeOpName("SegmentMean")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SegmentMean(opBuilder.build()); } @@ -87,7 +87,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 38a0e75784c..cbb0c9e7f06 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the minimum along segments of a tensor. @@ -71,8 +70,8 @@ public final class SegmentMin extends RawOp implements Operan @Endpoint(describeByClass = true) public static SegmentMin create(Scope scope, Operand data, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SegmentMin", scope.makeOpName("SegmentMin")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SegmentMin(opBuilder.build()); } @@ -86,7 +85,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 36592e64f85..d0b762b67ac 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 @@ -71,8 +71,8 @@ public final class SegmentProd extends RawOp implements Operand @Endpoint(describeByClass = true) public static SegmentProd create(Scope scope, Operand data, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SegmentProd", scope.makeOpName("SegmentProd")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SegmentProd(opBuilder.build()); } @@ -86,7 +86,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 54287c045b2..8105944d561 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 @@ -71,8 +71,8 @@ public final class SegmentSum extends RawOp implements Operand< @Endpoint(describeByClass = true) public static SegmentSum create(Scope scope, Operand data, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SegmentSum", scope.makeOpName("SegmentSum")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SegmentSum(opBuilder.build()); } @@ -86,7 +86,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a12d7061324..bbadefd6ebe 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 @@ -47,7 +47,7 @@ public final class Sigmoid extends RawOp implements Operand @Endpoint(describeByClass = true) public static Sigmoid create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Sigmoid", scope.makeOpName("Sigmoid")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sigmoid(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 c53a0ae603f..ef02016ff69 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 @@ -48,8 +48,8 @@ public final class SigmoidGrad extends RawOp implements Operand @Endpoint(describeByClass = true) public static SigmoidGrad create(Scope scope, Operand y, Operand dy) { OperationBuilder opBuilder = scope.env().opBuilder("SigmoidGrad", scope.makeOpName("SigmoidGrad")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SigmoidGrad(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 6591ed77c71..1ad5ec74846 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 @@ -53,7 +53,7 @@ public final class Sign extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sign create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Sign", scope.makeOpName("Sign")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sign(opBuilder.build()); } @@ -65,7 +65,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 15ef4b31dd2..2d2fd99dae2 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 @@ -55,7 +55,7 @@ public final class Sin extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sin create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Sin", scope.makeOpName("Sin")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sin(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 8785916850b..57d976703da 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 @@ -55,7 +55,7 @@ public final class Sinh extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sinh create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Sinh", scope.makeOpName("Sinh")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sinh(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 d66475e2071..e6fdfa5ff99 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Generates points from the Sobol sequence. @@ -56,9 +55,9 @@ public final class SobolSample extends RawOp implements Opera @Endpoint(describeByClass = true) public static SobolSample create(Scope scope, Operand dim, Operand numResults, Operand skip, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("SobolSample", scope.makeOpName("SobolSample")); - opBuilder.addInput(dim.asOutput()); - opBuilder.addInput(numResults.asOutput()); - opBuilder.addInput(skip.asOutput()); + opBuilder.addInput(dim.asOutput(scope)); + opBuilder.addInput(numResults.asOutput(scope)); + opBuilder.addInput(skip.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new SobolSample(opBuilder.build()); @@ -88,7 +87,7 @@ public Output samples() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return samples; } 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 a4f3a22ebcd..925e4e7d1df 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softplus: `log(exp(features) + 1)`. @@ -46,7 +45,7 @@ public final class Softplus extends RawOp implements Operand< @Endpoint(describeByClass = true) public static Softplus create(Scope scope, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Softplus", scope.makeOpName("Softplus")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Softplus(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 f885abcbdeb..c335a30ef8b 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softplus gradients for a softplus operation. @@ -46,8 +45,8 @@ public final class SoftplusGrad extends RawOp implements Oper @Endpoint(describeByClass = true) public static SoftplusGrad create(Scope scope, Operand gradients, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("SoftplusGrad", scope.makeOpName("SoftplusGrad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SoftplusGrad(opBuilder.build()); } @@ -60,7 +59,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 315173746b2..85d9c840601 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 @@ -47,7 +47,7 @@ public final class Sqrt extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sqrt create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Sqrt", scope.makeOpName("Sqrt")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sqrt(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 5ba9497bbdd..42209ad8a06 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 @@ -48,8 +48,8 @@ public final class SqrtGrad extends RawOp implements Operand @Endpoint(describeByClass = true) public static SqrtGrad create(Scope scope, Operand y, Operand dy) { OperationBuilder opBuilder = scope.env().opBuilder("SqrtGrad", scope.makeOpName("SqrtGrad")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SqrtGrad(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 36fdb6bda9c..9d2ecb8cea2 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 @@ -47,7 +47,7 @@ public final class Square extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Square create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Square", scope.makeOpName("Square")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Square(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 c860747add8..0c84f22b7a8 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 @@ -49,8 +49,8 @@ public final class SquaredDifference extends RawOp implements O @Endpoint(describeByClass = true) public static SquaredDifference create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("SquaredDifference", scope.makeOpName("SquaredDifference")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SquaredDifference(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 1489a80202d..eb4cbda526d 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 @@ -49,8 +49,8 @@ public final class Sub extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sub create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Sub", scope.makeOpName("Sub")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sub(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 1b1ddd50ba5..954d26fd435 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 @@ -56,7 +56,7 @@ public final class Tan extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Tan create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Tan", scope.makeOpName("Tan")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Tan(opBuilder.build()); } @@ -68,7 +68,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 f2611083984..fe85a5d2062 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 @@ -55,7 +55,7 @@ public final class Tanh extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Tanh create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Tanh", scope.makeOpName("Tanh")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Tanh(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 3ebc6ab598d..81a0c3d16c8 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 @@ -48,8 +48,8 @@ public final class TanhGrad extends RawOp implements Operand @Endpoint(describeByClass = true) public static TanhGrad create(Scope scope, Operand y, Operand dy) { OperationBuilder opBuilder = scope.env().opBuilder("TanhGrad", scope.makeOpName("TanhGrad")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TanhGrad(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 a0a1f6697d1..388e37d1935 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 @@ -54,8 +54,8 @@ public final class TruncateDiv extends RawOp implements Operand @Endpoint(describeByClass = true) public static TruncateDiv create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("TruncateDiv", scope.makeOpName("TruncateDiv")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TruncateDiv(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 cfa0461f460..8c42ea8587c 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns element-wise remainder of division. This emulates C semantics in that @@ -53,8 +52,8 @@ public final class TruncateMod extends RawOp implements Opera @Endpoint(describeByClass = true) public static TruncateMod create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("TruncateMod", scope.makeOpName("TruncateMod")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TruncateMod(opBuilder.build()); } @@ -66,7 +65,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 4c509457c3e..e81442b33a3 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the maximum along segments of a tensor. @@ -79,9 +78,9 @@ public final class UnsortedSegmentMax extends RawOp implement @Endpoint(describeByClass = true) public static UnsortedSegmentMax create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentMax", scope.makeOpName("UnsortedSegmentMax")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnsortedSegmentMax(opBuilder.build()); } @@ -96,7 +95,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 bd12cae09b9..187ce9dcb03 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the minimum along segments of a tensor. @@ -73,9 +72,9 @@ public final class UnsortedSegmentMin extends RawOp implement @Endpoint(describeByClass = true) public static UnsortedSegmentMin create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentMin", scope.makeOpName("UnsortedSegmentMin")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnsortedSegmentMin(opBuilder.build()); } @@ -90,7 +89,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 86f2b588cc0..6a7b66ffb70 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 @@ -72,9 +72,9 @@ public final class UnsortedSegmentProd extends RawOp implements @Endpoint(describeByClass = true) public static UnsortedSegmentProd create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentProd", scope.makeOpName("UnsortedSegmentProd")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnsortedSegmentProd(opBuilder.build()); } @@ -89,7 +89,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 95868ce64d0..cfe4c43cd90 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 @@ -75,9 +75,9 @@ public final class UnsortedSegmentSum extends RawOp implements @Endpoint(describeByClass = true) public static UnsortedSegmentSum create(Scope scope, Operand data, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentSum", scope.makeOpName("UnsortedSegmentSum")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnsortedSegmentSum(opBuilder.build()); } @@ -92,7 +92,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5372f4b5c11..33a5c6d0786 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 @@ -46,8 +46,8 @@ public final class Xdivy extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Xdivy create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Xdivy", scope.makeOpName("Xdivy")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Xdivy(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 f0586582e8c..e6ef2362c08 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 @@ -46,8 +46,8 @@ public final class Xlog1py extends RawOp implements Operand @Endpoint(describeByClass = true) public static Xlog1py create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Xlog1py", scope.makeOpName("Xlog1py")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Xlog1py(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 6b303403408..51cca9233f8 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 @@ -46,8 +46,8 @@ public final class Xlogy extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Xlogy create(Scope scope, Operand x, Operand y) { OperationBuilder opBuilder = scope.env().opBuilder("Xlogy", scope.makeOpName("Xlogy")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Xlogy(opBuilder.build()); } @@ -59,7 +59,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 431921f8e2b..69bdc33bc9a 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Compute the Hurwitz zeta function \\(\zeta(x, q)\\). @@ -51,8 +50,8 @@ public final class Zeta extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Zeta create(Scope scope, Operand x, Operand q) { OperationBuilder opBuilder = scope.env().opBuilder("Zeta", scope.makeOpName("Zeta")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(q.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(q.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Zeta(opBuilder.build()); } @@ -64,7 +63,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 385bd855018..13f0a2555f5 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -44,7 +43,7 @@ public final class erfinv extends RawOp implements Operand @Endpoint(describeByClass = true) public static erfinv create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Erfinv", scope.makeOpName("erfinv")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new erfinv(opBuilder.build()); } @@ -56,7 +55,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 0855403368a..14ca4b1a238 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -43,7 +42,7 @@ public final class Dawsn extends RawOp implements Operand @Endpoint(describeByClass = true) public static Dawsn create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Dawsn", scope.makeOpName("Dawsn")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Dawsn(opBuilder.build()); } @@ -55,7 +54,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 1d2aa725fce..75b82d5393e 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -43,7 +42,7 @@ public final class Expint extends RawOp implements Operand @Endpoint(describeByClass = true) public static Expint create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Expint", scope.makeOpName("Expint")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Expint(opBuilder.build()); } @@ -55,7 +54,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 732cfb1ac20..a3c01b3f907 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -43,7 +42,7 @@ public final class FresnelCos extends RawOp implements Operan @Endpoint(describeByClass = true) public static FresnelCos create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("FresnelCos", scope.makeOpName("FresnelCos")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new FresnelCos(opBuilder.build()); } @@ -55,7 +54,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 cab6e46cba8..ad9b92c4bd0 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -43,7 +42,7 @@ public final class FresnelSin extends RawOp implements Operan @Endpoint(describeByClass = true) public static FresnelSin create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("FresnelSin", scope.makeOpName("FresnelSin")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new FresnelSin(opBuilder.build()); } @@ -55,7 +54,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 c313fb84aee..db880ec0346 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code y()} output @@ -43,7 +42,7 @@ public final class Spence extends RawOp implements Operand @Endpoint(describeByClass = true) public static Spence create(Scope scope, Operand x) { OperationBuilder opBuilder = scope.env().opBuilder("Spence", scope.makeOpName("Spence")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Spence(opBuilder.build()); } @@ -55,7 +54,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 de1a858b738..d3ecec8e3e9 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs average pooling on the input. @@ -77,7 +76,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -119,7 +118,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1700745d1ba..234c2f6f0fb 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs 3D average pooling on the input. @@ -76,7 +75,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -118,7 +117,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9426ff8f682..2c3c2b086f9 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients of average pooling function. @@ -78,8 +77,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInputShape.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(origInputShape.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -121,7 +120,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9389f98ad3b..a358705c60d 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients of the average pooling function. @@ -76,8 +75,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInputShape.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(origInputShape.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -119,7 +118,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 23cc0b463ba..00e386428aa 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 @@ -61,11 +61,11 @@ public final class BatchNormWithGlobalNormalization extends Raw @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(t.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(beta.asOutput()); - opBuilder.addInput(gamma.asOutput()); + opBuilder.addInput(t.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); + opBuilder.addInput(gamma.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("variance_epsilon", varianceEpsilon); opBuilder.setAttr("scale_after_normalization", scaleAfterNormalization); @@ -79,7 +79,7 @@ public Output result() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return result; } 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 fe2813b3342..9b77a10fac2 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 @@ -60,11 +60,11 @@ public final class BatchNormWithGlobalNormalizationGrad extends @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(t.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(gamma.asOutput()); - opBuilder.addInput(backprop.asOutput()); + opBuilder.addInput(t.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(gamma.asOutput(scope)); + opBuilder.addInput(backprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("variance_epsilon", varianceEpsilon); opBuilder.setAttr("scale_after_normalization", scaleAfterNormalization); 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 6296f75db61..10c22b99d55 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 @@ -75,8 +75,8 @@ private Options() { @Endpoint(describeByClass = true) public static BiasAdd create(Scope scope, Operand value, Operand bias, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BiasAdd", scope.makeOpName("BiasAdd")); - opBuilder.addInput(value.asOutput()); - opBuilder.addInput(bias.asOutput()); + opBuilder.addInput(value.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -109,7 +109,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 dcc2b537f65..ee31d4802ca 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 @@ -75,7 +75,7 @@ private Options() { @Endpoint(describeByClass = true) public static BiasAddGrad create(Scope scope, Operand outBackprop, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BiasAddGrad", scope.makeOpName("BiasAddGrad")); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -108,7 +108,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 22f0d16f540..497fa707472 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the LSTM cell forward propagation for all the time steps. @@ -106,15 +105,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(seqLenMax.asOutput()); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(csPrev.asOutput()); - opBuilder.addInput(hPrev.asOutput()); - opBuilder.addInput(w.asOutput()); - opBuilder.addInput(wci.asOutput()); - opBuilder.addInput(wcf.asOutput()); - opBuilder.addInput(wco.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(seqLenMax.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(csPrev.asOutput(scope)); + opBuilder.addInput(hPrev.asOutput(scope)); + opBuilder.addInput(w.asOutput(scope)); + opBuilder.addInput(wci.asOutput(scope)); + opBuilder.addInput(wcf.asOutput(scope)); + opBuilder.addInput(wco.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e80bea4006d..c1be585be53 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the LSTM cell backward propagation for the entire time sequence. @@ -67,24 +66,24 @@ public final class BlockLSTMGrad extends RawOp { @Endpoint(describeByClass = true) public static BlockLSTMGrad create(Scope scope, Operand seqLenMax, Operand x, 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 h, Operand csGrad, Operand hGrad, Boolean usePeephole) { OperationBuilder opBuilder = scope.env().opBuilder("BlockLSTMGradV2", scope.makeOpName("BlockLSTMGrad")); - opBuilder.addInput(seqLenMax.asOutput()); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(csPrev.asOutput()); - opBuilder.addInput(hPrev.asOutput()); - opBuilder.addInput(w.asOutput()); - opBuilder.addInput(wci.asOutput()); - opBuilder.addInput(wcf.asOutput()); - opBuilder.addInput(wco.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(i.asOutput()); - opBuilder.addInput(cs.asOutput()); - opBuilder.addInput(f.asOutput()); - opBuilder.addInput(o.asOutput()); - opBuilder.addInput(ci.asOutput()); - opBuilder.addInput(co.asOutput()); - opBuilder.addInput(h.asOutput()); - opBuilder.addInput(csGrad.asOutput()); - opBuilder.addInput(hGrad.asOutput()); + opBuilder.addInput(seqLenMax.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(csPrev.asOutput(scope)); + opBuilder.addInput(hPrev.asOutput(scope)); + opBuilder.addInput(w.asOutput(scope)); + opBuilder.addInput(wci.asOutput(scope)); + opBuilder.addInput(wcf.asOutput(scope)); + opBuilder.addInput(wco.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(i.asOutput(scope)); + opBuilder.addInput(cs.asOutput(scope)); + opBuilder.addInput(f.asOutput(scope)); + opBuilder.addInput(o.asOutput(scope)); + opBuilder.addInput(ci.asOutput(scope)); + opBuilder.addInput(co.asOutput(scope)); + opBuilder.addInput(h.asOutput(scope)); + opBuilder.addInput(csGrad.asOutput(scope)); + opBuilder.addInput(hGrad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("use_peephole", usePeephole); return new BlockLSTMGrad(opBuilder.build()); 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 918230851c3..d6d275cebb8 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 @@ -96,10 +96,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(labelsIndices.asOutput()); - opBuilder.addInput(labelsValues.asOutput()); - opBuilder.addInput(sequenceLength.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(labelsIndices.asOutput(scope)); + opBuilder.addInput(labelsValues.asOutput(scope)); + opBuilder.addInput(sequenceLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 a11bb983ae9..98346cadd65 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 @@ -83,8 +83,8 @@ private Options() { @Endpoint(describeByClass = true) public static ComputeAccidentalHits create(Scope scope, Operand trueClasses, Operand sampledCandidates, Long numTrue, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ComputeAccidentalHits", scope.makeOpName("ComputeAccidentalHits")); - opBuilder.addInput(trueClasses.asOutput()); - opBuilder.addInput(sampledCandidates.asOutput()); + opBuilder.addInput(trueClasses.asOutput(scope)); + opBuilder.addInput(sampledCandidates.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_true", numTrue); if (options != null) { 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 632d54c3890..9345e242e2f 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes a 2-D convolution given 4-D `input` and `filter` tensors. @@ -134,8 +133,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -218,7 +217,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 91e147def81..0e2d0280bf3 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradients of convolution with respect to the filter. @@ -115,9 +114,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filterSizes.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filterSizes.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -201,7 +200,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 389ddb0be4e..4fe74d158bc 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradients of convolution with respect to the input. @@ -115,9 +114,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputSizes.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(inputSizes.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -200,7 +199,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1e80fdb7f80..36520489259 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes a 3-D convolution given 5-D `input` and `filter` tensors. @@ -95,8 +94,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -150,7 +149,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d6d85797b3f..4eb64038363 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradients of 3-D convolution with respect to the filter. @@ -94,9 +93,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filterSizes.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filterSizes.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -150,7 +149,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 08e163494bf..0cb59575a5e 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradients of 3-D convolution with respect to the input. @@ -93,9 +92,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputSizes.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(inputSizes.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -149,7 +148,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8d212909901..103b8adb152 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 @@ -30,7 +30,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs beam search decoding on the logits given in input. @@ -79,8 +78,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(sequenceLength.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(sequenceLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("beam_width", beamWidth); opBuilder.setAttr("top_paths", topPaths); 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 eecea029a34..84eaefbe4e9 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs greedy decoding on the logits given in inputs. @@ -79,8 +78,8 @@ private Options() { @Endpoint(describeByClass = true) public static CtcGreedyDecoder create(Scope scope, Operand inputs, Operand sequenceLength, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("CTCGreedyDecoder", scope.makeOpName("CtcGreedyDecoder")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(sequenceLength.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(sequenceLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 b39f344373e..fee78baaeac 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Calculates the CTC Loss (log probability) for each batch entry. Also calculates @@ -99,10 +98,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(labelsIndices.asOutput()); - opBuilder.addInput(labelsValues.asOutput()); - opBuilder.addInput(sequenceLength.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(labelsIndices.asOutput(scope)); + opBuilder.addInput(labelsValues.asOutput(scope)); + opBuilder.addInput(sequenceLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 9159d1c69c3..25294d15ec3 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * A RNN backed by cuDNN. @@ -180,11 +179,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputH.asOutput()); - opBuilder.addInput(inputC.asOutput()); - opBuilder.addInput(params.asOutput()); - opBuilder.addInput(sequenceLengths.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputH.asOutput(scope)); + opBuilder.addInput(inputC.asOutput(scope)); + opBuilder.addInput(params.asOutput(scope)); + opBuilder.addInput(sequenceLengths.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 adeadb27292..a7424b97117 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Backprop step of CudnnRNNV3. @@ -189,19 +188,19 @@ private Options() { @Endpoint(describeByClass = true) public static CudnnRNNBackprop create(Scope scope, Operand input, Operand inputH, Operand inputC, Operand params, Operand sequenceLengths, 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputH.asOutput()); - opBuilder.addInput(inputC.asOutput()); - opBuilder.addInput(params.asOutput()); - opBuilder.addInput(sequenceLengths.asOutput()); - opBuilder.addInput(output.asOutput()); - opBuilder.addInput(outputH.asOutput()); - opBuilder.addInput(outputC.asOutput()); - opBuilder.addInput(outputBackprop.asOutput()); - opBuilder.addInput(outputHBackprop.asOutput()); - opBuilder.addInput(outputCBackprop.asOutput()); - opBuilder.addInput(reserveSpace.asOutput()); - opBuilder.addInput(hostReserved.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputH.asOutput(scope)); + opBuilder.addInput(inputC.asOutput(scope)); + opBuilder.addInput(params.asOutput(scope)); + opBuilder.addInput(sequenceLengths.asOutput(scope)); + opBuilder.addInput(output.asOutput(scope)); + opBuilder.addInput(outputH.asOutput(scope)); + opBuilder.addInput(outputC.asOutput(scope)); + opBuilder.addInput(outputBackprop.asOutput(scope)); + opBuilder.addInput(outputHBackprop.asOutput(scope)); + opBuilder.addInput(outputCBackprop.asOutput(scope)); + opBuilder.addInput(reserveSpace.asOutput(scope)); + opBuilder.addInput(hostReserved.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 945fdacdf62..dea37f64f78 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Converts CudnnRNN params from canonical form to usable form. It supports the projection in LSTM. @@ -157,11 +156,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(numLayers.asOutput()); - opBuilder.addInput(numUnits.asOutput()); - opBuilder.addInput(inputSize.asOutput()); - opBuilder.addInputList(Operands.asOutputs(weights)); - opBuilder.addInputList(Operands.asOutputs(biases)); + opBuilder.addInput(numLayers.asOutput(scope)); + opBuilder.addInput(numUnits.asOutput(scope)); + opBuilder.addInput(inputSize.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, weights)); + opBuilder.addInputList(Operands.asOutputs(scope, biases)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -247,7 +246,7 @@ public Output params() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return params; } 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 e7fbeebf99f..2bebca47eb7 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 @@ -29,7 +29,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Retrieves CudnnRNN params in canonical form. It supports the projection in LSTM. @@ -159,10 +158,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(numLayers.asOutput()); - opBuilder.addInput(numUnits.asOutput()); - opBuilder.addInput(inputSize.asOutput()); - opBuilder.addInput(params.asOutput()); + opBuilder.addInput(numLayers.asOutput(scope)); + opBuilder.addInput(numUnits.asOutput(scope)); + opBuilder.addInput(inputSize.asOutput(scope)); + opBuilder.addInput(params.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_params_weights", numParamsWeights); opBuilder.setAttr("num_params_biases", numParamsBiases); 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 6cff6fe9836..3b79189560b 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes size of weights that can be used by a Cudnn RNN model. @@ -148,9 +147,9 @@ private Options() { @Endpoint(describeByClass = true) public static CudnnRnnParamsSize create(Scope scope, Operand numLayers, Operand numUnits, Operand inputSize, DataType T, DataType S, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("CudnnRNNParamsSize", scope.makeOpName("CudnnRnnParamsSize")); - opBuilder.addInput(numLayers.asOutput()); - opBuilder.addInput(numUnits.asOutput()); - opBuilder.addInput(inputSize.asOutput()); + opBuilder.addInput(numLayers.asOutput(scope)); + opBuilder.addInput(numUnits.asOutput(scope)); + opBuilder.addInput(inputSize.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("T", T); opBuilder.setAttr("S", S); @@ -238,7 +237,7 @@ public Output paramsSize() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return paramsSize; } 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 eb82df7184c..b495320513c 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the dimension index in the destination data format given the one in @@ -78,7 +77,7 @@ private Options() { @Endpoint(describeByClass = true) public static DataFormatDimMap create(Scope scope, Operand x, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DataFormatDimMap", scope.makeOpName("DataFormatDimMap")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -115,7 +114,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 5a04c0847c7..91e2ba14b89 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the permuted vector/tensor in the destination data format given the @@ -77,7 +76,7 @@ private Options() { @Endpoint(describeByClass = true) public static DataFormatVecPermute create(Scope scope, Operand x, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DataFormatVecPermute", scope.makeOpName("DataFormatVecPermute")); - opBuilder.addInput(x.asOutput()); + opBuilder.addInput(x.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -114,7 +113,7 @@ public Output y() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return y; } 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 523977a1db0..01ee5ece664 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 @@ -146,7 +146,7 @@ private Options() { @Endpoint(describeByClass = true) public static DepthToSpace create(Scope scope, Operand input, Long blockSize, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DepthToSpace", scope.makeOpName("DepthToSpace")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("block_size", blockSize); if (options != null) { @@ -173,7 +173,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 36277e498d5..dd517907f60 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes a 2-D depthwise convolution given 4-D `input` and `filter` tensors. @@ -105,8 +104,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -160,7 +159,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 074d37aba9b..5f66105c000 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradients of depthwise convolution with respect to the filter. @@ -97,9 +96,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filterSizes.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filterSizes.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -156,7 +155,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 323890cbc1e..e25e937bc9c 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradients of depthwise convolution with respect to the input. @@ -96,9 +95,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputSizes.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(inputSizes.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -156,7 +155,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 984c4621881..b1ea894ab18 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the grayscale dilation of 4-D `input` and 3-D `filter` tensors. @@ -77,8 +76,8 @@ public final class Dilation2d extends RawOp implements Operan @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -102,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1e413d9a08c..ab9ae4d8d7c 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of morphological 2-D dilation with respect to the filter. @@ -54,9 +53,9 @@ public final class Dilation2dBackpropFilter extends RawOp imp @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -80,7 +79,7 @@ public Output filterBackprop() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return filterBackprop; } 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 7d247c4288b..8a3e6510a00 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the gradient of morphological 2-D dilation with respect to the input. @@ -54,9 +53,9 @@ public final class Dilation2dBackpropInput extends RawOp impl @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] stridesArray = new long[strides.size()]; for (int i = 0; i < stridesArray.length; ++i) { @@ -80,7 +79,7 @@ public Output inBackprop() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return inBackprop; } 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 f138ee46ce3..c0233a2da82 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes exponential linear: `exp(features) - 1` if < 0, `features` otherwise. @@ -49,7 +48,7 @@ public final class Elu extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Elu create(Scope scope, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Elu", scope.makeOpName("Elu")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Elu(opBuilder.build()); } @@ -61,7 +60,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 fd41f261813..331c5812449 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients for the exponential linear (Elu) operation. @@ -46,8 +45,8 @@ public final class EluGrad extends RawOp implements Operand EluGrad create(Scope scope, Operand gradients, Operand outputs) { OperationBuilder opBuilder = scope.env().opBuilder("EluGrad", scope.makeOpName("EluGrad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(outputs.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(outputs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new EluGrad(opBuilder.build()); } @@ -61,7 +60,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 e99a41a2c56..cf31cd0c75e 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 @@ -169,7 +169,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(trueClasses.asOutput()); + opBuilder.addInput(trueClasses.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_true", numTrue); opBuilder.setAttr("num_sampled", numSampled); 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 189f1b9c27c..4b67b26943a 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs fractional average pooling on the input. @@ -130,7 +129,7 @@ private Options() { @Endpoint(describeByClass = true) public static FractionalAvgPool create(Scope scope, Operand value, List poolingRatio, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FractionalAvgPool", scope.makeOpName("FractionalAvgPool")); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); float[] poolingRatioArray = new float[poolingRatio.size()]; for (int i = 0; i < poolingRatioArray.length; ++i) { 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 26c06215c54..62b89928f8b 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradient of the FractionalAvgPool function. @@ -86,10 +85,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInputTensorShape.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); - opBuilder.addInput(rowPoolingSequence.asOutput()); - opBuilder.addInput(colPoolingSequence.asOutput()); + opBuilder.addInput(origInputTensorShape.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); + opBuilder.addInput(rowPoolingSequence.asOutput(scope)); + opBuilder.addInput(colPoolingSequence.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -124,7 +123,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 015b99a14eb..e9fa329faf1 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs fractional max pooling on the input. @@ -154,7 +153,7 @@ private Options() { @Endpoint(describeByClass = true) public static FractionalMaxPool create(Scope scope, Operand value, List poolingRatio, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FractionalMaxPool", scope.makeOpName("FractionalMaxPool")); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); float[] poolingRatioArray = new float[poolingRatio.size()]; for (int i = 0; i < poolingRatioArray.length; ++i) { 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 cabbf2e038a..95dc04ec01e 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradient of the FractionalMaxPool function. @@ -81,11 +80,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInput.asOutput()); - opBuilder.addInput(origOutput.asOutput()); - opBuilder.addInput(outBackprop.asOutput()); - opBuilder.addInput(rowPoolingSequence.asOutput()); - opBuilder.addInput(colPoolingSequence.asOutput()); + opBuilder.addInput(origInput.asOutput(scope)); + opBuilder.addInput(origOutput.asOutput(scope)); + opBuilder.addInput(outBackprop.asOutput(scope)); + opBuilder.addInput(rowPoolingSequence.asOutput(scope)); + opBuilder.addInput(colPoolingSequence.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -120,7 +119,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 464ae92f2ae..3351661b52a 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Batch normalization. @@ -104,11 +103,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(scale.asOutput()); - opBuilder.addInput(offset.asOutput()); - opBuilder.addInput(mean.asOutput()); - opBuilder.addInput(variance.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(scale.asOutput(scope)); + opBuilder.addInput(offset.asOutput(scope)); + opBuilder.addInput(mean.asOutput(scope)); + opBuilder.addInput(variance.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 52bd5e98084..ba0e0e7dbac 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Gradient for batch normalization. @@ -105,12 +104,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(yBackprop.asOutput()); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(scale.asOutput()); - opBuilder.addInput(reserveSpace1.asOutput()); - opBuilder.addInput(reserveSpace2.asOutput()); - opBuilder.addInput(reserveSpace3.asOutput()); + opBuilder.addInput(yBackprop.asOutput(scope)); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(scale.asOutput(scope)); + opBuilder.addInput(reserveSpace1.asOutput(scope)); + opBuilder.addInput(reserveSpace2.asOutput(scope)); + opBuilder.addInput(reserveSpace3.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 11ec154a076..93cd92cebff 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs a padding as a preprocess during a convolution. @@ -68,9 +67,9 @@ public final class FusedPadConv2d extends RawOp implements Op @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(paddings.asOutput()); - opBuilder.addInput(filter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("mode", mode); long[] stridesArray = new long[strides.size()]; @@ -89,7 +88,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4eda6e97eaa..77fde62f410 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs a resize and padding as a preprocess during a convolution. @@ -90,10 +89,10 @@ private Options() { @Endpoint(describeByClass = true) public static FusedResizeAndPadConv2d create(Scope scope, Operand input, Operand size, Operand paddings, Operand filter, String mode, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FusedResizeAndPadConv2D", scope.makeOpName("FusedResizeAndPadConv2d")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(size.asOutput()); - opBuilder.addInput(paddings.asOutput()); - opBuilder.addInput(filter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("mode", mode); long[] stridesArray = new long[strides.size()]; @@ -127,7 +126,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 49c7d619410..99b1963eb01 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the GRU cell forward propagation for 1 time step. @@ -95,12 +94,12 @@ public final class GRUBlockCell extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(hPrev.asOutput()); - opBuilder.addInput(wRu.asOutput()); - opBuilder.addInput(wC.asOutput()); - opBuilder.addInput(bRu.asOutput()); - opBuilder.addInput(bC.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(hPrev.asOutput(scope)); + opBuilder.addInput(wRu.asOutput(scope)); + opBuilder.addInput(wC.asOutput(scope)); + opBuilder.addInput(bRu.asOutput(scope)); + opBuilder.addInput(bC.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new GRUBlockCell(opBuilder.build()); } 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 bea3442c6c9..61c2f989d49 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the GRU cell back-propagation for 1 time step. @@ -135,16 +134,16 @@ public final class GRUBlockCellGrad extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(hPrev.asOutput()); - opBuilder.addInput(wRu.asOutput()); - opBuilder.addInput(wC.asOutput()); - opBuilder.addInput(bRu.asOutput()); - opBuilder.addInput(bC.asOutput()); - opBuilder.addInput(r.asOutput()); - opBuilder.addInput(u.asOutput()); - opBuilder.addInput(c.asOutput()); - opBuilder.addInput(dH.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(hPrev.asOutput(scope)); + opBuilder.addInput(wRu.asOutput(scope)); + opBuilder.addInput(wC.asOutput(scope)); + opBuilder.addInput(bRu.asOutput(scope)); + opBuilder.addInput(bC.asOutput(scope)); + opBuilder.addInput(r.asOutput(scope)); + opBuilder.addInput(u.asOutput(scope)); + opBuilder.addInput(c.asOutput(scope)); + opBuilder.addInput(dH.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new GRUBlockCellGrad(opBuilder.build()); } 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 1255067ed44..67c468cd1f6 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TBool; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Says whether the targets are in the top `K` predictions. @@ -63,9 +62,9 @@ public final class InTopK extends RawOp implements Operand { @Endpoint(describeByClass = true) public static InTopK create(Scope scope, Operand predictions, Operand targets, Operand k) { OperationBuilder opBuilder = scope.env().opBuilder("InTopKV2", scope.makeOpName("InTopK")); - opBuilder.addInput(predictions.asOutput()); - opBuilder.addInput(targets.asOutput()); - opBuilder.addInput(k.asOutput()); + opBuilder.addInput(predictions.asOutput(scope)); + opBuilder.addInput(targets.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InTopK(opBuilder.build()); } @@ -78,7 +77,7 @@ public Output precision() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return precision; } 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 b0df0c43ee0..a6446c43892 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 @@ -48,8 +48,8 @@ public final class InvGrad extends RawOp implements Operand @Endpoint(describeByClass = true) public static InvGrad create(Scope scope, Operand y, Operand dy) { OperationBuilder opBuilder = scope.env().opBuilder("InvGrad", scope.makeOpName("InvGrad")); - opBuilder.addInput(y.asOutput()); - opBuilder.addInput(dy.asOutput()); + opBuilder.addInput(y.asOutput(scope)); + opBuilder.addInput(dy.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new InvGrad(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output z() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return z; } 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 91d141c787c..162601f35e8 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * L2 Loss. @@ -50,7 +49,7 @@ public final class L2Loss extends RawOp implements Operand @Endpoint(describeByClass = true) public static L2Loss create(Scope scope, Operand t) { OperationBuilder opBuilder = scope.env().opBuilder("L2Loss", scope.makeOpName("L2Loss")); - opBuilder.addInput(t.asOutput()); + opBuilder.addInput(t.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new L2Loss(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a10d335bc0b..d81d2a82a6a 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the LSTM cell forward propagation for 1 time step. @@ -115,14 +114,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(csPrev.asOutput()); - opBuilder.addInput(hPrev.asOutput()); - opBuilder.addInput(w.asOutput()); - opBuilder.addInput(wci.asOutput()); - opBuilder.addInput(wcf.asOutput()); - opBuilder.addInput(wco.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(csPrev.asOutput(scope)); + opBuilder.addInput(hPrev.asOutput(scope)); + opBuilder.addInput(w.asOutput(scope)); + opBuilder.addInput(wci.asOutput(scope)); + opBuilder.addInput(wcf.asOutput(scope)); + opBuilder.addInput(wco.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 bfb5dae0118..435d59abbdb 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the LSTM cell backward propagation for 1 timestep. @@ -63,22 +62,22 @@ public final class LSTMBlockCellGrad extends RawOp { @Endpoint(describeByClass = true) public static LSTMBlockCellGrad create(Scope scope, Operand x, 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")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(csPrev.asOutput()); - opBuilder.addInput(hPrev.asOutput()); - opBuilder.addInput(w.asOutput()); - opBuilder.addInput(wci.asOutput()); - opBuilder.addInput(wcf.asOutput()); - opBuilder.addInput(wco.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(i.asOutput()); - opBuilder.addInput(cs.asOutput()); - opBuilder.addInput(f.asOutput()); - opBuilder.addInput(o.asOutput()); - opBuilder.addInput(ci.asOutput()); - opBuilder.addInput(co.asOutput()); - opBuilder.addInput(csGrad.asOutput()); - opBuilder.addInput(hGrad.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(csPrev.asOutput(scope)); + opBuilder.addInput(hPrev.asOutput(scope)); + opBuilder.addInput(w.asOutput(scope)); + opBuilder.addInput(wci.asOutput(scope)); + opBuilder.addInput(wcf.asOutput(scope)); + opBuilder.addInput(wco.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(i.asOutput(scope)); + opBuilder.addInput(cs.asOutput(scope)); + opBuilder.addInput(f.asOutput(scope)); + opBuilder.addInput(o.asOutput(scope)); + opBuilder.addInput(ci.asOutput(scope)); + opBuilder.addInput(co.asOutput(scope)); + opBuilder.addInput(csGrad.asOutput(scope)); + opBuilder.addInput(hGrad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("use_peephole", usePeephole); return new LSTMBlockCellGrad(opBuilder.build()); 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 54579426b78..02fd19683d7 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes rectified linear: `max(features, features * alpha)`. @@ -65,7 +64,7 @@ private Options() { @Endpoint(describeByClass = true) public static LeakyRelu create(Scope scope, Operand features, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("LeakyRelu", scope.makeOpName("LeakyRelu")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -91,7 +90,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 017ee428cde..548e25eece7 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 @@ -92,7 +92,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(trueClasses.asOutput()); + opBuilder.addInput(trueClasses.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_true", numTrue); opBuilder.setAttr("num_sampled", numSampled); 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 0004fed685b..253dddae244 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Local Response Normalization. @@ -105,7 +104,7 @@ private Options() { @Endpoint(describeByClass = true) public static LocalResponseNormalization create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("LRN", scope.makeOpName("LocalResponseNormalization")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -161,7 +160,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 24d769e571a..5939d159c12 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Gradients for Local Response Normalization. @@ -94,9 +93,9 @@ private Options() { @Endpoint(describeByClass = true) public static LocalResponseNormalizationGrad create(Scope scope, Operand inputGrads, Operand inputImage, Operand outputImage, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("LRNGrad", scope.makeOpName("LocalResponseNormalizationGrad")); - opBuilder.addInput(inputGrads.asOutput()); - opBuilder.addInput(inputImage.asOutput()); - opBuilder.addInput(outputImage.asOutput()); + opBuilder.addInput(inputGrads.asOutput(scope)); + opBuilder.addInput(inputImage.asOutput(scope)); + opBuilder.addInput(outputImage.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -153,7 +152,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 58035248560..a324d30f348 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes log softmax activations. @@ -50,7 +49,7 @@ public final class LogSoftmax extends RawOp implements Operan @Endpoint(describeByClass = true) public static LogSoftmax create(Scope scope, Operand logits) { OperationBuilder opBuilder = scope.env().opBuilder("LogSoftmax", scope.makeOpName("LogSoftmax")); - opBuilder.addInput(logits.asOutput()); + opBuilder.addInput(logits.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new LogSoftmax(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output logsoftmax() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return logsoftmax; } 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 4df68034706..fb95e33d515 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 @@ -74,9 +74,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(ksize.asOutput()); - opBuilder.addInput(strides.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(ksize.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("padding", padding); if (options != null) { @@ -108,7 +108,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c38fd7b341e..059a4a8943c 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs 3D max pooling on the input. @@ -76,7 +75,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -118,7 +117,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8361c38b80a..99fe0c64064 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients of max pooling function. @@ -78,9 +77,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInput.asOutput()); - opBuilder.addInput(origOutput.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(origInput.asOutput(scope)); + opBuilder.addInput(origOutput.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -121,7 +120,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 93407692efa..9cf17ec2379 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes second-order gradients of the maxpooling function. @@ -78,9 +77,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInput.asOutput()); - opBuilder.addInput(origOutput.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(origInput.asOutput(scope)); + opBuilder.addInput(origOutput.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -122,7 +121,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7db3693e736..ff103553ca4 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients of the maxpooling function. @@ -77,11 +76,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInput.asOutput()); - opBuilder.addInput(origOutput.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(ksize.asOutput()); - opBuilder.addInput(strides.asOutput()); + opBuilder.addInput(origInput.asOutput(scope)); + opBuilder.addInput(origOutput.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(ksize.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("padding", padding); if (options != null) { @@ -113,7 +112,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9fee7af4c0e..14c933fc251 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes second-order gradients of the maxpooling function. @@ -77,11 +76,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(origInput.asOutput()); - opBuilder.addInput(origOutput.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(ksize.asOutput()); - opBuilder.addInput(strides.asOutput()); + opBuilder.addInput(origInput.asOutput(scope)); + opBuilder.addInput(origOutput.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(ksize.asOutput(scope)); + opBuilder.addInput(strides.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("padding", padding); if (options != null) { @@ -113,7 +112,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 232f2ec18a8..27a91c800ec 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes second-order gradients of the maxpooling function. @@ -74,9 +73,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(argmax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(argmax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -114,7 +113,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8d1aa1da798..e7191c0a1e6 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients of the maxpooling function. @@ -73,9 +72,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(argmax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(argmax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { @@ -113,7 +112,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4eeb66cbc68..983c9dd8d2b 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 @@ -29,7 +29,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Performs max pooling on the input and outputs both max values and indices. @@ -85,7 +84,7 @@ private Options() { @Endpoint(describeByClass = true) public static MaxPoolWithArgmax create(Scope scope, Operand input, List ksize, List strides, DataType Targmax, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MaxPoolWithArgmax", scope.makeOpName("MaxPoolWithArgmax")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { 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 cf379fa5ecf..ccd2ccf7f35 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Finds values of the `n`-th order statistic for the last dimension. @@ -78,8 +77,8 @@ private Options() { @Endpoint(describeByClass = true) public static NthElement create(Scope scope, Operand input, Operand n, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("NthElement", scope.makeOpName("NthElement")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(n.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(n.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -107,7 +106,7 @@ public Output values() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return values; } 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 9ac24133f7c..1925a38f84a 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 @@ -54,9 +54,9 @@ public final class QuantizedAvgPool extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { 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 dd5b716b401..f2ebb87ab98 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 @@ -75,21 +75,21 @@ public final class QuantizedBatchNormWithGlobalNormalization ex @Endpoint(describeByClass = true) public static QuantizedBatchNormWithGlobalNormalization create(Scope scope, Operand t, Operand tMin, Operand tMax, Operand m, Operand mMin, Operand mMax, Operand v, Operand vMin, Operand vMax, Operand beta, Operand betaMin, Operand betaMax, Operand gamma, Operand gammaMin, Operand gammaMax, DataType outType, Float varianceEpsilon, Boolean scaleAfterNormalization) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedBatchNormWithGlobalNormalization", scope.makeOpName("QuantizedBatchNormWithGlobalNormalization")); - opBuilder.addInput(t.asOutput()); - opBuilder.addInput(tMin.asOutput()); - opBuilder.addInput(tMax.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(mMin.asOutput()); - opBuilder.addInput(mMax.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(vMin.asOutput()); - opBuilder.addInput(vMax.asOutput()); - opBuilder.addInput(beta.asOutput()); - opBuilder.addInput(betaMin.asOutput()); - opBuilder.addInput(betaMax.asOutput()); - opBuilder.addInput(gamma.asOutput()); - opBuilder.addInput(gammaMin.asOutput()); - opBuilder.addInput(gammaMax.asOutput()); + opBuilder.addInput(t.asOutput(scope)); + opBuilder.addInput(tMin.asOutput(scope)); + opBuilder.addInput(tMax.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(mMin.asOutput(scope)); + opBuilder.addInput(mMax.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(vMin.asOutput(scope)); + opBuilder.addInput(vMax.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); + opBuilder.addInput(betaMin.asOutput(scope)); + opBuilder.addInput(betaMax.asOutput(scope)); + opBuilder.addInput(gamma.asOutput(scope)); + opBuilder.addInput(gammaMin.asOutput(scope)); + opBuilder.addInput(gammaMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); opBuilder.setAttr("variance_epsilon", varianceEpsilon); 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 818c4455ac5..a0da65f7195 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 @@ -55,12 +55,12 @@ public final class QuantizedBiasAdd extends RawOp { @Endpoint(describeByClass = true) public static QuantizedBiasAdd create(Scope scope, Operand input, Operand bias, Operand minInput, Operand maxInput, Operand minBias, Operand maxBias, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedBiasAdd", scope.makeOpName("QuantizedBiasAdd")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minBias.asOutput()); - opBuilder.addInput(maxBias.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minBias.asOutput(scope)); + opBuilder.addInput(maxBias.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new QuantizedBiasAdd(opBuilder.build()); 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 f1258c3ac71..5b44d96cdec 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 @@ -82,12 +82,12 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DAndRelu create(Scope scope, Operand input, Operand filter, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndRelu", scope.makeOpName("QuantizedConv2DAndRelu")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 9a763e629d9..4562dbf0bb8 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 @@ -84,14 +84,14 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DAndReluAndRequantize create(Scope scope, Operand input, Operand filter, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndReluAndRequantize", scope.makeOpName("QuantizedConv2DAndReluAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 ac1ca66f079..27123a6918e 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 @@ -84,14 +84,14 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DAndRequantize create(Scope scope, Operand input, Operand filter, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DAndRequantize", scope.makeOpName("QuantizedConv2DAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 da2dfa6e491..d330d96acac 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 @@ -75,12 +75,12 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DPerChannel create(Scope scope, Operand input, Operand filter, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DPerChannel", scope.makeOpName("QuantizedConv2DPerChannel")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 da843bf735a..6a5da99645a 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 @@ -83,13 +83,13 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBias create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBias", scope.makeOpName("QuantizedConv2DWithBias")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 6176626745d..189472dae67 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 @@ -83,13 +83,13 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBiasAndRelu create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndRelu", scope.makeOpName("QuantizedConv2DWithBiasAndRelu")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 d6700e175a5..2e6ffb88d2a 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 @@ -85,15 +85,15 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBiasAndReluAndRequantize create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasAndReluAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 7f8d24095e4..9c5728f2410 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 @@ -85,15 +85,15 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBiasAndRequantize create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 cc3d6cc73dc..e691a6384f3 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,18 +88,18 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBiasSignedSumAndReluAndRequantize create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Operand summand, Operand minSummand, Operand maxSummand, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasSignedSumAndReluAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); - opBuilder.addInput(summand.asOutput()); - opBuilder.addInput(minSummand.asOutput()); - opBuilder.addInput(maxSummand.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); + opBuilder.addInput(summand.asOutput(scope)); + opBuilder.addInput(minSummand.asOutput(scope)); + opBuilder.addInput(maxSummand.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 69759e0bc8a..034dcda53f4 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 @@ -84,14 +84,14 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBiasSumAndRelu create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand summand, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSumAndRelu", scope.makeOpName("QuantizedConv2DWithBiasSumAndRelu")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(summand.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(summand.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 e6d03b99188..89ef4bd6c74 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,18 +88,18 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2DWithBiasSumAndReluAndRequantize create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, Operand summand, Operand minSummand, Operand maxSummand, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2DWithBiasSumAndReluAndRequantize", scope.makeOpName("QuantizedConv2DWithBiasSumAndReluAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); - opBuilder.addInput(summand.asOutput()); - opBuilder.addInput(minSummand.asOutput()); - opBuilder.addInput(maxSummand.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); + opBuilder.addInput(summand.asOutput(scope)); + opBuilder.addInput(minSummand.asOutput(scope)); + opBuilder.addInput(maxSummand.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 c791a624c51..2c126cf21b3 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 @@ -86,12 +86,12 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedConv2d create(Scope scope, Operand input, Operand filter, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConv2D", scope.makeOpName("QuantizedConv2d")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 2145de9c8eb..1e24089fd84 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 @@ -75,12 +75,12 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedDepthwiseConv2D create(Scope scope, Operand input, Operand filter, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2D", scope.makeOpName("QuantizedDepthwiseConv2D")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 5aa0d466d0e..cdd250b273c 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 @@ -76,13 +76,13 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedDepthwiseConv2DWithBias create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBias", scope.makeOpName("QuantizedDepthwiseConv2DWithBias")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 46e628f2c29..53f8507cd5d 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 @@ -85,13 +85,13 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedDepthwiseConv2DWithBiasAndRelu create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBiasAndRelu", scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndRelu")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 3a13eaaa567..7bf7601bb12 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 @@ -87,15 +87,15 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize create(Scope scope, Operand input, Operand filter, Operand bias, Operand minInput, Operand maxInput, Operand minFilter, Operand maxFilter, Operand minFreezedOutput, Operand maxFreezedOutput, DataType outType, List strides, String padding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize", scope.makeOpName("QuantizedDepthwiseConv2DWithBiasAndReluAndRequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(filter.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); - opBuilder.addInput(minFilter.asOutput()); - opBuilder.addInput(maxFilter.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(filter.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); + opBuilder.addInput(minFilter.asOutput(scope)); + opBuilder.addInput(maxFilter.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); long[] stridesArray = new long[strides.size()]; 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 ba393889984..ff7962047c0 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 @@ -106,9 +106,9 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedInstanceNorm create(Scope scope, Operand x, Operand xMin, Operand xMax, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedInstanceNorm", scope.makeOpName("QuantizedInstanceNorm")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(xMin.asOutput()); - opBuilder.addInput(xMax.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(xMin.asOutput(scope)); + opBuilder.addInput(xMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 94c00253cc5..50aa58e8e8c 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 @@ -54,9 +54,9 @@ public final class QuantizedMaxPool extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(minInput.asOutput()); - opBuilder.addInput(maxInput.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(minInput.asOutput(scope)); + opBuilder.addInput(maxInput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] ksizeArray = new long[ksize.size()]; for (int i = 0; i < ksizeArray.length; ++i) { 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 9c9407e0b9a..e4627a46624 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 @@ -50,9 +50,9 @@ public final class QuantizedRelu extends RawOp { @Endpoint(describeByClass = true) public static QuantizedRelu create(Scope scope, Operand features, Operand minFeatures, Operand maxFeatures, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedRelu", scope.makeOpName("QuantizedRelu")); - opBuilder.addInput(features.asOutput()); - opBuilder.addInput(minFeatures.asOutput()); - opBuilder.addInput(maxFeatures.asOutput()); + opBuilder.addInput(features.asOutput(scope)); + opBuilder.addInput(minFeatures.asOutput(scope)); + opBuilder.addInput(maxFeatures.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new QuantizedRelu(opBuilder.build()); 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 150ec50779e..f5c6681303e 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 @@ -50,9 +50,9 @@ public final class QuantizedRelu6 extends RawOp { @Endpoint(describeByClass = true) public static QuantizedRelu6 create(Scope scope, Operand features, Operand minFeatures, Operand maxFeatures, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedRelu6", scope.makeOpName("QuantizedRelu6")); - opBuilder.addInput(features.asOutput()); - opBuilder.addInput(minFeatures.asOutput()); - opBuilder.addInput(maxFeatures.asOutput()); + opBuilder.addInput(features.asOutput(scope)); + opBuilder.addInput(minFeatures.asOutput(scope)); + opBuilder.addInput(maxFeatures.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new QuantizedRelu6(opBuilder.build()); 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 2d446c3a45d..d0206c217ed 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 @@ -51,10 +51,10 @@ public final class QuantizedReluX extends RawOp { @Endpoint(describeByClass = true) public static QuantizedReluX create(Scope scope, Operand features, Operand maxValue, Operand minFeatures, Operand maxFeatures, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedReluX", scope.makeOpName("QuantizedReluX")); - opBuilder.addInput(features.asOutput()); - opBuilder.addInput(maxValue.asOutput()); - opBuilder.addInput(minFeatures.asOutput()); - opBuilder.addInput(maxFeatures.asOutput()); + opBuilder.addInput(features.asOutput(scope)); + opBuilder.addInput(maxValue.asOutput(scope)); + opBuilder.addInput(minFeatures.asOutput(scope)); + opBuilder.addInput(maxFeatures.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new QuantizedReluX(opBuilder.build()); 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 2facaa697ec..5bd78dc3483 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 @@ -50,7 +50,7 @@ public final class Relu extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Relu create(Scope scope, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Relu", scope.makeOpName("Relu")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Relu(opBuilder.build()); } @@ -62,7 +62,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 f32eb410f00..38433227a1e 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes rectified linear 6: `min(max(features, 0), 6)`. @@ -46,7 +45,7 @@ public final class Relu6 extends RawOp implements Operand @Endpoint(describeByClass = true) public static Relu6 create(Scope scope, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Relu6", scope.makeOpName("Relu6")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Relu6(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 7cd8e3197e6..e2dc6a92559 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes rectified linear 6 gradients for a Relu6 operation. @@ -47,8 +46,8 @@ public final class Relu6Grad extends RawOp implements Operand @Endpoint(describeByClass = true) public static Relu6Grad create(Scope scope, Operand gradients, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Relu6Grad", scope.makeOpName("Relu6Grad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Relu6Grad(opBuilder.build()); } @@ -62,7 +61,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 c467c606b69..0881a584e28 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes rectified linear gradients for a Relu operation. @@ -47,8 +46,8 @@ public final class ReluGrad extends RawOp implements Operand< @Endpoint(describeByClass = true) public static ReluGrad create(Scope scope, Operand gradients, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("ReluGrad", scope.makeOpName("ReluGrad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ReluGrad(opBuilder.build()); } @@ -61,7 +60,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 dae469aa5a3..11770ffaff0 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes scaled exponential linear: `scale * alpha * (exp(features) - 1)` @@ -54,7 +53,7 @@ public final class Selu extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Selu create(Scope scope, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Selu", scope.makeOpName("Selu")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Selu(opBuilder.build()); } @@ -66,7 +65,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 91389503235..ec41bd5f08d 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients for the scaled exponential linear (Selu) operation. @@ -46,8 +45,8 @@ public final class SeluGrad extends RawOp implements Operand< @Endpoint(describeByClass = true) public static SeluGrad create(Scope scope, Operand gradients, Operand outputs) { OperationBuilder opBuilder = scope.env().opBuilder("SeluGrad", scope.makeOpName("SeluGrad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(outputs.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(outputs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SeluGrad(opBuilder.build()); } @@ -61,7 +60,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 c1744627645..113a5e97653 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softmax activations. @@ -50,7 +49,7 @@ public final class Softmax extends RawOp implements Operand Softmax create(Scope scope, Operand logits) { OperationBuilder opBuilder = scope.env().opBuilder("Softmax", scope.makeOpName("Softmax")); - opBuilder.addInput(logits.asOutput()); + opBuilder.addInput(logits.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Softmax(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output softmax() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return softmax; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java index 41281b996ff..32e55c4f4ac 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SoftmaxCrossEntropyWithLogits.java @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softmax cross entropy cost and gradients to backpropagate. @@ -51,8 +50,8 @@ public final class SoftmaxCrossEntropyWithLogits extends RawO @Endpoint(describeByClass = true) public static SoftmaxCrossEntropyWithLogits create(Scope scope, Operand features, Operand labels) { OperationBuilder opBuilder = scope.env().opBuilder("SoftmaxCrossEntropyWithLogits", scope.makeOpName("SoftmaxCrossEntropyWithLogits")); - opBuilder.addInput(features.asOutput()); - opBuilder.addInput(labels.asOutput()); + opBuilder.addInput(features.asOutput(scope)); + opBuilder.addInput(labels.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SoftmaxCrossEntropyWithLogits(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 e117be94537..e2f2ad67766 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softsign: `features / (abs(features) + 1)`. @@ -46,7 +45,7 @@ public final class Softsign extends RawOp implements Operand< @Endpoint(describeByClass = true) public static Softsign create(Scope scope, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("Softsign", scope.makeOpName("Softsign")); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Softsign(opBuilder.build()); } @@ -58,7 +57,7 @@ public Output activations() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return activations; } 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 2c4fd467661..69697df57f8 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softsign gradients for a softsign operation. @@ -46,8 +45,8 @@ public final class SoftsignGrad extends RawOp implements Oper @Endpoint(describeByClass = true) public static SoftsignGrad create(Scope scope, Operand gradients, Operand features) { OperationBuilder opBuilder = scope.env().opBuilder("SoftsignGrad", scope.makeOpName("SoftsignGrad")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(features.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(features.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SoftsignGrad(opBuilder.build()); } @@ -60,7 +59,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 b8ab8d48658..34cacde78bf 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 @@ -124,8 +124,8 @@ public final class SpaceToBatch extends RawOp implements Operan @Endpoint(describeByClass = true) public static SpaceToBatch create(Scope scope, Operand input, Operand paddings, Long blockSize) { OperationBuilder opBuilder = scope.env().opBuilder("SpaceToBatch", scope.makeOpName("SpaceToBatch")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(paddings.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(paddings.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("block_size", blockSize); return new SpaceToBatch(opBuilder.build()); @@ -138,7 +138,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 100ac91e7da..3f5459a95ec 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 @@ -140,7 +140,7 @@ private Options() { @Endpoint(describeByClass = true) public static SpaceToDepth create(Scope scope, Operand input, Long blockSize, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SpaceToDepth", scope.makeOpName("SpaceToDepth")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("block_size", blockSize); if (options != null) { @@ -167,7 +167,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java index f2434cd4eb8..0c62793e97e 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/nn/SparseSoftmaxCrossEntropyWithLogits.java @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes softmax cross entropy cost and gradients to backpropagate. @@ -55,8 +54,8 @@ public final class SparseSoftmaxCrossEntropyWithLogits extend @Endpoint(describeByClass = true) public static SparseSoftmaxCrossEntropyWithLogits create(Scope scope, Operand features, Operand labels) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSoftmaxCrossEntropyWithLogits", scope.makeOpName("SparseSoftmaxCrossEntropyWithLogits")); - opBuilder.addInput(features.asOutput()); - opBuilder.addInput(labels.asOutput()); + opBuilder.addInput(features.asOutput(scope)); + opBuilder.addInput(labels.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSoftmaxCrossEntropyWithLogits(opBuilder.build()); } 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 28a810ebc54..9713c85511c 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Finds values and indices of the `k` largest elements for the last dimension. @@ -81,8 +80,8 @@ private Options() { @Endpoint(describeByClass = true) public static TopK create(Scope scope, Operand input, Operand k, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TopKV2", scope.makeOpName("TopK")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(k.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(k.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 f759acb0a51..d03ee3f81f0 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 @@ -139,9 +139,9 @@ private Options() { @Endpoint(describeByClass = true) public static Dequantize create(Scope scope, Operand input, Operand minRange, Operand maxRange, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Dequantize", scope.makeOpName("Dequantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(minRange.asOutput()); - opBuilder.addInput(maxRange.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(minRange.asOutput(scope)); + opBuilder.addInput(maxRange.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -203,7 +203,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 16ea096ef9d..e3a0933e421 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 @@ -107,7 +107,7 @@ private Options() { @Endpoint(describeByClass = true) public static FakeQuantWithMinMaxArgs create(Scope scope, Operand inputs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxArgs", scope.makeOpName("FakeQuantWithMinMaxArgs")); - opBuilder.addInput(inputs.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -163,7 +163,7 @@ public Output outputs() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputs; } 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 71da232b5df..5baaea8d666 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 @@ -91,8 +91,8 @@ private Options() { @Endpoint(describeByClass = true) public static FakeQuantWithMinMaxArgsGradient create(Scope scope, Operand gradients, Operand inputs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxArgsGradient", scope.makeOpName("FakeQuantWithMinMaxArgsGradient")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(inputs.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(inputs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -150,7 +150,7 @@ public Output backprops() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return backprops; } 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 21113c6a6f3..1538e109fe3 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 @@ -94,9 +94,9 @@ private Options() { @Endpoint(describeByClass = true) public static FakeQuantWithMinMaxVars create(Scope scope, Operand inputs, Operand min, Operand max, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxVars", scope.makeOpName("FakeQuantWithMinMaxVars")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(min.asOutput()); - opBuilder.addInput(max.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(min.asOutput(scope)); + opBuilder.addInput(max.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -132,7 +132,7 @@ public Output outputs() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputs; } 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 7b4e10d9c21..bdcc9865c8e 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 @@ -76,10 +76,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(min.asOutput()); - opBuilder.addInput(max.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(min.asOutput(scope)); + opBuilder.addInput(max.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 1302ae47b32..f10f351809d 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 @@ -95,9 +95,9 @@ private Options() { @Endpoint(describeByClass = true) public static FakeQuantWithMinMaxVarsPerChannel create(Scope scope, Operand inputs, Operand min, Operand max, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("FakeQuantWithMinMaxVarsPerChannel", scope.makeOpName("FakeQuantWithMinMaxVarsPerChannel")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(min.asOutput()); - opBuilder.addInput(max.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(min.asOutput(scope)); + opBuilder.addInput(max.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -133,7 +133,7 @@ public Output outputs() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputs; } 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 3e104c42c90..05fc3abad29 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 @@ -78,10 +78,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(gradients.asOutput()); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(min.asOutput()); - opBuilder.addInput(max.asOutput()); + opBuilder.addInput(gradients.asOutput(scope)); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(min.asOutput(scope)); + opBuilder.addInput(max.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 1b6ed2fd791..57a5ab0f982 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 @@ -222,9 +222,9 @@ private Options() { @Endpoint(describeByClass = true) public static Quantize create(Scope scope, Operand input, Operand minRange, Operand maxRange, DataType T, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizeV2", scope.makeOpName("Quantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(minRange.asOutput()); - opBuilder.addInput(maxRange.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(minRange.asOutput(scope)); + opBuilder.addInput(maxRange.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("T", T); if (options != null) { 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 d90d91706d9..33ca9d35e4e 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Quantizes then dequantizes a tensor. @@ -100,10 +99,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); - opBuilder.addInput(numBits.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); + opBuilder.addInput(numBits.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -159,7 +158,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3b77c20f70c..478396f2cb4 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 @@ -73,9 +73,9 @@ public final class QuantizeDownAndShrinkRange extends RawOp { @Endpoint(describeByClass = true) public static QuantizeDownAndShrinkRange create(Scope scope, Operand input, Operand inputMin, Operand inputMax, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizeDownAndShrinkRange", scope.makeOpName("QuantizeDownAndShrinkRange")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new QuantizeDownAndShrinkRange(opBuilder.build()); 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 46f73857d91..26749ca5034 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 @@ -53,10 +53,10 @@ public final class QuantizedConcat extends RawOp { @Endpoint(describeByClass = true) public static QuantizedConcat create(Scope scope, Operand concatDim, Iterable> values, Iterable> inputMins, Iterable> inputMaxes) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedConcat", scope.makeOpName("QuantizedConcat")); - opBuilder.addInput(concatDim.asOutput()); - opBuilder.addInputList(Operands.asOutputs(values)); - opBuilder.addInputList(Operands.asOutputs(inputMins)); - opBuilder.addInputList(Operands.asOutputs(inputMaxes)); + opBuilder.addInput(concatDim.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); + opBuilder.addInputList(Operands.asOutputs(scope, inputMins)); + opBuilder.addInputList(Operands.asOutputs(scope, inputMaxes)); opBuilder = scope.applyControlDependencies(opBuilder); return new QuantizedConcat(opBuilder.build()); } 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 42da8ab044f..94585c41fd5 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 @@ -92,15 +92,15 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedMatMulWithBiasAndDequantize create(Scope scope, Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, Operand minFreezedOutput, Operand maxFreezedOutput, DataType Toutput, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndDequantize", scope.makeOpName("QuantizedMatMulWithBiasAndDequantize")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minA.asOutput()); - opBuilder.addInput(maxA.asOutput()); - opBuilder.addInput(minB.asOutput()); - opBuilder.addInput(maxB.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minA.asOutput(scope)); + opBuilder.addInput(maxA.asOutput(scope)); + opBuilder.addInput(minB.asOutput(scope)); + opBuilder.addInput(maxB.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); if (options != null) { @@ -147,7 +147,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 a3ececf8fb3..fda6c7cc98a 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 @@ -91,15 +91,15 @@ private Options() { @Endpoint(describeByClass = true) public static QuantizedMatMulWithBiasAndRequantize create(Scope scope, Operand a, Operand b, Operand bias, Operand minA, Operand maxA, Operand minB, Operand maxB, Operand minFreezedOutput, Operand maxFreezedOutput, DataType Toutput, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("QuantizedMatMulWithBiasAndRequantize", scope.makeOpName("QuantizedMatMulWithBiasAndRequantize")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); - opBuilder.addInput(bias.asOutput()); - opBuilder.addInput(minA.asOutput()); - opBuilder.addInput(maxA.asOutput()); - opBuilder.addInput(minB.asOutput()); - opBuilder.addInput(maxB.asOutput()); - opBuilder.addInput(minFreezedOutput.asOutput()); - opBuilder.addInput(maxFreezedOutput.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); + opBuilder.addInput(bias.asOutput(scope)); + opBuilder.addInput(minA.asOutput(scope)); + opBuilder.addInput(maxA.asOutput(scope)); + opBuilder.addInput(minB.asOutput(scope)); + opBuilder.addInput(maxB.asOutput(scope)); + opBuilder.addInput(minFreezedOutput.asOutput(scope)); + opBuilder.addInput(maxFreezedOutput.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Toutput", Toutput); if (options != null) { 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 85eddcd506a..897d42c511c 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 @@ -51,9 +51,9 @@ public final class RequantizationRange extends RawOp { @Endpoint(describeByClass = true) public static RequantizationRange create(Scope scope, Operand input, Operand inputMin, Operand inputMax) { OperationBuilder opBuilder = scope.env().opBuilder("RequantizationRange", scope.makeOpName("RequantizationRange")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RequantizationRange(opBuilder.build()); } 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 987dd660095..aad9a358285 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 @@ -60,11 +60,11 @@ public final class Requantize extends RawOp { @Endpoint(describeByClass = true) public static Requantize create(Scope scope, Operand input, Operand inputMin, Operand inputMax, Operand requestedOutputMin, Operand requestedOutputMax, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("Requantize", scope.makeOpName("Requantize")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(inputMin.asOutput()); - opBuilder.addInput(inputMax.asOutput()); - opBuilder.addInput(requestedOutputMin.asOutput()); - opBuilder.addInput(requestedOutputMax.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(inputMin.asOutput(scope)); + opBuilder.addInput(inputMax.asOutput(scope)); + opBuilder.addInput(requestedOutputMin.asOutput(scope)); + opBuilder.addInput(requestedOutputMax.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new Requantize(opBuilder.build()); 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 c200b82da2a..74263034667 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 @@ -86,9 +86,9 @@ public final class RaggedGather extends RawO @Endpoint(describeByClass = true) public static RaggedGather create(Scope scope, Iterable> paramsNestedSplits, Operand paramsDenseValues, Operand indices, Long OUTPUTRAGGEDRANK) { OperationBuilder opBuilder = scope.env().opBuilder("RaggedGather", scope.makeOpName("RaggedGather")); - opBuilder.addInputList(Operands.asOutputs(paramsNestedSplits)); - opBuilder.addInput(paramsDenseValues.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, paramsNestedSplits)); + opBuilder.addInput(paramsDenseValues.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("OUTPUT_RAGGED_RANK", OUTPUTRAGGEDRANK); return new RaggedGather(opBuilder.build()); 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 8fd3fb45bea..9d443530a9a 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns a `RaggedTensor` containing the specified sequences of numbers. @@ -66,9 +65,9 @@ public final class RaggedRange extends Raw @Endpoint(describeByClass = true) public static RaggedRange create(Scope scope, Operand starts, Operand limits, Operand deltas, DataType Tsplits) { OperationBuilder opBuilder = scope.env().opBuilder("RaggedRange", scope.makeOpName("RaggedRange")); - opBuilder.addInput(starts.asOutput()); - opBuilder.addInput(limits.asOutput()); - opBuilder.addInput(deltas.asOutput()); + opBuilder.addInput(starts.asOutput(scope)); + opBuilder.addInput(limits.asOutput(scope)); + opBuilder.addInput(deltas.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tsplits", Tsplits); return new RaggedRange(opBuilder.build()); 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 3b094d70e0b..38c9a31033f 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 @@ -69,7 +69,7 @@ public final class RaggedTensorFromVariant e @Endpoint(describeByClass = true) public static RaggedTensorFromVariant create(Scope scope, Operand encodedRagged, Long inputRaggedRank, Long outputRaggedRank, DataType Tvalues, DataType Tsplits) { OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorFromVariant", scope.makeOpName("RaggedTensorFromVariant")); - opBuilder.addInput(encodedRagged.asOutput()); + opBuilder.addInput(encodedRagged.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("input_ragged_rank", inputRaggedRank); opBuilder.setAttr("output_ragged_rank", outputRaggedRank); 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 d4443b915ac..e3b956562e8 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 @@ -52,8 +52,8 @@ public final class RaggedTensorToSparse extends RawOp { @Endpoint(describeByClass = true) public static RaggedTensorToSparse create(Scope scope, Iterable> rtNestedSplits, Operand rtDenseValues) { OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToSparse", scope.makeOpName("RaggedTensorToSparse")); - opBuilder.addInputList(Operands.asOutputs(rtNestedSplits)); - opBuilder.addInput(rtDenseValues.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, rtNestedSplits)); + opBuilder.addInput(rtDenseValues.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RaggedTensorToSparse(opBuilder.build()); } 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 d5b03b37352..6f482ed1898 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,10 +108,10 @@ public final class RaggedTensorToTensor extends RawOp implement @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(defaultValue.asOutput()); - opBuilder.addInputList(Operands.asOutputs(rowPartitionTensors)); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(defaultValue.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, rowPartitionTensors)); opBuilder = scope.applyControlDependencies(opBuilder); String[] rowPartitionTypesArray = new String[rowPartitionTypes.size()]; for (int i = 0; i < rowPartitionTypesArray.length; ++i) { @@ -129,7 +129,7 @@ public Output result() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return result; } 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 b8c1570a573..13eb61054f4 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 @@ -60,8 +60,8 @@ public final class RaggedTensorToVariant extends RawOp implements Operand @Endpoint(describeByClass = true) public static RaggedTensorToVariant create(Scope scope, Iterable> rtNestedSplits, Operand rtDenseValues, Boolean batchedInput) { OperationBuilder opBuilder = scope.env().opBuilder("RaggedTensorToVariant", scope.makeOpName("RaggedTensorToVariant")); - opBuilder.addInputList(Operands.asOutputs(rtNestedSplits)); - opBuilder.addInput(rtDenseValues.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, rtNestedSplits)); + opBuilder.addInput(rtDenseValues.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("batched_input", batchedInput); return new RaggedTensorToVariant(opBuilder.build()); @@ -76,7 +76,7 @@ public Output encodedRagged() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) encodedRagged; } 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 1fca347c024..fc49c35a18c 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 @@ -91,7 +91,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(trueClasses.asOutput()); + opBuilder.addInput(trueClasses.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_true", numTrue); opBuilder.setAttr("num_sampled", numSampled); 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 f0d6d9d77cd..5bfca5e0ff9 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 @@ -42,8 +42,8 @@ public final class AnonymousRandomSeedGenerator extends RawOp { @Endpoint(describeByClass = true) public static AnonymousRandomSeedGenerator create(Scope scope, Operand seed, Operand seed2) { OperationBuilder opBuilder = scope.env().opBuilder("AnonymousRandomSeedGenerator", scope.makeOpName("AnonymousRandomSeedGenerator")); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(seed2.asOutput()); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(seed2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AnonymousRandomSeedGenerator(opBuilder.build()); } 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 63e2698983b..8a0b9f0d7e0 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 @@ -40,8 +40,8 @@ public final class DeleteRandomSeedGenerator extends RawOp { @Endpoint(describeByClass = true) public static DeleteRandomSeedGenerator create(Scope scope, Operand handle, Operand deleter) { OperationBuilder opBuilder = scope.env().opBuilder("DeleteRandomSeedGenerator", scope.makeOpName("DeleteRandomSeedGenerator")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(deleter.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(deleter.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DeleteRandomSeedGenerator(opBuilder.build()); } 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 8295f36e678..b3b2e630bf3 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 @@ -92,7 +92,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(trueClasses.asOutput()); + opBuilder.addInput(trueClasses.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_true", numTrue); opBuilder.setAttr("num_sampled", numSampled); 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 41fb03d9dc2..75cfd2900cb 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Draws samples from a multinomial distribution. @@ -82,8 +81,8 @@ private Options() { @Endpoint(describeByClass = true) public static Multinomial create(Scope scope, Operand logits, Operand numSamples, DataType outputDtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Multinomial", scope.makeOpName("Multinomial")); - opBuilder.addInput(logits.asOutput()); - opBuilder.addInput(numSamples.asOutput()); + opBuilder.addInput(logits.asOutput(scope)); + opBuilder.addInput(numSamples.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_dtype", outputDtype); if (options != null) { @@ -138,7 +137,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b251813e265..23e49766805 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 @@ -49,7 +49,7 @@ public final class NonDeterministicInts extends RawOp implement @Endpoint(describeByClass = true) public static NonDeterministicInts create(Scope scope, Operand shape, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("NonDeterministicInts", scope.makeOpName("NonDeterministicInts")); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new NonDeterministicInts(opBuilder.build()); @@ -75,7 +75,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8ed64aa14a7..9684b99c585 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random values from a normal distribution. The parameters may each be a @@ -85,11 +84,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(means.asOutput()); - opBuilder.addInput(stdevs.asOutput()); - opBuilder.addInput(minvals.asOutput()); - opBuilder.addInput(maxvals.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(means.asOutput(scope)); + opBuilder.addInput(stdevs.asOutput(scope)); + opBuilder.addInput(minvals.asOutput(scope)); + opBuilder.addInput(maxvals.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -129,7 +128,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 65ae0fbcbb4..1bd796016d8 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random values from the Gamma distribution(s) described by alpha. @@ -84,8 +83,8 @@ private Options() { @Endpoint(describeByClass = true) public static RandomGamma create(Scope scope, Operand shape, Operand alpha, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomGamma", scope.makeOpName("RandomGamma")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(alpha.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -126,7 +125,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ba25e19b24e..edaf34bb4a8 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the derivative of a Gamma random sample w.r.t. `alpha`. @@ -46,8 +45,8 @@ public final class RandomGammaGrad extends RawOp implements O @Endpoint(describeByClass = true) public static RandomGammaGrad create(Scope scope, Operand alpha, Operand sample) { OperationBuilder opBuilder = scope.env().opBuilder("RandomGammaGrad", scope.makeOpName("RandomGammaGrad")); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(sample.asOutput()); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(sample.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RandomGammaGrad(opBuilder.build()); } @@ -59,7 +58,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e7bcb3d6855..aa4a2c830d8 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random values from the Poisson distribution(s) described by rate. @@ -93,8 +92,8 @@ private Options() { @Endpoint(describeByClass = true) public static RandomPoisson create(Scope scope, Operand shape, Operand rate, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomPoissonV2", scope.makeOpName("RandomPoisson")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(rate.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(rate.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -152,7 +151,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 738d92b7f0e..c89287c5bca 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 @@ -86,7 +86,7 @@ private Options() { @Endpoint(describeByClass = true) public static RandomShuffle create(Scope scope, Operand value, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomShuffle", scope.makeOpName("RandomShuffle")); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -126,7 +126,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 48e08f355b3..10c03656d56 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random values from a normal distribution. @@ -81,7 +80,7 @@ private Options() { @Endpoint(describeByClass = true) public static RandomStandardNormal create(Scope scope, Operand shape, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomStandardNormal", scope.makeOpName("RandomStandardNormal")); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -121,7 +120,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 121a58533c1..e49185d39ee 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random values from a uniform distribution. @@ -82,7 +81,7 @@ private Options() { @Endpoint(describeByClass = true) public static RandomUniform create(Scope scope, Operand shape, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomUniform", scope.makeOpName("RandomUniform")); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -122,7 +121,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b2eafcadf4b..e0b5661074c 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random integers from a uniform distribution. @@ -87,9 +86,9 @@ private Options() { @Endpoint(describeByClass = true) public static RandomUniformInt create(Scope scope, Operand shape, Operand minval, Operand maxval, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RandomUniformInt", scope.makeOpName("RandomUniformInt")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(minval.asOutput()); - opBuilder.addInput(maxval.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(minval.asOutput(scope)); + opBuilder.addInput(maxval.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -128,7 +127,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a8520fc1144..a52942cad7a 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 @@ -189,7 +189,7 @@ public Output records() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return records; } 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 af9e90226b4..2cae7e498ca 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 @@ -48,9 +48,9 @@ public final class RngSkip extends RawOp { @Endpoint(describeByClass = true) public static RngSkip create(Scope scope, Operand resource, Operand algorithm, Operand delta) { OperationBuilder opBuilder = scope.env().opBuilder("RngSkip", scope.makeOpName("RngSkip")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RngSkip(opBuilder.build()); } 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 f6b9ed59a68..37e5c464717 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * @param data type for {@code output()} output @@ -51,11 +50,11 @@ public final class StatefulRandomBinomial extends RawOp imple @Endpoint(describeByClass = true) public static StatefulRandomBinomial create(Scope scope, Operand resource, Operand algorithm, Operand shape, Operand counts, Operand probs, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatefulRandomBinomial", scope.makeOpName("StatefulRandomBinomial")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(counts.asOutput()); - opBuilder.addInput(probs.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(counts.asOutput(scope)); + opBuilder.addInput(probs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatefulRandomBinomial(opBuilder.build()); @@ -84,7 +83,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fd0f1cd16a4..dbcf454051a 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 @@ -53,9 +53,9 @@ public final class StatefulStandardNormal extends RawOp impleme @Endpoint(describeByClass = true) public static StatefulStandardNormal create(Scope scope, Operand resource, Operand algorithm, Operand shape, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatefulStandardNormalV2", scope.makeOpName("StatefulStandardNormal")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatefulStandardNormal(opBuilder.build()); @@ -83,7 +83,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 97ad2eb4f00..aa925a9ca3c 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 @@ -54,9 +54,9 @@ public final class StatefulTruncatedNormal extends RawOp implem @Endpoint(describeByClass = true) public static StatefulTruncatedNormal create(Scope scope, Operand resource, Operand algorithm, Operand shape, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatefulTruncatedNormal", scope.makeOpName("StatefulTruncatedNormal")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatefulTruncatedNormal(opBuilder.build()); @@ -84,7 +84,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8c6d86dd507..f3a3b0dc1fe 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 @@ -53,9 +53,9 @@ public final class StatefulUniform extends RawOp implements Ope @Endpoint(describeByClass = true) public static StatefulUniform create(Scope scope, Operand resource, Operand algorithm, Operand shape, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniform", scope.makeOpName("StatefulUniform")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatefulUniform(opBuilder.build()); @@ -83,7 +83,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e234af42486..1c4faec2584 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 @@ -51,9 +51,9 @@ public final class StatefulUniformFullInt extends RawOp impleme @Endpoint(describeByClass = true) public static StatefulUniformFullInt create(Scope scope, Operand resource, Operand algorithm, Operand shape, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatefulUniformFullInt", scope.makeOpName("StatefulUniformFullInt")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatefulUniformFullInt(opBuilder.build()); @@ -67,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a5550877593..fede4acc47a 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 @@ -57,11 +57,11 @@ public final class StatefulUniformInt extends RawOp implements @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(resource.asOutput()); - opBuilder.addInput(algorithm.asOutput()); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(minval.asOutput()); - opBuilder.addInput(maxval.asOutput()); + opBuilder.addInput(resource.asOutput(scope)); + opBuilder.addInput(algorithm.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(minval.asOutput(scope)); + opBuilder.addInput(maxval.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StatefulUniformInt(opBuilder.build()); } @@ -74,7 +74,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d5473395eb3..61850f95914 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Draws samples from a multinomial distribution. @@ -53,9 +52,9 @@ public final class StatelessMultinomial extends RawOp impleme @Endpoint(describeByClass = true) public static StatelessMultinomial create(Scope scope, Operand logits, Operand numSamples, Operand seed, DataType outputDtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessMultinomial", scope.makeOpName("StatelessMultinomial")); - opBuilder.addInput(logits.asOutput()); - opBuilder.addInput(numSamples.asOutput()); - opBuilder.addInput(seed.asOutput()); + opBuilder.addInput(logits.asOutput(scope)); + opBuilder.addInput(numSamples.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_dtype", outputDtype); return new StatelessMultinomial(opBuilder.build()); @@ -85,7 +84,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9629ee7620e..2f2221ac05c 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom random numbers from a binomial distribution. @@ -57,10 +56,10 @@ public final class StatelessRandomBinomial extends RawOp impl @Endpoint(describeByClass = true) public static StatelessRandomBinomial create(Scope scope, Operand shape, Operand seed, Operand counts, Operand probs, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomBinomial", scope.makeOpName("StatelessRandomBinomial")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(counts.asOutput()); - opBuilder.addInput(probs.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(counts.asOutput(scope)); + opBuilder.addInput(probs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatelessRandomBinomial(opBuilder.build()); @@ -91,7 +90,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 815e4b8c1ad..9fb3dc3e27d 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom random numbers from a gamma distribution. @@ -52,9 +51,9 @@ public final class StatelessRandomGamma extends RawOp impleme @Endpoint(describeByClass = true) public static StatelessRandomGamma create(Scope scope, Operand shape, Operand seed, Operand alpha) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomGammaV2", scope.makeOpName("StatelessRandomGamma")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(alpha.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StatelessRandomGamma(opBuilder.build()); } @@ -67,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 028537a3417..8b4089796f2 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom values from a normal distribution. @@ -54,8 +53,8 @@ public final class StatelessRandomNormal extends RawOp implem @Endpoint(describeByClass = true) public static StatelessRandomNormal create(Scope scope, Operand shape, Operand seed, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomNormal", scope.makeOpName("StatelessRandomNormal")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatelessRandomNormal(opBuilder.build()); @@ -82,7 +81,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e0c7e949dd3..3540bf11dc8 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom random numbers from a Poisson distribution. @@ -54,9 +53,9 @@ public final class StatelessRandomPoisson extends RawOp imple @Endpoint(describeByClass = true) public static StatelessRandomPoisson create(Scope scope, Operand shape, Operand seed, Operand lam, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomPoisson", scope.makeOpName("StatelessRandomPoisson")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(lam.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(lam.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatelessRandomPoisson(opBuilder.build()); @@ -70,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5ea49ccf36d..54a7d37a0f8 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom random values from a uniform distribution. @@ -55,8 +54,8 @@ public final class StatelessRandomUniform extends RawOp imple @Endpoint(describeByClass = true) public static StatelessRandomUniform create(Scope scope, Operand shape, Operand seed, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniform", scope.makeOpName("StatelessRandomUniform")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatelessRandomUniform(opBuilder.build()); @@ -83,7 +82,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 657153d3098..185d542b16c 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom random integers from a uniform distribution. @@ -52,8 +51,8 @@ public final class StatelessRandomUniformFullInt extends RawO @Endpoint(describeByClass = true) public static StatelessRandomUniformFullInt create(Scope scope, Operand shape, Operand seed, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformFullInt", scope.makeOpName("StatelessRandomUniformFullInt")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatelessRandomUniformFullInt(opBuilder.build()); @@ -67,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ebb569ea222..f5e43c706f0 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 @@ -26,7 +26,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom random integers from a uniform distribution. @@ -52,10 +51,10 @@ public final class StatelessRandomUniformInt extends RawOp im @Endpoint(describeByClass = true) public static StatelessRandomUniformInt create(Scope scope, Operand shape, Operand seed, Operand minval, Operand maxval) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessRandomUniformInt", scope.makeOpName("StatelessRandomUniformInt")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); - opBuilder.addInput(minval.asOutput()); - opBuilder.addInput(maxval.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); + opBuilder.addInput(minval.asOutput(scope)); + opBuilder.addInput(maxval.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StatelessRandomUniformInt(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 180e5ffa4b5..79fabada2e5 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs deterministic pseudorandom values from a truncated normal distribution. @@ -56,8 +55,8 @@ public final class StatelessTruncatedNormal extends RawOp imp @Endpoint(describeByClass = true) public static StatelessTruncatedNormal create(Scope scope, Operand shape, Operand seed, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("StatelessTruncatedNormal", scope.makeOpName("StatelessTruncatedNormal")); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(seed.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(seed.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new StatelessTruncatedNormal(opBuilder.build()); @@ -84,7 +83,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b40ddfb6e47..8da2e8d668d 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs random values from a truncated normal distribution. @@ -83,7 +82,7 @@ private Options() { @Endpoint(describeByClass = true) public static TruncatedNormal create(Scope scope, Operand shape, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TruncatedNormal", scope.makeOpName("TruncatedNormal")); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { @@ -124,7 +123,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e568dd965ba..e382e9e706d 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 @@ -92,7 +92,7 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(trueClasses.asOutput()); + opBuilder.addInput(trueClasses.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_true", numTrue); opBuilder.setAttr("num_sampled", numSampled); 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 029a9990900..c4f222adddc 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 @@ -42,7 +42,7 @@ public final class BatchFft extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BatchFft create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchFFT", scope.makeOpName("BatchFft")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchFft(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 c8357878666..e2bfa248cda 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 @@ -42,7 +42,7 @@ public final class BatchFft2d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BatchFft2d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchFFT2D", scope.makeOpName("BatchFft2d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchFft2d(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 4ad58e855ae..c6d3d989c97 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 @@ -42,7 +42,7 @@ public final class BatchFft3d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BatchFft3d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchFFT3D", scope.makeOpName("BatchFft3d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchFft3d(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 0e098f94b72..dec3c5e960e 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 @@ -42,7 +42,7 @@ public final class BatchIfft extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BatchIfft create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchIFFT", scope.makeOpName("BatchIfft")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchIfft(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 e689c9061d4..201fdb8d20d 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 @@ -42,7 +42,7 @@ public final class BatchIfft2d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BatchIfft2d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchIFFT2D", scope.makeOpName("BatchIfft2d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchIfft2d(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 5f23ed1ca7a..916cee2da49 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 @@ -42,7 +42,7 @@ public final class BatchIfft3d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static BatchIfft3d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("BatchIFFT3D", scope.makeOpName("BatchIfft3d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BatchIfft3d(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 802788288a6..9b3b360d382 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 @@ -48,7 +48,7 @@ public final class Fft extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Fft create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("FFT", scope.makeOpName("Fft")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Fft(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 aaafdb8392f..fb6073d2703 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 @@ -48,7 +48,7 @@ public final class Fft2d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Fft2d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("FFT2D", scope.makeOpName("Fft2d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Fft2d(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a7b29547d0c..832fc8ef836 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 @@ -48,7 +48,7 @@ public final class Fft3d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Fft3d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("FFT3D", scope.makeOpName("Fft3d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Fft3d(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 6ba09167aa0..e3725fdf53a 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 @@ -48,7 +48,7 @@ public final class Ifft extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Ifft create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("IFFT", scope.makeOpName("Ifft")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Ifft(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 086dd9d2338..9b2886e0eaf 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 @@ -48,7 +48,7 @@ public final class Ifft2d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Ifft2d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("IFFT2D", scope.makeOpName("Ifft2d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Ifft2d(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d1d114fc2d5..db1d67e1be5 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 @@ -48,7 +48,7 @@ public final class Ifft3d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Ifft3d create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("IFFT3D", scope.makeOpName("Ifft3d")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Ifft3d(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8cbeb80aec5..587c979daf7 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 @@ -65,8 +65,8 @@ public final class Irfft extends RawOp implements Operand @Endpoint(describeByClass = true) public static Irfft create(Scope scope, Operand input, Operand fftLength, DataType Treal) { OperationBuilder opBuilder = scope.env().opBuilder("IRFFT", scope.makeOpName("Irfft")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(fftLength.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(fftLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Treal", Treal); return new Irfft(opBuilder.build()); @@ -99,7 +99,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a383b340c45..a237feb23e3 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 @@ -66,8 +66,8 @@ public final class Irfft2d extends RawOp implements Operand Irfft2d create(Scope scope, Operand input, Operand fftLength, DataType Treal) { OperationBuilder opBuilder = scope.env().opBuilder("IRFFT2D", scope.makeOpName("Irfft2d")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(fftLength.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(fftLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Treal", Treal); return new Irfft2d(opBuilder.build()); @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 278bf3eac13..6c64db377cb 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 @@ -66,8 +66,8 @@ public final class Irfft3d extends RawOp implements Operand Irfft3d create(Scope scope, Operand input, Operand fftLength, DataType Treal) { OperationBuilder opBuilder = scope.env().opBuilder("IRFFT3D", scope.makeOpName("Irfft3d")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(fftLength.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(fftLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Treal", Treal); return new Irfft3d(opBuilder.build()); @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5b3dc8a4199..45a41ac241f 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 @@ -61,8 +61,8 @@ public final class Rfft extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Rfft create(Scope scope, Operand input, Operand fftLength, DataType Tcomplex) { OperationBuilder opBuilder = scope.env().opBuilder("RFFT", scope.makeOpName("Rfft")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(fftLength.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(fftLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tcomplex", Tcomplex); return new Rfft(opBuilder.build()); @@ -82,7 +82,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7f47b98f969..ce4ebed8a77 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 @@ -62,8 +62,8 @@ public final class Rfft2d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Rfft2d create(Scope scope, Operand input, Operand fftLength, DataType Tcomplex) { OperationBuilder opBuilder = scope.env().opBuilder("RFFT2D", scope.makeOpName("Rfft2d")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(fftLength.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(fftLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tcomplex", Tcomplex); return new Rfft2d(opBuilder.build()); @@ -84,7 +84,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7fa5f8f23b7..839fa58028c 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 @@ -62,8 +62,8 @@ public final class Rfft3d extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Rfft3d create(Scope scope, Operand input, Operand fftLength, DataType Tcomplex) { OperationBuilder opBuilder = scope.env().opBuilder("RFFT3D", scope.makeOpName("Rfft3d")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(fftLength.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(fftLength.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("Tcomplex", Tcomplex); return new Rfft3d(opBuilder.build()); @@ -84,7 +84,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f3b4e77d1f3..1ded309957c 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 @@ -100,9 +100,9 @@ private Options() { @Endpoint(describeByClass = true) public static AddManySparseToTensorsMap create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AddManySparseToTensorsMap", scope.makeOpName("AddManySparseToTensorsMap")); - opBuilder.addInput(sparseIndices.asOutput()); - opBuilder.addInput(sparseValues.asOutput()); - opBuilder.addInput(sparseShape.asOutput()); + opBuilder.addInput(sparseIndices.asOutput(scope)); + opBuilder.addInput(sparseValues.asOutput(scope)); + opBuilder.addInput(sparseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -141,7 +141,7 @@ public Output sparseHandles() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return sparseHandles; } 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 0cc79427ce1..3265408d552 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 @@ -91,9 +91,9 @@ private Options() { @Endpoint(describeByClass = true) public static AddSparseToTensorsMap create(Scope scope, Operand sparseIndices, Operand sparseValues, Operand sparseShape, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AddSparseToTensorsMap", scope.makeOpName("AddSparseToTensorsMap")); - opBuilder.addInput(sparseIndices.asOutput()); - opBuilder.addInput(sparseValues.asOutput()); - opBuilder.addInput(sparseShape.asOutput()); + opBuilder.addInput(sparseIndices.asOutput(scope)); + opBuilder.addInput(sparseValues.asOutput(scope)); + opBuilder.addInput(sparseShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -132,7 +132,7 @@ public Output sparseHandle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return sparseHandle; } 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 7308a8a8ecb..b001495ab42 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 @@ -78,8 +78,8 @@ private Options() { @Endpoint(describeByClass = true) public static DenseToDenseSetOperation create(Scope scope, Operand set1, Operand set2, String setOperation, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("DenseToDenseSetOperation", scope.makeOpName("DenseToDenseSetOperation")); - opBuilder.addInput(set1.asOutput()); - opBuilder.addInput(set2.asOutput()); + opBuilder.addInput(set1.asOutput(scope)); + opBuilder.addInput(set2.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("set_operation", setOperation); if (options != null) { 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 85a490c25a0..177125fcf9e 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 @@ -91,10 +91,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(set1.asOutput()); - opBuilder.addInput(set2Indices.asOutput()); - opBuilder.addInput(set2Values.asOutput()); - opBuilder.addInput(set2Shape.asOutput()); + opBuilder.addInput(set1.asOutput(scope)); + opBuilder.addInput(set2Indices.asOutput(scope)); + opBuilder.addInput(set2Values.asOutput(scope)); + opBuilder.addInput(set2Shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("set_operation", setOperation); if (options != null) { 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 a4fb2ee2e39..2b82232ee93 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 @@ -91,7 +91,7 @@ public final class DeserializeSparse extends RawOp { @Endpoint(describeByClass = true) public static DeserializeSparse create(Scope scope, Operand serializedSparse, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("DeserializeSparse", scope.makeOpName("DeserializeSparse")); - opBuilder.addInput(serializedSparse.asOutput()); + opBuilder.addInput(serializedSparse.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new DeserializeSparse(opBuilder.build()); 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 15751d4ca97..8f4c3548ff5 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 @@ -56,11 +56,11 @@ public final class SparseAccumulatorApplyGradient extends RawOp { @Endpoint(describeByClass = true) public static SparseAccumulatorApplyGradient create(Scope scope, Operand handle, Operand localStep, Operand gradientIndices, Operand gradientValues, Operand gradientShape, Boolean hasKnownShape) { OperationBuilder opBuilder = scope.env().opBuilder("SparseAccumulatorApplyGradient", scope.makeOpName("SparseAccumulatorApplyGradient")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(localStep.asOutput()); - opBuilder.addInput(gradientIndices.asOutput()); - opBuilder.addInput(gradientValues.asOutput()); - opBuilder.addInput(gradientShape.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(localStep.asOutput(scope)); + opBuilder.addInput(gradientIndices.asOutput(scope)); + opBuilder.addInput(gradientValues.asOutput(scope)); + opBuilder.addInput(gradientShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("has_known_shape", hasKnownShape); return new SparseAccumulatorApplyGradient(opBuilder.build()); 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 d072e331bbf..1641efc864f 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 @@ -59,8 +59,8 @@ public final class SparseAccumulatorTakeGradient extends RawOp @Endpoint(describeByClass = true) public static SparseAccumulatorTakeGradient create(Scope scope, Operand handle, Operand numRequired, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("SparseAccumulatorTakeGradient", scope.makeOpName("SparseAccumulatorTakeGradient")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(numRequired.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(numRequired.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new SparseAccumulatorTakeGradient(opBuilder.build()); 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 1bab6a714a0..6fcc524f6ba 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 @@ -68,13 +68,13 @@ public final class SparseAdd extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(aIndices.asOutput()); - opBuilder.addInput(aValues.asOutput()); - opBuilder.addInput(aShape.asOutput()); - opBuilder.addInput(bIndices.asOutput()); - opBuilder.addInput(bValues.asOutput()); - opBuilder.addInput(bShape.asOutput()); - opBuilder.addInput(thresh.asOutput()); + opBuilder.addInput(aIndices.asOutput(scope)); + opBuilder.addInput(aValues.asOutput(scope)); + opBuilder.addInput(aShape.asOutput(scope)); + opBuilder.addInput(bIndices.asOutput(scope)); + opBuilder.addInput(bValues.asOutput(scope)); + opBuilder.addInput(bShape.asOutput(scope)); + opBuilder.addInput(thresh.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseAdd(opBuilder.build()); } 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 1709c008119..f30aa37d413 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 @@ -56,10 +56,10 @@ public final class SparseAddGrad extends RawOp { @Endpoint(describeByClass = true) public static SparseAddGrad create(Scope scope, Operand backpropValGrad, Operand aIndices, Operand bIndices, Operand sumIndices) { OperationBuilder opBuilder = scope.env().opBuilder("SparseAddGrad", scope.makeOpName("SparseAddGrad")); - opBuilder.addInput(backpropValGrad.asOutput()); - opBuilder.addInput(aIndices.asOutput()); - opBuilder.addInput(bIndices.asOutput()); - opBuilder.addInput(sumIndices.asOutput()); + opBuilder.addInput(backpropValGrad.asOutput(scope)); + opBuilder.addInput(aIndices.asOutput(scope)); + opBuilder.addInput(bIndices.asOutput(scope)); + opBuilder.addInput(sumIndices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseAddGrad(opBuilder.build()); } 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 1ee35437c40..ebb1db1a05b 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 @@ -93,9 +93,9 @@ public final class SparseConcat extends RawOp { @Endpoint(describeByClass = true) public static SparseConcat create(Scope scope, Iterable> indices, Iterable> values, Iterable> shapes, Long concatDim) { OperationBuilder opBuilder = scope.env().opBuilder("SparseConcat", scope.makeOpName("SparseConcat")); - opBuilder.addInputList(Operands.asOutputs(indices)); - opBuilder.addInputList(Operands.asOutputs(values)); - opBuilder.addInputList(Operands.asOutputs(shapes)); + opBuilder.addInputList(Operands.asOutputs(scope, indices)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); + opBuilder.addInputList(Operands.asOutputs(scope, shapes)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("concat_dim", concatDim); return new SparseConcat(opBuilder.build()); 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 7c9eea707df..01dd68a06c1 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 @@ -144,7 +144,7 @@ public Output handle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return handle; } 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 72d7107e2d5..0c63e102925 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 @@ -96,10 +96,10 @@ public final class SparseCross extends RawOp { @Endpoint(describeByClass = true) public static SparseCross create(Scope scope, Iterable> indices, Iterable> values, Iterable> shapes, Iterable> denseInputs, Boolean hashedOutput, Long numBuckets, Long hashKey, DataType outType, DataType internalType) { OperationBuilder opBuilder = scope.env().opBuilder("SparseCross", scope.makeOpName("SparseCross")); - opBuilder.addInputList(Operands.asOutputs(indices)); - opBuilder.addInputList(Operands.asOutputs(values)); - opBuilder.addInputList(Operands.asOutputs(shapes)); - opBuilder.addInputList(Operands.asOutputs(denseInputs)); + opBuilder.addInputList(Operands.asOutputs(scope, indices)); + opBuilder.addInputList(Operands.asOutputs(scope, values)); + opBuilder.addInputList(Operands.asOutputs(scope, shapes)); + opBuilder.addInputList(Operands.asOutputs(scope, denseInputs)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("hashed_output", hashedOutput); opBuilder.setAttr("num_buckets", numBuckets); 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 aace49ffa77..75e033f243b 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 @@ -59,10 +59,10 @@ public final class SparseDenseCwiseAdd extends RawOp implements @Endpoint(describeByClass = true) public static SparseDenseCwiseAdd create(Scope scope, Operand spIndices, Operand spValues, Operand spShape, Operand dense) { OperationBuilder opBuilder = scope.env().opBuilder("SparseDenseCwiseAdd", scope.makeOpName("SparseDenseCwiseAdd")); - opBuilder.addInput(spIndices.asOutput()); - opBuilder.addInput(spValues.asOutput()); - opBuilder.addInput(spShape.asOutput()); - opBuilder.addInput(dense.asOutput()); + opBuilder.addInput(spIndices.asOutput(scope)); + opBuilder.addInput(spValues.asOutput(scope)); + opBuilder.addInput(spShape.asOutput(scope)); + opBuilder.addInput(dense.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseDenseCwiseAdd(opBuilder.build()); } @@ -75,7 +75,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 78e4bcfe8b4..5c31f2f0f21 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 @@ -53,10 +53,10 @@ public final class SparseDenseCwiseDiv extends RawOp implements @Endpoint(describeByClass = true) public static SparseDenseCwiseDiv create(Scope scope, Operand spIndices, Operand spValues, Operand spShape, Operand dense) { OperationBuilder opBuilder = scope.env().opBuilder("SparseDenseCwiseDiv", scope.makeOpName("SparseDenseCwiseDiv")); - opBuilder.addInput(spIndices.asOutput()); - opBuilder.addInput(spValues.asOutput()); - opBuilder.addInput(spShape.asOutput()); - opBuilder.addInput(dense.asOutput()); + opBuilder.addInput(spIndices.asOutput(scope)); + opBuilder.addInput(spValues.asOutput(scope)); + opBuilder.addInput(spShape.asOutput(scope)); + opBuilder.addInput(dense.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseDenseCwiseDiv(opBuilder.build()); } @@ -69,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 78b37a2306a..3562dbc7805 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 @@ -57,10 +57,10 @@ public final class SparseDenseCwiseMul extends RawOp implements @Endpoint(describeByClass = true) public static SparseDenseCwiseMul create(Scope scope, Operand spIndices, Operand spValues, Operand spShape, Operand dense) { OperationBuilder opBuilder = scope.env().opBuilder("SparseDenseCwiseMul", scope.makeOpName("SparseDenseCwiseMul")); - opBuilder.addInput(spIndices.asOutput()); - opBuilder.addInput(spValues.asOutput()); - opBuilder.addInput(spShape.asOutput()); - opBuilder.addInput(dense.asOutput()); + opBuilder.addInput(spIndices.asOutput(scope)); + opBuilder.addInput(spValues.asOutput(scope)); + opBuilder.addInput(spShape.asOutput(scope)); + opBuilder.addInput(dense.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseDenseCwiseMul(opBuilder.build()); } @@ -73,7 +73,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 47baf154e30..0a30525e1ab 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 @@ -89,10 +89,10 @@ public final class SparseFillEmptyRows extends RawOp { @Endpoint(describeByClass = true) public static SparseFillEmptyRows create(Scope scope, Operand indices, Operand values, Operand denseShape, Operand defaultValue) { OperationBuilder opBuilder = scope.env().opBuilder("SparseFillEmptyRows", scope.makeOpName("SparseFillEmptyRows")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(denseShape.asOutput()); - opBuilder.addInput(defaultValue.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(denseShape.asOutput(scope)); + opBuilder.addInput(defaultValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseFillEmptyRows(opBuilder.build()); } 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 7289cfa1eef..1f7a0591a5e 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 @@ -56,8 +56,8 @@ public final class SparseFillEmptyRowsGrad extends RawOp { @Endpoint(describeByClass = true) public static SparseFillEmptyRowsGrad create(Scope scope, Operand reverseIndexMap, Operand gradValues) { OperationBuilder opBuilder = scope.env().opBuilder("SparseFillEmptyRowsGrad", scope.makeOpName("SparseFillEmptyRowsGrad")); - opBuilder.addInput(reverseIndexMap.asOutput()); - opBuilder.addInput(gradValues.asOutput()); + opBuilder.addInput(reverseIndexMap.asOutput(scope)); + opBuilder.addInput(gradValues.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseFillEmptyRowsGrad(opBuilder.build()); } 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 42922e892cd..0b41529aa81 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TFloat32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Multiply matrix "a" by matrix "b". @@ -103,8 +102,8 @@ private Options() { @Endpoint(describeByClass = true) public static SparseMatMul create(Scope scope, Operand a, Operand b, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("SparseMatMul", scope.makeOpName("SparseMatMul")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -160,7 +159,7 @@ public Output product() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return product; } 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 9e8ffaf3484..4e675a569d9 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the max of elements across dimensions of a SparseTensor. @@ -85,10 +84,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputValues.asOutput()); - opBuilder.addInput(inputShape.asOutput()); - opBuilder.addInput(reductionAxes.asOutput()); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputValues.asOutput(scope)); + opBuilder.addInput(inputShape.asOutput(scope)); + opBuilder.addInput(reductionAxes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -115,7 +114,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 de96c4d2105..5b5dc885a28 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the max of elements across dimensions of a SparseTensor. @@ -85,10 +84,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputValues.asOutput()); - opBuilder.addInput(inputShape.asOutput()); - opBuilder.addInput(reductionAxes.asOutput()); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputValues.asOutput(scope)); + opBuilder.addInput(inputShape.asOutput(scope)); + opBuilder.addInput(reductionAxes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 b072fb46bfd..28ec925b403 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 @@ -84,10 +84,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputValues.asOutput()); - opBuilder.addInput(inputShape.asOutput()); - opBuilder.addInput(reductionAxes.asOutput()); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputValues.asOutput(scope)); + opBuilder.addInput(inputShape.asOutput(scope)); + opBuilder.addInput(reductionAxes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -114,7 +114,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 befdc901b28..5b9968d832b 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 @@ -84,10 +84,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputValues.asOutput()); - opBuilder.addInput(inputShape.asOutput()); - opBuilder.addInput(reductionAxes.asOutput()); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputValues.asOutput(scope)); + opBuilder.addInput(inputShape.asOutput(scope)); + opBuilder.addInput(reductionAxes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 88be4106deb..d08c44c308f 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 @@ -58,9 +58,9 @@ public final class SparseReorder extends RawOp { @Endpoint(describeByClass = true) public static SparseReorder create(Scope scope, Operand inputIndices, Operand inputValues, Operand inputShape) { OperationBuilder opBuilder = scope.env().opBuilder("SparseReorder", scope.makeOpName("SparseReorder")); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputValues.asOutput()); - opBuilder.addInput(inputShape.asOutput()); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputValues.asOutput(scope)); + opBuilder.addInput(inputShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseReorder(opBuilder.build()); } 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 7d2799f8ffe..6b7dc8e8a84 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 @@ -62,9 +62,9 @@ public final class SparseReshape extends RawOp { @Endpoint(describeByClass = true) public static SparseReshape create(Scope scope, Operand inputIndices, Operand inputShape, Operand newShape) { OperationBuilder opBuilder = scope.env().opBuilder("SparseReshape", scope.makeOpName("SparseReshape")); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputShape.asOutput()); - opBuilder.addInput(newShape.asOutput()); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputShape.asOutput(scope)); + opBuilder.addInput(newShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseReshape(opBuilder.build()); } 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 785b1149b0a..8cdeb61508f 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the mean along sparse segments of a tensor. @@ -54,9 +53,9 @@ public final class SparseSegmentMean extends RawOp implements @Endpoint(describeByClass = true) public static SparseSegmentMean create(Scope scope, Operand data, Operand indices, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMean", scope.makeOpName("SparseSegmentMean")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentMean(opBuilder.build()); } @@ -70,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 a0c8e8b8e43..f12deda58e8 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients for SparseSegmentMean. @@ -53,10 +52,10 @@ public final class SparseSegmentMeanGrad extends RawOp implem @Endpoint(describeByClass = true) public static SparseSegmentMeanGrad create(Scope scope, Operand grad, Operand indices, Operand segmentIds, Operand outputDim0) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMeanGrad", scope.makeOpName("SparseSegmentMeanGrad")); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(outputDim0.asOutput()); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(outputDim0.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentMeanGrad(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0458eca8621..2442e767106 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the mean along sparse segments of a tensor. @@ -57,10 +56,10 @@ public final class SparseSegmentMeanWithNumSegments extends R @Endpoint(describeByClass = true) public static SparseSegmentMeanWithNumSegments create(Scope scope, Operand data, Operand indices, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentMeanWithNumSegments", scope.makeOpName("SparseSegmentMeanWithNumSegments")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentMeanWithNumSegments(opBuilder.build()); } @@ -74,7 +73,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 03b6e015a80..e2e2b56e4f7 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the sum along sparse segments of a tensor divided by the sqrt of N. @@ -54,9 +53,9 @@ public final class SparseSegmentSqrtN extends RawOp implement @Endpoint(describeByClass = true) public static SparseSegmentSqrtN create(Scope scope, Operand data, Operand indices, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtN", scope.makeOpName("SparseSegmentSqrtN")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentSqrtN(opBuilder.build()); } @@ -70,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 cbe39991793..93b737c96a8 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes gradients for SparseSegmentSqrtN. @@ -53,10 +52,10 @@ public final class SparseSegmentSqrtNGrad extends RawOp imple @Endpoint(describeByClass = true) public static SparseSegmentSqrtNGrad create(Scope scope, Operand grad, Operand indices, Operand segmentIds, Operand outputDim0) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtNGrad", scope.makeOpName("SparseSegmentSqrtNGrad")); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(outputDim0.asOutput()); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(outputDim0.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentSqrtNGrad(opBuilder.build()); } @@ -68,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ce787acb499..a0b30e3fca1 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the sum along sparse segments of a tensor divided by the sqrt of N. @@ -59,10 +58,10 @@ public final class SparseSegmentSqrtNWithNumSegments extends @Endpoint(describeByClass = true) public static SparseSegmentSqrtNWithNumSegments create(Scope scope, Operand data, Operand indices, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSqrtNWithNumSegments", scope.makeOpName("SparseSegmentSqrtNWithNumSegments")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentSqrtNWithNumSegments(opBuilder.build()); } @@ -76,7 +75,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 16e47ab2431..f539b93ab86 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the sum along sparse segments of a tensor. @@ -79,9 +78,9 @@ public final class SparseSegmentSum extends RawOp implements @Endpoint(describeByClass = true) public static SparseSegmentSum create(Scope scope, Operand data, Operand indices, Operand segmentIds) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSum", scope.makeOpName("SparseSegmentSum")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentSum(opBuilder.build()); } @@ -95,7 +94,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 569d0c691c6..ac8c400fa15 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Computes the sum along sparse segments of a tensor. @@ -78,10 +77,10 @@ public final class SparseSegmentSumWithNumSegments extends Ra @Endpoint(describeByClass = true) public static SparseSegmentSumWithNumSegments create(Scope scope, Operand data, Operand indices, Operand segmentIds, Operand numSegments) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSegmentSumWithNumSegments", scope.makeOpName("SparseSegmentSumWithNumSegments")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSegmentSumWithNumSegments(opBuilder.build()); } @@ -95,7 +94,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5c429a40d9a..628371d6fea 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 @@ -68,11 +68,11 @@ public final class SparseSlice extends RawOp { @Endpoint(describeByClass = true) public static SparseSlice create(Scope scope, Operand indices, Operand values, Operand shape, Operand start, Operand size) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSlice", scope.makeOpName("SparseSlice")); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(shape.asOutput()); - opBuilder.addInput(start.asOutput()); - opBuilder.addInput(size.asOutput()); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); + opBuilder.addInput(start.asOutput(scope)); + opBuilder.addInput(size.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSlice(opBuilder.build()); } 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 172d8bd5816..c7454294947 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 @@ -54,10 +54,10 @@ public final class SparseSliceGrad extends RawOp implements Ope @Endpoint(describeByClass = true) public static SparseSliceGrad create(Scope scope, Operand backpropValGrad, Operand inputIndices, Operand inputStart, Operand outputIndices) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSliceGrad", scope.makeOpName("SparseSliceGrad")); - opBuilder.addInput(backpropValGrad.asOutput()); - opBuilder.addInput(inputIndices.asOutput()); - opBuilder.addInput(inputStart.asOutput()); - opBuilder.addInput(outputIndices.asOutput()); + opBuilder.addInput(backpropValGrad.asOutput(scope)); + opBuilder.addInput(inputIndices.asOutput(scope)); + opBuilder.addInput(inputStart.asOutput(scope)); + opBuilder.addInput(outputIndices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSliceGrad(opBuilder.build()); } @@ -70,7 +70,7 @@ public Output valGrad() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return valGrad; } 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 ee37d13c818..6696a7dc347 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Applies softmax to a batched N-D `SparseTensor`. @@ -66,9 +65,9 @@ public final class SparseSoftmax extends RawOp implements Ope @Endpoint(describeByClass = true) public static SparseSoftmax create(Scope scope, Operand spIndices, Operand spValues, Operand spShape) { OperationBuilder opBuilder = scope.env().opBuilder("SparseSoftmax", scope.makeOpName("SparseSoftmax")); - opBuilder.addInput(spIndices.asOutput()); - opBuilder.addInput(spValues.asOutput()); - opBuilder.addInput(spShape.asOutput()); + opBuilder.addInput(spIndices.asOutput(scope)); + opBuilder.addInput(spValues.asOutput(scope)); + opBuilder.addInput(spShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSoftmax(opBuilder.build()); } @@ -81,7 +80,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 d6d86234578..9def1f7db44 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt64; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Returns the element-wise max of two SparseTensors. @@ -55,12 +54,12 @@ public final class SparseSparseMaximum extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(aIndices.asOutput()); - opBuilder.addInput(aValues.asOutput()); - opBuilder.addInput(aShape.asOutput()); - opBuilder.addInput(bIndices.asOutput()); - opBuilder.addInput(bValues.asOutput()); - opBuilder.addInput(bShape.asOutput()); + opBuilder.addInput(aIndices.asOutput(scope)); + opBuilder.addInput(aValues.asOutput(scope)); + opBuilder.addInput(aShape.asOutput(scope)); + opBuilder.addInput(bIndices.asOutput(scope)); + opBuilder.addInput(bValues.asOutput(scope)); + opBuilder.addInput(bShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSparseMaximum(opBuilder.build()); } 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 f46065ae9fc..277c219357b 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 @@ -54,12 +54,12 @@ public final class SparseSparseMinimum extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(aIndices.asOutput()); - opBuilder.addInput(aValues.asOutput()); - opBuilder.addInput(aShape.asOutput()); - opBuilder.addInput(bIndices.asOutput()); - opBuilder.addInput(bValues.asOutput()); - opBuilder.addInput(bShape.asOutput()); + opBuilder.addInput(aIndices.asOutput(scope)); + opBuilder.addInput(aValues.asOutput(scope)); + opBuilder.addInput(aShape.asOutput(scope)); + opBuilder.addInput(bIndices.asOutput(scope)); + opBuilder.addInput(bValues.asOutput(scope)); + opBuilder.addInput(bShape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseSparseMinimum(opBuilder.build()); } 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 dee18e0e862..b3862924f36 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 @@ -73,10 +73,10 @@ public final class SparseSplit extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(splitDim.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(values.asOutput()); - opBuilder.addInput(shape.asOutput()); + opBuilder.addInput(splitDim.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); + opBuilder.addInput(shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_split", numSplit); return new SparseSplit(opBuilder.build()); 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 86f9d3394d1..7f89777126a 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 @@ -51,10 +51,10 @@ public final class SparseTensorDenseAdd extends RawOp implement @Endpoint(describeByClass = true) public static SparseTensorDenseAdd create(Scope scope, Operand aIndices, Operand aValues, Operand aShape, Operand b) { OperationBuilder opBuilder = scope.env().opBuilder("SparseTensorDenseAdd", scope.makeOpName("SparseTensorDenseAdd")); - opBuilder.addInput(aIndices.asOutput()); - opBuilder.addInput(aValues.asOutput()); - opBuilder.addInput(aShape.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(aIndices.asOutput(scope)); + opBuilder.addInput(aValues.asOutput(scope)); + opBuilder.addInput(aShape.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SparseTensorDenseAdd(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 858bce58f73..56fe3f8c031 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 @@ -91,10 +91,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(aIndices.asOutput()); - opBuilder.addInput(aValues.asOutput()); - opBuilder.addInput(aShape.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(aIndices.asOutput(scope)); + opBuilder.addInput(aValues.asOutput(scope)); + opBuilder.addInput(aShape.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -132,7 +132,7 @@ public Output product() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return product; } 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 04b21e5d46e..217940a30ef 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 @@ -91,10 +91,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(sparseIndices.asOutput()); - opBuilder.addInput(outputShape.asOutput()); - opBuilder.addInput(sparseValues.asOutput()); - opBuilder.addInput(defaultValue.asOutput()); + opBuilder.addInput(sparseIndices.asOutput(scope)); + opBuilder.addInput(outputShape.asOutput(scope)); + opBuilder.addInput(sparseValues.asOutput(scope)); + opBuilder.addInput(defaultValue.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -122,7 +122,7 @@ public Output dense() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return dense; } 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 3b606bbd6e9..51ab94d10bd 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,12 +104,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(set1Indices.asOutput()); - opBuilder.addInput(set1Values.asOutput()); - opBuilder.addInput(set1Shape.asOutput()); - opBuilder.addInput(set2Indices.asOutput()); - opBuilder.addInput(set2Values.asOutput()); - opBuilder.addInput(set2Shape.asOutput()); + opBuilder.addInput(set1Indices.asOutput(scope)); + opBuilder.addInput(set1Values.asOutput(scope)); + opBuilder.addInput(set1Shape.asOutput(scope)); + opBuilder.addInput(set2Indices.asOutput(scope)); + opBuilder.addInput(set2Values.asOutput(scope)); + opBuilder.addInput(set2Shape.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("set_operation", setOperation); if (options != null) { 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 8b38ac4f936..f659bbbaf58 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 @@ -126,7 +126,7 @@ private Options() { @Endpoint(describeByClass = true) public static TakeManySparseFromTensorsMap create(Scope scope, Operand sparseHandles, DataType dtype, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TakeManySparseFromTensorsMap", scope.makeOpName("TakeManySparseFromTensorsMap")); - opBuilder.addInput(sparseHandles.asOutput()); + opBuilder.addInput(sparseHandles.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); if (options != null) { 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 448a161166b..336e06f03d3 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 @@ -74,7 +74,7 @@ private Options() { @Endpoint(describeByClass = true) public static Join create(Scope scope, Iterable> inputs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StringJoin", scope.makeOpName("Join")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -100,7 +100,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 14ac2b2a660..921aaf348d3 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 @@ -69,7 +69,7 @@ private Options() { @Endpoint(describeByClass = true) public static Lower create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StringLower", scope.makeOpName("Lower")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -95,7 +95,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 615262737c6..883b36d951f 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 @@ -100,8 +100,8 @@ private Options() { @Endpoint(describeByClass = true) public static ReduceJoin create(Scope scope, Operand inputs, Operand reductionIndices, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ReduceJoin", scope.makeOpName("ReduceJoin")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(reductionIndices.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(reductionIndices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -139,7 +139,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 62923005059..3d8d55136ef 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 @@ -59,8 +59,8 @@ public final class RegexFullMatch extends RawOp implements Operand { @Endpoint(describeByClass = true) public static RegexFullMatch create(Scope scope, Operand input, Operand pattern) { OperationBuilder opBuilder = scope.env().opBuilder("RegexFullMatch", scope.makeOpName("RegexFullMatch")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(pattern.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(pattern.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new RegexFullMatch(opBuilder.build()); } @@ -73,7 +73,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 39d76d9115b..12a2c4dfd11 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 @@ -71,9 +71,9 @@ private Options() { @Endpoint(describeByClass = true) public static RegexReplace create(Scope scope, Operand input, Operand pattern, Operand rewrite, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RegexReplace", scope.makeOpName("RegexReplace")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(pattern.asOutput()); - opBuilder.addInput(rewrite.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(pattern.asOutput(scope)); + opBuilder.addInput(rewrite.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -102,7 +102,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 fe6714ca733..5b903757282 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 @@ -51,7 +51,7 @@ public final class StaticRegexFullMatch extends RawOp implements Operand @Endpoint(describeByClass = true) public static StaticRegexFullMatch create(Scope scope, Operand input, String pattern) { OperationBuilder opBuilder = scope.env().opBuilder("StaticRegexFullMatch", scope.makeOpName("StaticRegexFullMatch")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("pattern", pattern); return new StaticRegexFullMatch(opBuilder.build()); @@ -65,7 +65,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e09c93144d4..2f66ea0c0f5 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 @@ -67,7 +67,7 @@ private Options() { @Endpoint(describeByClass = true) public static StaticRegexReplace create(Scope scope, Operand input, String pattern, String rewrite, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StaticRegexReplace", scope.makeOpName("StaticRegexReplace")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("pattern", pattern); opBuilder.setAttr("rewrite", rewrite); @@ -97,7 +97,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0e6798c4bf4..d7aff7a48f5 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 @@ -84,7 +84,7 @@ private Options() { @Endpoint(describeByClass = true) public static StringFormat create(Scope scope, Iterable> inputs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StringFormat", scope.makeOpName("StringFormat")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -131,7 +131,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ff820abbea3..4700ba2caa6 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 @@ -77,7 +77,7 @@ private Options() { @Endpoint(describeByClass = true) public static StringLength create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StringLength", scope.makeOpName("StringLength")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -109,7 +109,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e54a46a6b69..421155ab9f7 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Creates ngrams from ragged string data. @@ -65,8 +64,8 @@ public final class StringNGrams extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(data.asOutput()); - opBuilder.addInput(dataSplits.asOutput()); + opBuilder.addInput(data.asOutput(scope)); + opBuilder.addInput(dataSplits.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("separator", separator); long[] ngramWidthsArray = new long[ngramWidths.size()]; 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 d1e4b45d745..3f380cb8d08 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,8 +89,8 @@ private Options() { @Endpoint(describeByClass = true) public static StringSplit create(Scope scope, Operand input, Operand sep, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StringSplitV2", scope.makeOpName("StringSplit")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(sep.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(sep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 eb8f1a23a4a..15e6b7ef2e9 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 @@ -43,7 +43,7 @@ public final class Strip extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Strip create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("StringStrip", scope.makeOpName("Strip")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Strip(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9d6e21cbafc..7a8029e51ae 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Return substrings from `Tensor` of strings. @@ -147,9 +146,9 @@ private Options() { @Endpoint(describeByClass = true) public static Substr create(Scope scope, Operand input, Operand pos, Operand len, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Substr", scope.makeOpName("Substr")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(pos.asOutput()); - opBuilder.addInput(len.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(pos.asOutput(scope)); + opBuilder.addInput(len.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -180,7 +179,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 82d26aebe40..f84a249d36f 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 @@ -52,7 +52,7 @@ public final class ToHashBucket extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ToHashBucket create(Scope scope, Operand stringTensor, Long numBuckets) { OperationBuilder opBuilder = scope.env().opBuilder("StringToHashBucket", scope.makeOpName("ToHashBucket")); - opBuilder.addInput(stringTensor.asOutput()); + opBuilder.addInput(stringTensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_buckets", numBuckets); return new ToHashBucket(opBuilder.build()); @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 62737da0d0d..5a343175a3e 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 @@ -57,7 +57,7 @@ public final class ToHashBucketFast extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ToHashBucketFast create(Scope scope, Operand input, Long numBuckets) { OperationBuilder opBuilder = scope.env().opBuilder("StringToHashBucketFast", scope.makeOpName("ToHashBucketFast")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_buckets", numBuckets); return new ToHashBucketFast(opBuilder.build()); @@ -71,7 +71,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 c27d7053165..0c6d66ddaa4 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 @@ -67,7 +67,7 @@ public final class ToHashBucketStrong extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ToHashBucketStrong create(Scope scope, Operand input, Long numBuckets, List key) { OperationBuilder opBuilder = scope.env().opBuilder("StringToHashBucketStrong", scope.makeOpName("ToHashBucketStrong")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_buckets", numBuckets); long[] keyArray = new long[key.size()]; @@ -86,7 +86,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 8c0751ea782..1623cdc54cd 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 @@ -29,7 +29,6 @@ import org.tensorflow.types.TFloat32; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Converts each string in the input Tensor to the specified numeric type. @@ -60,7 +59,7 @@ public final class ToNumber extends RawOp implements Operand< @Endpoint(describeByClass = true) public static ToNumber create(Scope scope, Operand stringTensor, DataType outType) { OperationBuilder opBuilder = scope.env().opBuilder("StringToNumber", scope.makeOpName("ToNumber")); - opBuilder.addInput(stringTensor.asOutput()); + opBuilder.addInput(stringTensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("out_type", outType); return new ToNumber(opBuilder.build()); @@ -86,7 +85,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1d5f077d04b..ae8c060fcca 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 @@ -30,7 +30,6 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Decodes each string in `input` into a sequence of Unicode code points. @@ -118,7 +117,7 @@ private Options() { @Endpoint(describeByClass = true) public static UnicodeDecode create(Scope scope, Operand input, String inputEncoding, DataType Tsplits, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("UnicodeDecode", scope.makeOpName("UnicodeDecode")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("input_encoding", inputEncoding); opBuilder.setAttr("Tsplits", Tsplits); 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 019afa8fe33..7a11b3e06ea 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 @@ -30,7 +30,6 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Decodes each string in `input` into a sequence of Unicode code points. @@ -124,7 +123,7 @@ private Options() { @Endpoint(describeByClass = true) public static UnicodeDecodeWithOffsets create(Scope scope, Operand input, String inputEncoding, DataType Tsplits, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("UnicodeDecodeWithOffsets", scope.makeOpName("UnicodeDecodeWithOffsets")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("input_encoding", inputEncoding); opBuilder.setAttr("Tsplits", Tsplits); 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 1a539366d81..c4dc360bd8a 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TInt32; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Encode a tensor of ints into unicode strings. @@ -104,8 +103,8 @@ private Options() { @Endpoint(describeByClass = true) public static UnicodeEncode create(Scope scope, Operand inputValues, Operand inputSplits, String outputEncoding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("UnicodeEncode", scope.makeOpName("UnicodeEncode")); - opBuilder.addInput(inputValues.asOutput()); - opBuilder.addInput(inputSplits.asOutput()); + opBuilder.addInput(inputValues.asOutput(scope)); + opBuilder.addInput(inputSplits.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("output_encoding", outputEncoding); if (options != null) { @@ -152,7 +151,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3da3bac675c..b5c5eaeaa33 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 @@ -54,7 +54,7 @@ public final class UnicodeScript extends RawOp implements Operand { @Endpoint(describeByClass = true) public static UnicodeScript create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("UnicodeScript", scope.makeOpName("UnicodeScript")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new UnicodeScript(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 4b4e03fda8d..b7366bc621a 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 @@ -135,7 +135,7 @@ private Options() { @Endpoint(describeByClass = true) public static UnicodeTranscode create(Scope scope, Operand input, String inputEncoding, String outputEncoding, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("UnicodeTranscode", scope.makeOpName("UnicodeTranscode")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("input_encoding", inputEncoding); opBuilder.setAttr("output_encoding", outputEncoding); @@ -199,7 +199,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 47043fac5b2..4ad758f70ea 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Joins the elements of `inputs` based on `segment_ids`. @@ -95,9 +94,9 @@ private Options() { @Endpoint(describeByClass = true) public static UnsortedSegmentJoin create(Scope scope, Operand inputs, Operand segmentIds, Operand numSegments, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("UnsortedSegmentJoin", scope.makeOpName("UnsortedSegmentJoin")); - opBuilder.addInput(inputs.asOutput()); - opBuilder.addInput(segmentIds.asOutput()); - opBuilder.addInput(numSegments.asOutput()); + opBuilder.addInput(inputs.asOutput(scope)); + opBuilder.addInput(segmentIds.asOutput(scope)); + opBuilder.addInput(numSegments.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -123,7 +122,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 343e4c58d5d..eb21b354bcc 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 @@ -69,7 +69,7 @@ private Options() { @Endpoint(describeByClass = true) public static Upper create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("StringUpper", scope.makeOpName("Upper")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -95,7 +95,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f8382c2cede..203e4162aaa 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 @@ -81,9 +81,9 @@ private Options() { @Endpoint(describeByClass = true) public static AudioSummary create(Scope scope, Operand tag, Operand tensor, Operand sampleRate, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("AudioSummaryV2", scope.makeOpName("AudioSummary")); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(sampleRate.asOutput()); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(sampleRate.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -110,7 +110,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 c056b2f4f35..c54ccadbb1e 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 @@ -39,7 +39,7 @@ public final class CloseSummaryWriter extends RawOp { @Endpoint(describeByClass = true) public static CloseSummaryWriter create(Scope scope, Operand writer) { OperationBuilder opBuilder = scope.env().opBuilder("CloseSummaryWriter", scope.makeOpName("CloseSummaryWriter")); - opBuilder.addInput(writer.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 50cfefb2e9f..f7b510ffd7e 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 @@ -44,11 +44,11 @@ public final class CreateSummaryDbWriter extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(dbUri.asOutput()); - opBuilder.addInput(experimentName.asOutput()); - opBuilder.addInput(runName.asOutput()); - opBuilder.addInput(userName.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(dbUri.asOutput(scope)); + opBuilder.addInput(experimentName.asOutput(scope)); + opBuilder.addInput(runName.asOutput(scope)); + opBuilder.addInput(userName.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new CreateSummaryDbWriter(opBuilder.build()); } 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 13130955bca..df17adbe3c7 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 @@ -45,11 +45,11 @@ public final class CreateSummaryFileWriter extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(logdir.asOutput()); - opBuilder.addInput(maxQueue.asOutput()); - opBuilder.addInput(flushMillis.asOutput()); - opBuilder.addInput(filenameSuffix.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(logdir.asOutput(scope)); + opBuilder.addInput(maxQueue.asOutput(scope)); + opBuilder.addInput(flushMillis.asOutput(scope)); + opBuilder.addInput(filenameSuffix.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new CreateSummaryFileWriter(opBuilder.build()); } 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 16babb3df73..9cc8ce8a247 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 @@ -39,7 +39,7 @@ public final class FlushSummaryWriter extends RawOp { @Endpoint(describeByClass = true) public static FlushSummaryWriter create(Scope scope, Operand writer) { OperationBuilder opBuilder = scope.env().opBuilder("FlushSummaryWriter", scope.makeOpName("FlushSummaryWriter")); - opBuilder.addInput(writer.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 c98efad5b3b..57333d069d9 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs a `Summary` protocol buffer with a histogram. @@ -52,8 +51,8 @@ public final class HistogramSummary extends RawOp implements Operand { @Endpoint(describeByClass = true) public static HistogramSummary create(Scope scope, Operand tag, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("HistogramSummary", scope.makeOpName("HistogramSummary")); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new HistogramSummary(opBuilder.build()); } @@ -66,7 +65,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 50cc52f5769..925b5d58d76 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs a `Summary` protocol buffer with images. @@ -124,8 +123,8 @@ private Options() { @Endpoint(describeByClass = true) public static ImageSummary create(Scope scope, Operand tag, Operand tensor, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ImageSummary", scope.makeOpName("ImageSummary")); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -162,7 +161,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 736aa827d82..81e70e1d26a 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 @@ -41,8 +41,8 @@ public final class ImportEvent extends RawOp { @Endpoint(describeByClass = true) public static ImportEvent create(Scope scope, Operand writer, Operand event) { OperationBuilder opBuilder = scope.env().opBuilder("ImportEvent", scope.makeOpName("ImportEvent")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(event.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(event.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ImportEvent(opBuilder.build()); } 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 32ec38a516a..69f4ec11552 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 @@ -53,7 +53,7 @@ public final class MergeSummary extends RawOp implements Operand { @Endpoint(describeByClass = true) public static MergeSummary create(Scope scope, Iterable> inputs) { OperationBuilder opBuilder = scope.env().opBuilder("MergeSummary", scope.makeOpName("MergeSummary")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); return new MergeSummary(opBuilder.build()); } @@ -66,7 +66,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 c766d9759ed..b3633ef3a6b 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Outputs a `Summary` protocol buffer with scalar values. @@ -49,8 +48,8 @@ public final class ScalarSummary extends RawOp implements Operand { @Endpoint(describeByClass = true) public static ScalarSummary create(Scope scope, Operand tags, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("ScalarSummary", scope.makeOpName("ScalarSummary")); - opBuilder.addInput(tags.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(tags.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ScalarSummary(opBuilder.build()); } @@ -63,7 +62,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 525db2a64e8..143ff29c6a3 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 @@ -42,7 +42,7 @@ public final class StatsAggregatorSummary extends RawOp implements Operand iterator) { OperationBuilder opBuilder = scope.env().opBuilder("StatsAggregatorSummary", scope.makeOpName("StatsAggregatorSummary")); - opBuilder.addInput(iterator.asOutput()); + opBuilder.addInput(iterator.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new StatsAggregatorSummary(opBuilder.build()); } @@ -54,7 +54,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 f27b996b716..2fef41fed6b 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 @@ -105,7 +105,7 @@ public Output writer() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) writer; } 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 0d6e950a4f3..383ae5dc3c8 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 @@ -47,9 +47,9 @@ public final class TensorSummary extends RawOp implements Operand { @Endpoint(describeByClass = true) public static TensorSummary create(Scope scope, Operand tag, Operand tensor, Operand serializedSummaryMetadata) { OperationBuilder opBuilder = scope.env().opBuilder("TensorSummaryV2", scope.makeOpName("TensorSummary")); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(serializedSummaryMetadata.asOutput()); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(serializedSummaryMetadata.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TensorSummary(opBuilder.build()); } @@ -61,7 +61,7 @@ public Output summary() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return summary; } 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 69e42753c7c..457a3e37037 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 @@ -66,11 +66,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(sampleRate.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(sampleRate.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 0d6b11f1f6d..1560b6bdc22 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 @@ -43,9 +43,9 @@ public final class WriteGraphSummary extends RawOp { @Endpoint(describeByClass = true) public static WriteGraphSummary create(Scope scope, Operand writer, Operand step, Operand tensor) { OperationBuilder opBuilder = scope.env().opBuilder("WriteGraphSummary", scope.makeOpName("WriteGraphSummary")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WriteGraphSummary(opBuilder.build()); } 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 1cfdc6bd095..acf6b8672ca 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 @@ -27,7 +27,6 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** */ @@ -46,10 +45,10 @@ public final class WriteHistogramSummary extends RawOp { @Endpoint(describeByClass = true) public static WriteHistogramSummary create(Scope scope, Operand writer, Operand step, Operand tag, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("WriteHistogramSummary", scope.makeOpName("WriteHistogramSummary")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WriteHistogramSummary(opBuilder.build()); } 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 26be4538bf0..5ceb337bf73 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 @@ -28,7 +28,6 @@ import org.tensorflow.types.TString; import org.tensorflow.types.TUint8; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** */ @@ -68,11 +67,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(badColor.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(badColor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e781534b31b..2dd03780cdc 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 @@ -43,9 +43,9 @@ public final class WriteRawProtoSummary extends RawOp { @Endpoint(describeByClass = true) public static WriteRawProtoSummary create(Scope scope, Operand writer, Operand step, Operand tensor) { OperationBuilder opBuilder = scope.env().opBuilder("WriteRawProtoSummary", scope.makeOpName("WriteRawProtoSummary")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WriteRawProtoSummary(opBuilder.build()); } 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 b3a7b3a6723..7a9d0b73290 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 @@ -27,7 +27,6 @@ import org.tensorflow.types.TInt64; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** */ @@ -46,10 +45,10 @@ public final class WriteScalarSummary extends RawOp { @Endpoint(describeByClass = true) public static WriteScalarSummary create(Scope scope, Operand writer, Operand step, Operand tag, Operand value) { OperationBuilder opBuilder = scope.env().opBuilder("WriteScalarSummary", scope.makeOpName("WriteScalarSummary")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(value.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(value.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WriteScalarSummary(opBuilder.build()); } 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 a538b5a4cfd..d3c53242980 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 @@ -46,11 +46,11 @@ public final class WriteSummary extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(writer.asOutput()); - opBuilder.addInput(step.asOutput()); - opBuilder.addInput(tensor.asOutput()); - opBuilder.addInput(tag.asOutput()); - opBuilder.addInput(summaryMetadata.asOutput()); + opBuilder.addInput(writer.asOutput(scope)); + opBuilder.addInput(step.asOutput(scope)); + opBuilder.addInput(tensor.asOutput(scope)); + opBuilder.addInput(tag.asOutput(scope)); + opBuilder.addInput(summaryMetadata.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WriteSummary(opBuilder.build()); } 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 615657b1408..d2e1cd22c54 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 @@ -69,8 +69,8 @@ public final class AllToAll extends RawOp implements Operand @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(groupAssignment.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(groupAssignment.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("concat_dimension", concatDimension); opBuilder.setAttr("split_dimension", splitDimension); @@ -86,7 +86,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5b298bc1630..ef1ff020af3 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 @@ -53,8 +53,8 @@ public final class CollectivePermute extends RawOp implements O @Endpoint(describeByClass = true) public static CollectivePermute create(Scope scope, Operand input, Operand sourceTargetPairs) { OperationBuilder opBuilder = scope.env().opBuilder("CollectivePermute", scope.makeOpName("CollectivePermute")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(sourceTargetPairs.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(sourceTargetPairs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new CollectivePermute(opBuilder.build()); } @@ -67,7 +67,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 73f1bfceb3e..7042095ba34 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 @@ -166,7 +166,7 @@ public Output topology() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return topology; } 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 2c257fb6d2f..8cdad9500e9 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 @@ -27,7 +27,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TInt32; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * An Op to sum inputs across replicated TPU instances. @@ -56,8 +55,8 @@ public final class CrossReplicaSum extends RawOp implements O @Endpoint(describeByClass = true) public static CrossReplicaSum create(Scope scope, Operand input, Operand groupAssignment) { OperationBuilder opBuilder = scope.env().opBuilder("CrossReplicaSum", scope.makeOpName("CrossReplicaSum")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(groupAssignment.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(groupAssignment.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new CrossReplicaSum(opBuilder.build()); } @@ -70,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 7b499d87664..8ee1d6dd670 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 @@ -69,8 +69,8 @@ private Options() { @Endpoint(describeByClass = true) public static EnqueueTPUEmbeddingIntegerBatch create(Scope scope, Iterable> batch, Operand modeOverride, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingIntegerBatch", scope.makeOpName("EnqueueTPUEmbeddingIntegerBatch")); - opBuilder.addInputList(Operands.asOutputs(batch)); - opBuilder.addInput(modeOverride.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, batch)); + opBuilder.addInput(modeOverride.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 35185704d89..1553e506c06 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * An op that enqueues TPUEmbedding input indices from a SparseTensor. @@ -101,10 +100,10 @@ private Options() { @Endpoint(describeByClass = true) public static EnqueueTPUEmbeddingSparseBatch create(Scope scope, Iterable> sampleIndices, Iterable> embeddingIndices, Iterable> aggregationWeights, Operand modeOverride, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingSparseBatch", scope.makeOpName("EnqueueTPUEmbeddingSparseBatch")); - opBuilder.addInputList(Operands.asOutputs(sampleIndices)); - opBuilder.addInputList(Operands.asOutputs(embeddingIndices)); - opBuilder.addInputList(Operands.asOutputs(aggregationWeights)); - opBuilder.addInput(modeOverride.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, sampleIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, embeddingIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, aggregationWeights)); + opBuilder.addInput(modeOverride.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 5e4bf1c6b27..366ca175216 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 @@ -28,7 +28,6 @@ import org.tensorflow.op.annotation.Operator; import org.tensorflow.types.TString; import org.tensorflow.types.family.TNumber; -import org.tensorflow.types.family.TType; /** * Eases the porting of code that uses tf.nn.embedding_lookup_sparse(). @@ -114,10 +113,10 @@ private Options() { @Endpoint(describeByClass = true) public static EnqueueTPUEmbeddingSparseTensorBatch create(Scope scope, Iterable> sampleIndices, Iterable> embeddingIndices, Iterable> aggregationWeights, Operand modeOverride, List tableIds, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("EnqueueTPUEmbeddingSparseTensorBatch", scope.makeOpName("EnqueueTPUEmbeddingSparseTensorBatch")); - opBuilder.addInputList(Operands.asOutputs(sampleIndices)); - opBuilder.addInputList(Operands.asOutputs(embeddingIndices)); - opBuilder.addInputList(Operands.asOutputs(aggregationWeights)); - opBuilder.addInput(modeOverride.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, sampleIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, embeddingIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, aggregationWeights)); + opBuilder.addInput(modeOverride.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] tableIdsArray = new long[tableIds.size()]; for (int i = 0; i < tableIdsArray.length; ++i) { 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 19a5528dd5d..e1891dc28b9 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 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f40a1b7c5c4..44b2e09c4ac 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 @@ -85,7 +85,7 @@ private Options() { @Endpoint(describeByClass = true) public static InfeedEnqueue create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueue", scope.makeOpName("InfeedEnqueue")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 cdd475a08ae..a95187b48d4 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 @@ -61,7 +61,7 @@ private Options() { @Endpoint(describeByClass = true) public static InfeedEnqueuePrelinearizedBuffer create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueuePrelinearizedBuffer", scope.makeOpName("InfeedEnqueuePrelinearizedBuffer")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 c97a792ae7d..c13de09698e 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 @@ -78,7 +78,7 @@ private Options() { @Endpoint(describeByClass = true) public static InfeedEnqueueTuple create(Scope scope, Iterable> inputs, List shapes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("InfeedEnqueueTuple", scope.makeOpName("InfeedEnqueueTuple")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] shapesArray = new Shape[shapes.size()]; for (int i = 0; i < shapesArray.length; ++i) { 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 1222247d109..24e441e65ee 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(momenta.asOutput()); - opBuilder.addInput(velocities.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(momenta.asOutput(scope)); + opBuilder.addInput(velocities.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingADAMParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingADAMParametersGradAccumDebug.java index 53af351f736..dfce594b639 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 @@ -90,10 +90,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(momenta.asOutput()); - opBuilder.addInput(velocities.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(momenta.asOutput(scope)); + opBuilder.addInput(velocities.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingAdadeltaParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParameters.java index 66e2bc9a3d4..f1e0a2b9987 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(updates.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdadeltaParametersGradAccumDebug.java index d659eb12ec3..ea54ffd839f 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 @@ -90,10 +90,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(updates.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(updates.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParameters.java index 80b424e073c..732ef5bf3ad 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 @@ -88,8 +88,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingAdagradParametersGradAccumDebug.java index de11b50f1f9..533c0969f2d 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingCenteredRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingCenteredRMSPropParameters.java index b7bbb92fa90..aab7dce85d8 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 @@ -90,10 +90,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(mg.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(mg.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingFTRLParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParameters.java index 7939230997f..21c901399ad 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(linears.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(linears.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingFTRLParametersGradAccumDebug.java index 38ebb8518bd..b94974daba9 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 @@ -90,10 +90,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(linears.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(linears.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingMDLAdagradLightParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMDLAdagradLightParameters.java index 7d0f7d014c3..a8af854843c 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 @@ -90,10 +90,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(weights.asOutput()); - opBuilder.addInput(benefits.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(weights.asOutput(scope)); + opBuilder.addInput(benefits.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingMomentumParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParameters.java index c705213c9a2..a6bb901538b 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 @@ -88,8 +88,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(momenta.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(momenta.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingMomentumParametersGradAccumDebug.java index d774094df05..0bce7416c1d 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(momenta.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(momenta.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingProximalAdagradParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParameters.java index 57db2202b99..292b2e0b2cb 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 @@ -88,8 +88,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingProximalAdagradParametersGradAccumDebug.java index 40eec1594f1..b02f665fda9 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(accumulators.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(accumulators.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingRMSPropParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParameters.java index 88e2c035ce8..8fa11e449ac 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 @@ -89,9 +89,9 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingRMSPropParametersGradAccumDebug.java index 6e79a29f987..e8defb21924 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 @@ -90,10 +90,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(parameters.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(gradientAccumulators.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(gradientAccumulators.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/LoadTPUEmbeddingStochasticGradientDescentParameters.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/LoadTPUEmbeddingStochasticGradientDescentParameters.java index 32b34ea6262..cd2ee1c4e2b 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 @@ -87,7 +87,7 @@ private Options() { @Endpoint(describeByClass = true) public static LoadTPUEmbeddingStochasticGradientDescentParameters create(Scope scope, Operand parameters, Long numShards, Long shardId, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("LoadTPUEmbeddingStochasticGradientDescentParameters", scope.makeOpName("LoadTPUEmbeddingStochasticGradientDescentParameters")); - opBuilder.addInput(parameters.asOutput()); + opBuilder.addInput(parameters.asOutput(scope)); opBuilder = scope.applyControlDependencies(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/OutfeedDequeue.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/OutfeedDequeue.java index 2e822837449..e33b4f8963e 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 @@ -101,7 +101,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 16e8733bc55..b84587f1388 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 @@ -41,7 +41,7 @@ public final class OutfeedEnqueue extends RawOp { @Endpoint(describeByClass = true) public static OutfeedEnqueue create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("OutfeedEnqueue", scope.makeOpName("OutfeedEnqueue")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(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 43972c6f64a..94b98014baa 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 @@ -42,7 +42,7 @@ public final class OutfeedEnqueueTuple extends RawOp { @Endpoint(describeByClass = true) public static OutfeedEnqueueTuple create(Scope scope, Iterable> inputs) { OperationBuilder opBuilder = scope.env().opBuilder("OutfeedEnqueueTuple", scope.makeOpName("OutfeedEnqueueTuple")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); return new OutfeedEnqueueTuple(opBuilder.build()); } 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 78b0e38f4ae..41ea915a05d 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 @@ -75,7 +75,7 @@ private Options() { @Endpoint(describeByClass = true) public static Prelinearize create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("Prelinearize", scope.makeOpName("Prelinearize")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -118,7 +118,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 cc5a77b7fe4..368cf0846a7 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 @@ -69,7 +69,7 @@ private Options() { @Endpoint(describeByClass = true) public static PrelinearizeTuple create(Scope scope, Iterable> inputs, List shapes, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("PrelinearizeTuple", scope.makeOpName("PrelinearizeTuple")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); Shape[] shapesArray = new Shape[shapes.size()]; for (int i = 0; i < shapesArray.length; ++i) { @@ -108,7 +108,7 @@ public Output output() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) output; } 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 c98b2b5f7a8..0dbd4f8b712 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 @@ -134,7 +134,7 @@ public Output parameters() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return parameters; } 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 87b07cd2b8a..397a46b2ab8 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 @@ -54,8 +54,8 @@ public final class SendTPUEmbeddingGradients extends RawOp { @Endpoint(describeByClass = true) public static SendTPUEmbeddingGradients create(Scope scope, Iterable> inputs, Iterable> learningRates, String config) { OperationBuilder opBuilder = scope.env().opBuilder("SendTPUEmbeddingGradients", scope.makeOpName("SendTPUEmbeddingGradients")); - opBuilder.addInputList(Operands.asOutputs(inputs)); - opBuilder.addInputList(Operands.asOutputs(learningRates)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, learningRates)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("config", config); return new SendTPUEmbeddingGradients(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 d9bd22679e3..de0ff62d436 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 @@ -56,7 +56,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 5473e957471..31cae273abf 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 @@ -53,8 +53,8 @@ public final class TPUEmbeddingActivations extends RawOp implements Operand embeddingVariable, Operand slicedActivations, Long tableId, Long lookupId) { OperationBuilder opBuilder = scope.env().opBuilder("TPUEmbeddingActivations", scope.makeOpName("TPUEmbeddingActivations")); - opBuilder.addInput(embeddingVariable.asOutput()); - opBuilder.addInput(slicedActivations.asOutput()); + opBuilder.addInput(embeddingVariable.asOutput(scope)); + opBuilder.addInput(slicedActivations.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("table_id", tableId); opBuilder.setAttr("lookup_id", lookupId); @@ -68,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUOrdinalSelector.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUOrdinalSelector.java index 156f4b779fe..14baa038cfe 100644 --- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUOrdinalSelector.java +++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/tpu/TPUOrdinalSelector.java @@ -57,7 +57,7 @@ public Output deviceOrdinals() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return deviceOrdinals; } 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 157cb366d65..62ceaa43e7c 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 @@ -86,7 +86,7 @@ private Options() { @Endpoint(describeByClass = true) public static TPUReplicatedInput create(Scope scope, Iterable> inputs, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicatedInput", scope.makeOpName("TPUReplicatedInput")); - opBuilder.addInputList(Operands.asOutputs(inputs)); + opBuilder.addInputList(Operands.asOutputs(scope, inputs)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -122,7 +122,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0c169b3008d..6283aa291dc 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 @@ -58,7 +58,7 @@ public final class TPUReplicatedOutput extends RawOp implements @Endpoint(describeByClass = true) public static TPUReplicatedOutput create(Scope scope, Operand input, Long numReplicas) { OperationBuilder opBuilder = scope.env().opBuilder("TPUReplicatedOutput", scope.makeOpName("TPUReplicatedOutput")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("num_replicas", numReplicas); return new TPUReplicatedOutput(opBuilder.build()); 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 bb35afe9d09..2cf6d4a7680 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 @@ -45,7 +45,7 @@ public final class WorkerHeartbeat extends RawOp implements Operand { @Endpoint(describeByClass = true) public static WorkerHeartbeat create(Scope scope, Operand request) { OperationBuilder opBuilder = scope.env().opBuilder("WorkerHeartbeat", scope.makeOpName("WorkerHeartbeat")); - opBuilder.addInput(request.asOutput()); + opBuilder.addInput(request.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new WorkerHeartbeat(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output response() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return response; } 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 c493d6daa72..891b4cfc669 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 @@ -48,9 +48,9 @@ public final class AccumulatorApplyGradient extends RawOp { @Endpoint(describeByClass = true) public static AccumulatorApplyGradient create(Scope scope, Operand handle, Operand localStep, Operand gradient) { OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorApplyGradient", scope.makeOpName("AccumulatorApplyGradient")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(localStep.asOutput()); - opBuilder.addInput(gradient.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(localStep.asOutput(scope)); + opBuilder.addInput(gradient.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AccumulatorApplyGradient(opBuilder.build()); } 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 8146deccf7d..51c24cecefb 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 @@ -44,7 +44,7 @@ public final class AccumulatorNumAccumulated extends RawOp implements Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorNumAccumulated", scope.makeOpName("AccumulatorNumAccumulated")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AccumulatorNumAccumulated(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output numAccumulated() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return numAccumulated; } 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 747fcc6b123..dcfb5fad10d 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 @@ -47,8 +47,8 @@ public final class AccumulatorSetGlobalStep extends RawOp { @Endpoint(describeByClass = true) public static AccumulatorSetGlobalStep create(Scope scope, Operand handle, Operand newGlobalStep) { OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorSetGlobalStep", scope.makeOpName("AccumulatorSetGlobalStep")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(newGlobalStep.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(newGlobalStep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new AccumulatorSetGlobalStep(opBuilder.build()); } 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 23f24d3f675..58a8f0ab50f 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 @@ -57,8 +57,8 @@ public final class AccumulatorTakeGradient extends RawOp implem @Endpoint(describeByClass = true) public static AccumulatorTakeGradient create(Scope scope, Operand handle, Operand numRequired, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("AccumulatorTakeGradient", scope.makeOpName("AccumulatorTakeGradient")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(numRequired.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(numRequired.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new AccumulatorTakeGradient(opBuilder.build()); @@ -72,7 +72,7 @@ public Output average() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return average; } 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 8153a364508..6b67ca4a071 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 @@ -78,15 +78,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(beta1Power.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(beta1.asOutput()); - opBuilder.addInput(beta2.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(beta1Power.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(beta1.asOutput(scope)); + opBuilder.addInput(beta2.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -115,7 +115,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 928e2ae0f4e..e6440090d85 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 @@ -77,13 +77,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(accumUpdate.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(accumUpdate.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -111,7 +111,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 2a88b987503..ac5c5a95c47 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 @@ -82,10 +82,10 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -124,7 +124,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 e03d521353b..3afa0963bcb 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 @@ -74,14 +74,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(gradientAccumulator.asOutput()); - opBuilder.addInput(gradientSquaredAccumulator.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(globalStep.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(gradientAccumulator.asOutput(scope)); + opBuilder.addInput(gradientSquaredAccumulator.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(globalStep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -109,7 +109,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 aeaaddb103c..43cce745f1d 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 @@ -82,11 +82,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -125,7 +125,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 c6b93126708..e27648cf317 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 @@ -90,16 +90,16 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(beta1Power.asOutput()); - opBuilder.addInput(beta2Power.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(beta1.asOutput()); - opBuilder.addInput(beta2.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(beta1Power.asOutput(scope)); + opBuilder.addInput(beta2Power.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(beta1.asOutput(scope)); + opBuilder.addInput(beta2.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -138,7 +138,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 d7ca57e1dce..275c1eb9bda 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 @@ -77,13 +77,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(signDecay.asOutput()); - opBuilder.addInput(beta.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(signDecay.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -112,7 +112,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 fb1735ca92c..438b25694c8 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 @@ -94,15 +94,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(mg.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(mg.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -131,7 +131,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 54c9cab7494..8d6f39ef1c2 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 @@ -83,15 +83,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(linear.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(l2Shrinkage.asOutput()); - opBuilder.addInput(lrPower.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(linear.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(l2Shrinkage.asOutput(scope)); + opBuilder.addInput(lrPower.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -120,7 +120,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 8377b0594e0..9b54c9009eb 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 @@ -68,9 +68,9 @@ private Options() { @Endpoint(describeByClass = true) public static ApplyGradientDescent create(Scope scope, Operand var, Operand alpha, Operand delta, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ApplyGradientDescent", scope.makeOpName("ApplyGradientDescent")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -98,7 +98,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 dbd26f4eb9c..fefc5801355 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 @@ -87,11 +87,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(momentum.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -132,7 +132,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 c0332c9a840..b3adbbd785f 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 @@ -77,13 +77,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(logbase.asOutput()); - opBuilder.addInput(signDecay.asOutput()); - opBuilder.addInput(beta.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(logbase.asOutput(scope)); + opBuilder.addInput(signDecay.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -112,7 +112,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 0f3e9af018a..a1272ba2c6f 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 @@ -75,12 +75,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -108,7 +108,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 7a28929d7e7..5bb9f03a96a 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 @@ -73,11 +73,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -105,7 +105,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 53ff4e45b87..3ff62505700 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 @@ -85,14 +85,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -121,7 +121,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 6e1ae852143..624112b081f 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 @@ -99,8 +99,8 @@ private Options() { @Endpoint(describeByClass = true) public static BatchMatMul create(Scope scope, Operand x, Operand y, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("BatchMatMulV2", scope.makeOpName("BatchMatMul")); - opBuilder.addInput(x.asOutput()); - opBuilder.addInput(y.asOutput()); + opBuilder.addInput(x.asOutput(scope)); + opBuilder.addInput(y.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -137,7 +137,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 3708f037741..56eebe5a838 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 @@ -144,7 +144,7 @@ public Output handle() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return handle; } 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 f1d4fb5d792..57770bd784b 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 @@ -98,8 +98,8 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(newVocabFile.asOutput()); - opBuilder.addInput(oldVocabFile.asOutput()); + opBuilder.addInput(newVocabFile.asOutput(scope)); + opBuilder.addInput(oldVocabFile.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("new_vocab_offset", newVocabOffset); opBuilder.setAttr("num_new_vocab", numNewVocab); 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 7807178f138..7f1f1491927 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 @@ -73,8 +73,8 @@ private Options() { @Endpoint(describeByClass = true) public static MergeV2Checkpoints create(Scope scope, Operand checkpointPrefixes, Operand destinationPrefix, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("MergeV2Checkpoints", scope.makeOpName("MergeV2Checkpoints")); - opBuilder.addInput(checkpointPrefixes.asOutput()); - opBuilder.addInput(destinationPrefix.asOutput()); + opBuilder.addInput(checkpointPrefixes.asOutput(scope)); + opBuilder.addInput(destinationPrefix.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 1a625589a1d..89699a34000 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 @@ -50,11 +50,11 @@ public final class NegTrain extends RawOp { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(wIn.asOutput()); - opBuilder.addInput(wOut.asOutput()); - opBuilder.addInput(examples.asOutput()); - opBuilder.addInput(labels.asOutput()); - opBuilder.addInput(lr.asOutput()); + opBuilder.addInput(wIn.asOutput(scope)); + opBuilder.addInput(wOut.asOutput(scope)); + opBuilder.addInput(examples.asOutput(scope)); + opBuilder.addInput(labels.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); long[] vocabCountArray = new long[vocabCount.size()]; for (int i = 0; i < vocabCountArray.length; ++i) { 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 cbd17d82d2d..6f3c0dc0dee 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 @@ -74,7 +74,7 @@ private Options() { @Endpoint(describeByClass = true) public static PreventGradient create(Scope scope, Operand input, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("PreventGradient", scope.makeOpName("PreventGradient")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -102,7 +102,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 ee76a499d06..887f2352f20 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 @@ -46,9 +46,9 @@ public final class ResourceAccumulatorApplyGradient extends RawOp { @Endpoint(describeByClass = true) public static ResourceAccumulatorApplyGradient create(Scope scope, Operand handle, Operand localStep, Operand gradient) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorApplyGradient", scope.makeOpName("ResourceAccumulatorApplyGradient")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(localStep.asOutput()); - opBuilder.addInput(gradient.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(localStep.asOutput(scope)); + opBuilder.addInput(gradient.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceAccumulatorApplyGradient(opBuilder.build()); } 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 3ec9d5dc02c..8875a603f0c 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 @@ -42,7 +42,7 @@ public final class ResourceAccumulatorNumAccumulated extends RawOp implements Op @Endpoint(describeByClass = true) public static ResourceAccumulatorNumAccumulated create(Scope scope, Operand handle) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorNumAccumulated", scope.makeOpName("ResourceAccumulatorNumAccumulated")); - opBuilder.addInput(handle.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceAccumulatorNumAccumulated(opBuilder.build()); } @@ -55,7 +55,7 @@ public Output numAccumulated() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return numAccumulated; } 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 d7f8261bc11..84895e0e41f 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 @@ -45,8 +45,8 @@ public final class ResourceAccumulatorSetGlobalStep extends RawOp { @Endpoint(describeByClass = true) public static ResourceAccumulatorSetGlobalStep create(Scope scope, Operand handle, Operand newGlobalStep) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorSetGlobalStep", scope.makeOpName("ResourceAccumulatorSetGlobalStep")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(newGlobalStep.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(newGlobalStep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ResourceAccumulatorSetGlobalStep(opBuilder.build()); } 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 ab334ce4cc0..f0fbf695e24 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 @@ -55,8 +55,8 @@ public final class ResourceAccumulatorTakeGradient extends RawO @Endpoint(describeByClass = true) public static ResourceAccumulatorTakeGradient create(Scope scope, Operand handle, Operand numRequired, DataType dtype) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceAccumulatorTakeGradient", scope.makeOpName("ResourceAccumulatorTakeGradient")); - opBuilder.addInput(handle.asOutput()); - opBuilder.addInput(numRequired.asOutput()); + opBuilder.addInput(handle.asOutput(scope)); + opBuilder.addInput(numRequired.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dtype", dtype); return new ResourceAccumulatorTakeGradient(opBuilder.build()); @@ -70,7 +70,7 @@ public Output average() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return average; } 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 c22944b05c8..2b432ce45bf 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 @@ -75,15 +75,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(beta1Power.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(beta1.asOutput()); - opBuilder.addInput(beta2.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(beta1Power.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(beta1.asOutput(scope)); + opBuilder.addInput(beta2.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 8a947bc150e..89fb64dcaab 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 @@ -74,13 +74,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(accumUpdate.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(accumUpdate.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 33ae02d0f59..2e9fe8f35fa 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 @@ -79,11 +79,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 ffb77721112..bdcaa701119 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 @@ -71,14 +71,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(gradientAccumulator.asOutput()); - opBuilder.addInput(gradientSquaredAccumulator.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(globalStep.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(gradientAccumulator.asOutput(scope)); + opBuilder.addInput(gradientSquaredAccumulator.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(globalStep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 8c68669fc92..4cdd4f66b53 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 @@ -87,16 +87,16 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(beta1Power.asOutput()); - opBuilder.addInput(beta2Power.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(beta1.asOutput()); - opBuilder.addInput(beta2.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(beta1Power.asOutput(scope)); + opBuilder.addInput(beta2Power.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(beta1.asOutput(scope)); + opBuilder.addInput(beta2.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 86dcc2d06ef..341e1aba22e 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 @@ -80,17 +80,17 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(v.asOutput()); - opBuilder.addInput(vhat.asOutput()); - opBuilder.addInput(beta1Power.asOutput()); - opBuilder.addInput(beta2Power.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(beta1.asOutput()); - opBuilder.addInput(beta2.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(v.asOutput(scope)); + opBuilder.addInput(vhat.asOutput(scope)); + opBuilder.addInput(beta1Power.asOutput(scope)); + opBuilder.addInput(beta2Power.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(beta1.asOutput(scope)); + opBuilder.addInput(beta2.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 82489d348da..b1fa4733582 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 @@ -74,13 +74,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(signDecay.asOutput()); - opBuilder.addInput(beta.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(signDecay.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 d76224d6022..397b75b8a3d 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 @@ -91,15 +91,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(mg.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(mg.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 7add86848c9..18a7ee6c18d 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 @@ -80,15 +80,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(linear.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(l2Shrinkage.asOutput()); - opBuilder.addInput(lrPower.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(linear.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(l2Shrinkage.asOutput(scope)); + opBuilder.addInput(lrPower.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 a57d2e90a18..0feb5017e3b 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 @@ -65,9 +65,9 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceApplyGradientDescent create(Scope scope, Operand var, Operand alpha, Operand delta, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("ResourceApplyGradientDescent", scope.makeOpName("ResourceApplyGradientDescent")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e58fd2150cd..a4bd5f2d298 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 @@ -84,11 +84,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(momentum.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 51af89430d2..5d1c21933c4 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 @@ -84,11 +84,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(momentum.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 5f035f53935..eb8133ecc2a 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 @@ -74,13 +74,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(m.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(logbase.asOutput()); - opBuilder.addInput(signDecay.asOutput()); - opBuilder.addInput(beta.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(m.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(logbase.asOutput(scope)); + opBuilder.addInput(signDecay.asOutput(scope)); + opBuilder.addInput(beta.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e2197540e94..6539acddb36 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 @@ -72,12 +72,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 d5b9d063a95..ca5fa1d5cf9 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 @@ -70,11 +70,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(delta.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(delta.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 f79a1202f6a..14c20050390 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 @@ -82,14 +82,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 fe27517dee2..b60cb1e845d 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 @@ -145,7 +145,7 @@ public Output handle() { @Override @SuppressWarnings("unchecked") - public Output asOutput() { + public Output asOutput(Scope scope) { return (Output) handle; } 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 d64efcb9474..d2390b3ca55 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 @@ -71,14 +71,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(accumUpdate.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(accumUpdate.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 6ece72cb637..bbf2e405616 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 @@ -82,11 +82,11 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 ad007159e6a..385ec73f022 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 @@ -73,15 +73,15 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceSparseApplyAdagradDa create(Scope scope, Operand var, Operand gradientAccumulator, 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(gradientAccumulator.asOutput()); - opBuilder.addInput(gradientSquaredAccumulator.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(globalStep.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(gradientAccumulator.asOutput(scope)); + opBuilder.addInput(gradientSquaredAccumulator.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(globalStep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 f8808aa3980..5cf557bf87c 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 @@ -82,12 +82,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e9482879729..db563bf1865 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 @@ -91,16 +91,16 @@ private Options() { @Endpoint(describeByClass = true) public static ResourceSparseApplyCenteredRmsProp create(Scope 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(mg.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(mg.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 07f2e12f9b0..d0c048e1200 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 @@ -83,16 +83,16 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(linear.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(l2Shrinkage.asOutput()); - opBuilder.addInput(lrPower.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(linear.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(l2Shrinkage.asOutput(scope)); + opBuilder.addInput(lrPower.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 e1ff036c295..a55126e0ccb 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 @@ -88,12 +88,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(momentum.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 80c58d282bc..979f379ef19 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 @@ -88,12 +88,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(momentum.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 75e7ca9e0f1..cf1764e4402 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 @@ -76,13 +76,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 bf48496179c..4ebbb87537b 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 @@ -73,12 +73,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 0dc980bb6f8..cb416b14794 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 @@ -84,15 +84,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { 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 ecd4a059793..01519516e52 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 @@ -67,9 +67,9 @@ public final class Restore extends RawOp implements Iterable> { @Endpoint(describeByClass = true) public static Restore create(Scope scope, Operand prefix, Operand tensorNames, Operand shapeAndSlices, List> dtypes) { OperationBuilder opBuilder = scope.env().opBuilder("RestoreV2", scope.makeOpName("Restore")); - opBuilder.addInput(prefix.asOutput()); - opBuilder.addInput(tensorNames.asOutput()); - opBuilder.addInput(shapeAndSlices.asOutput()); + opBuilder.addInput(prefix.asOutput(scope)); + opBuilder.addInput(tensorNames.asOutput(scope)); + opBuilder.addInput(shapeAndSlices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); DataType[] dtypesArray = new DataType[dtypes.size()]; for (int i = 0; i < dtypesArray.length; ++i) { 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 e1148129d86..13f9046ec19 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 @@ -81,9 +81,9 @@ private Options() { @Endpoint(describeByClass = true) public static RestoreSlice create(Scope scope, Operand filePattern, Operand tensorName, Operand shapeAndSlice, DataType dt, Options... options) { OperationBuilder opBuilder = scope.env().opBuilder("RestoreSlice", scope.makeOpName("RestoreSlice")); - opBuilder.addInput(filePattern.asOutput()); - opBuilder.addInput(tensorName.asOutput()); - opBuilder.addInput(shapeAndSlice.asOutput()); + opBuilder.addInput(filePattern.asOutput(scope)); + opBuilder.addInput(tensorName.asOutput(scope)); + opBuilder.addInput(shapeAndSlice.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dt", dt); if (options != null) { @@ -112,7 +112,7 @@ public Output tensor() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return tensor; } 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 b33f1c1c33b..6a1e7901c26 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 @@ -52,10 +52,10 @@ public final class Save extends RawOp { @Endpoint(describeByClass = true) public static Save create(Scope scope, Operand prefix, Operand tensorNames, Operand shapeAndSlices, Iterable> tensors) { OperationBuilder opBuilder = scope.env().opBuilder("SaveV2", scope.makeOpName("Save")); - opBuilder.addInput(prefix.asOutput()); - opBuilder.addInput(tensorNames.asOutput()); - opBuilder.addInput(shapeAndSlices.asOutput()); - opBuilder.addInputList(Operands.asOutputs(tensors)); + opBuilder.addInput(prefix.asOutput(scope)); + opBuilder.addInput(tensorNames.asOutput(scope)); + opBuilder.addInput(shapeAndSlices.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, tensors)); opBuilder = scope.applyControlDependencies(opBuilder); return new Save(opBuilder.build()); } 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 25c91540ede..e56422d95c5 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 @@ -78,10 +78,10 @@ public final class SaveSlices extends RawOp { @Endpoint(describeByClass = true) public static SaveSlices create(Scope scope, Operand filename, Operand tensorNames, Operand shapesAndSlices, Iterable> data) { OperationBuilder opBuilder = scope.env().opBuilder("SaveSlices", scope.makeOpName("SaveSlices")); - opBuilder.addInput(filename.asOutput()); - opBuilder.addInput(tensorNames.asOutput()); - opBuilder.addInput(shapesAndSlices.asOutput()); - opBuilder.addInputList(Operands.asOutputs(data)); + opBuilder.addInput(filename.asOutput(scope)); + opBuilder.addInput(tensorNames.asOutput(scope)); + opBuilder.addInput(shapesAndSlices.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, data)); opBuilder = scope.applyControlDependencies(opBuilder); return new SaveSlices(opBuilder.build()); } 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 b5629b59b88..0b1d7631aff 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 @@ -44,7 +44,7 @@ public final class SdcaFprint extends RawOp implements Operand { @Endpoint(describeByClass = true) public static SdcaFprint create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("SdcaFprint", scope.makeOpName("SdcaFprint")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new SdcaFprint(opBuilder.build()); } @@ -58,7 +58,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9cf443dc4d8..17f6a080b34 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 @@ -106,16 +106,16 @@ private Options() { @Endpoint(describeByClass = true) public static SdcaOptimizer create(Scope scope, Iterable> sparseExampleIndices, Iterable> sparseFeatureIndices, Iterable> sparseFeatureValues, Iterable> denseFeatures, Operand exampleWeights, Operand exampleLabels, 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")); - opBuilder.addInputList(Operands.asOutputs(sparseExampleIndices)); - opBuilder.addInputList(Operands.asOutputs(sparseFeatureIndices)); - opBuilder.addInputList(Operands.asOutputs(sparseFeatureValues)); - opBuilder.addInputList(Operands.asOutputs(denseFeatures)); - opBuilder.addInput(exampleWeights.asOutput()); - opBuilder.addInput(exampleLabels.asOutput()); - opBuilder.addInputList(Operands.asOutputs(sparseIndices)); - opBuilder.addInputList(Operands.asOutputs(sparseWeights)); - opBuilder.addInputList(Operands.asOutputs(denseWeights)); - opBuilder.addInput(exampleStateData.asOutput()); + opBuilder.addInputList(Operands.asOutputs(scope, sparseExampleIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, sparseFeatureIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, sparseFeatureValues)); + opBuilder.addInputList(Operands.asOutputs(scope, denseFeatures)); + opBuilder.addInput(exampleWeights.asOutput(scope)); + opBuilder.addInput(exampleLabels.asOutput(scope)); + opBuilder.addInputList(Operands.asOutputs(scope, sparseIndices)); + opBuilder.addInputList(Operands.asOutputs(scope, sparseWeights)); + opBuilder.addInputList(Operands.asOutputs(scope, denseWeights)); + opBuilder.addInput(exampleStateData.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("loss_type", lossType); opBuilder.setAttr("l1", l1); 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 d531030e063..74ccb223c44 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 @@ -46,7 +46,7 @@ public final class SdcaShrinkL1 extends RawOp { @Endpoint(describeByClass = true) public static SdcaShrinkL1 create(Scope scope, Iterable> weights, Float l1, Float l2) { OperationBuilder opBuilder = scope.env().opBuilder("SdcaShrinkL1", scope.makeOpName("SdcaShrinkL1")); - opBuilder.addInputList(Operands.asOutputs(weights)); + opBuilder.addInputList(Operands.asOutputs(scope, weights)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("l1", l1); opBuilder.setAttr("l2", l2); 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 6ed5c2faee3..5da4d4ddecc 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 @@ -74,14 +74,14 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(accumUpdate.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(accumUpdate.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -109,7 +109,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 90cbe36a32d..52ec668070e 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 @@ -85,12 +85,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -129,7 +129,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 23c791a6d50..5ff9d0177eb 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 @@ -76,15 +76,15 @@ private Options() { @Endpoint(describeByClass = true) public static SparseApplyAdagradDa create(Scope scope, Operand var, 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(gradientAccumulator.asOutput()); - opBuilder.addInput(gradientSquaredAccumulator.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(globalStep.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(gradientAccumulator.asOutput(scope)); + opBuilder.addInput(gradientSquaredAccumulator.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(globalStep.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -112,7 +112,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 367de145c5e..41ea69451a3 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 @@ -94,16 +94,16 @@ private Options() { @Endpoint(describeByClass = true) public static SparseApplyCenteredRmsProp create(Scope 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("SparseApplyCenteredRMSProp", scope.makeOpName("SparseApplyCenteredRmsProp")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(mg.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(mg.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -132,7 +132,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 defb68856e6..b6f002a4941 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 @@ -86,16 +86,16 @@ private Options() { @Endpoint(describeByClass = true) public static SparseApplyFtrl 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("SparseApplyFtrlV2", scope.makeOpName("SparseApplyFtrl")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(linear.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(l2Shrinkage.asOutput()); - opBuilder.addInput(lrPower.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(linear.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(l2Shrinkage.asOutput(scope)); + opBuilder.addInput(lrPower.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -124,7 +124,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 ebd4d0e7c14..4f23b8510b1 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 @@ -91,12 +91,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); - opBuilder.addInput(momentum.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -137,7 +137,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 0a73d0a138c..d199b33477f 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 @@ -79,13 +79,13 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(accum.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(accum.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -113,7 +113,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 2a4ef9f900b..8d44f8d27e2 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 @@ -76,12 +76,12 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(alpha.asOutput()); - opBuilder.addInput(l1.asOutput()); - opBuilder.addInput(l2.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(alpha.asOutput(scope)); + opBuilder.addInput(l1.asOutput(scope)); + opBuilder.addInput(l2.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -109,7 +109,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 5205086b7dd..ab1b9f9d388 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 @@ -87,15 +87,15 @@ private Options() { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(var.asOutput()); - opBuilder.addInput(ms.asOutput()); - opBuilder.addInput(mom.asOutput()); - opBuilder.addInput(lr.asOutput()); - opBuilder.addInput(rho.asOutput()); - opBuilder.addInput(momentum.asOutput()); - opBuilder.addInput(epsilon.asOutput()); - opBuilder.addInput(grad.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(var.asOutput(scope)); + opBuilder.addInput(ms.asOutput(scope)); + opBuilder.addInput(mom.asOutput(scope)); + opBuilder.addInput(lr.asOutput(scope)); + opBuilder.addInput(rho.asOutput(scope)); + opBuilder.addInput(momentum.asOutput(scope)); + opBuilder.addInput(epsilon.asOutput(scope)); + opBuilder.addInput(grad.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); if (options != null) { for (Options opts : options) { @@ -124,7 +124,7 @@ public Output out() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return out; } 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 42d68f0f59b..891e3d2b48f 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 @@ -51,8 +51,8 @@ public final class TileGrad extends RawOp implements Operand @Endpoint(describeByClass = true) public static TileGrad create(Scope scope, Operand input, Operand multiples) { OperationBuilder opBuilder = scope.env().opBuilder("TileGrad", scope.makeOpName("TileGrad")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(multiples.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(multiples.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new TileGrad(opBuilder.build()); } @@ -64,7 +64,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 1d8b4fe476b..40e3fd243c8 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 @@ -52,9 +52,9 @@ public final class BroadcastHelper extends RawOp { @Endpoint(describeByClass = true) public static BroadcastHelper create(Scope scope, Operand lhs, Operand rhs, Operand broadcastDims) { OperationBuilder opBuilder = scope.env().opBuilder("XlaBroadcastHelper", scope.makeOpName("BroadcastHelper")); - opBuilder.addInput(lhs.asOutput()); - opBuilder.addInput(rhs.asOutput()); - opBuilder.addInput(broadcastDims.asOutput()); + opBuilder.addInput(lhs.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); + opBuilder.addInput(broadcastDims.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new BroadcastHelper(opBuilder.build()); } 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 21a978fc7a8..f77b6799a1b 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 @@ -45,7 +45,7 @@ public final class ClusterOutput extends RawOp implements Opera @Endpoint(describeByClass = true) public static ClusterOutput create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("XlaClusterOutput", scope.makeOpName("ClusterOutput")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new ClusterOutput(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output outputs() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return outputs; } 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 7727cf1e9ac..49fa285d435 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 @@ -57,13 +57,13 @@ public final class Conv extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Conv create(Scope scope, Operand lhs, 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")); - opBuilder.addInput(lhs.asOutput()); - opBuilder.addInput(rhs.asOutput()); - opBuilder.addInput(windowStrides.asOutput()); - opBuilder.addInput(padding.asOutput()); - opBuilder.addInput(lhsDilation.asOutput()); - opBuilder.addInput(rhsDilation.asOutput()); - opBuilder.addInput(featureGroupCount.asOutput()); + opBuilder.addInput(lhs.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); + opBuilder.addInput(windowStrides.asOutput(scope)); + opBuilder.addInput(padding.asOutput(scope)); + opBuilder.addInput(lhsDilation.asOutput(scope)); + opBuilder.addInput(rhsDilation.asOutput(scope)); + opBuilder.addInput(featureGroupCount.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dimension_numbers", dimensionNumbers); opBuilder.setAttr("precision_config", precisionConfig); @@ -77,7 +77,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 751e47f4d5b..3b9762c2326 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 @@ -50,7 +50,7 @@ public final class Dequantize extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("min_range", minRange); opBuilder.setAttr("max_range", maxRange); @@ -69,7 +69,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 0f3e1ef83df..042084ec588 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 @@ -51,8 +51,8 @@ public final class Dot extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Dot create(Scope scope, Operand lhs, Operand rhs, String dimensionNumbers, String precisionConfig) { OperationBuilder opBuilder = scope.env().opBuilder("XlaDot", scope.makeOpName("Dot")); - opBuilder.addInput(lhs.asOutput()); - opBuilder.addInput(rhs.asOutput()); + opBuilder.addInput(lhs.asOutput(scope)); + opBuilder.addInput(rhs.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dimension_numbers", dimensionNumbers); opBuilder.setAttr("precision_config", precisionConfig); @@ -66,7 +66,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b6ecba31189..18f5d0ad2cc 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 @@ -60,9 +60,9 @@ public final class DynamicSlice extends RawOp implements Operan @Endpoint(describeByClass = true) public static DynamicSlice create(Scope scope, Operand input, Operand startIndices, Operand sizeIndices) { OperationBuilder opBuilder = scope.env().opBuilder("XlaDynamicSlice", scope.makeOpName("DynamicSlice")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(startIndices.asOutput()); - opBuilder.addInput(sizeIndices.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(startIndices.asOutput(scope)); + opBuilder.addInput(sizeIndices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DynamicSlice(opBuilder.build()); } @@ -74,7 +74,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 b974b64196e..013bd8896a6 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 @@ -59,9 +59,9 @@ public final class DynamicUpdateSlice extends RawOp implements @Endpoint(describeByClass = true) public static DynamicUpdateSlice create(Scope scope, Operand input, Operand update, Operand indices) { OperationBuilder opBuilder = scope.env().opBuilder("XlaDynamicUpdateSlice", scope.makeOpName("DynamicUpdateSlice")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(update.asOutput()); - opBuilder.addInput(indices.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(update.asOutput(scope)); + opBuilder.addInput(indices.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new DynamicUpdateSlice(opBuilder.build()); } @@ -74,7 +74,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 f5bf706641a..2e8217cf153 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 @@ -50,8 +50,8 @@ public final class Einsum extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Einsum create(Scope scope, Operand a, Operand b, String equation) { OperationBuilder opBuilder = scope.env().opBuilder("XlaEinsum", scope.makeOpName("Einsum")); - opBuilder.addInput(a.asOutput()); - opBuilder.addInput(b.asOutput()); + opBuilder.addInput(a.asOutput(scope)); + opBuilder.addInput(b.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("equation", equation); return new Einsum(opBuilder.build()); @@ -64,7 +64,7 @@ public Output product() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return product; } 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 d5b3298b395..c34ba00dd16 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 @@ -52,9 +52,9 @@ public final class Gather extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(operand.asOutput()); - opBuilder.addInput(startIndices.asOutput()); - opBuilder.addInput(sliceSizes.asOutput()); + opBuilder.addInput(operand.asOutput(scope)); + opBuilder.addInput(startIndices.asOutput(scope)); + opBuilder.addInput(sliceSizes.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("dimension_numbers", dimensionNumbers); opBuilder.setAttr("indices_are_sorted", indicesAreSorted); @@ -68,7 +68,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 9fd5e4c774d..6787693b731 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 @@ -53,8 +53,8 @@ public final class KeyValueSort extends RawO @Endpoint(describeByClass = true) public static KeyValueSort create(Scope scope, Operand keys, Operand values) { OperationBuilder opBuilder = scope.env().opBuilder("XlaKeyValueSort", scope.makeOpName("KeyValueSort")); - opBuilder.addInput(keys.asOutput()); - opBuilder.addInput(values.asOutput()); + opBuilder.addInput(keys.asOutput(scope)); + opBuilder.addInput(values.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new KeyValueSort(opBuilder.build()); } 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 eafaf001168..ac5eb5b1efe 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 @@ -53,11 +53,11 @@ public final class Pad extends RawOp implements Operand { @Endpoint(describeByClass = true) 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")); - opBuilder.addInput(input.asOutput()); - opBuilder.addInput(paddingValue.asOutput()); - opBuilder.addInput(paddingLow.asOutput()); - opBuilder.addInput(paddingHigh.asOutput()); - opBuilder.addInput(paddingInterior.asOutput()); + opBuilder.addInput(input.asOutput(scope)); + opBuilder.addInput(paddingValue.asOutput(scope)); + opBuilder.addInput(paddingLow.asOutput(scope)); + opBuilder.addInput(paddingHigh.asOutput(scope)); + opBuilder.addInput(paddingInterior.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Pad(opBuilder.build()); } @@ -70,7 +70,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 03274eb84e6..d143de62040 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 @@ -67,7 +67,7 @@ public Output tensor() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return tensor; } 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 a27b87f6c1a..abdcd36f60c 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 @@ -53,7 +53,7 @@ public Output id() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return id; } 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 abbecd3e54b..7a57ecdaf08 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 @@ -58,7 +58,7 @@ public final class SelfAdjointEig extends RawOp { @Endpoint(describeByClass = true) public static SelfAdjointEig create(Scope scope, Operand a, Boolean lower, Long maxIter, Float epsilon) { OperationBuilder opBuilder = scope.env().opBuilder("XlaSelfAdjointEig", scope.makeOpName("SelfAdjointEig")); - opBuilder.addInput(a.asOutput()); + opBuilder.addInput(a.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("lower", lower); opBuilder.setAttr("max_iter", maxIter); 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 3e060842de3..903983ba457 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 @@ -46,7 +46,7 @@ public final class Send extends RawOp { @Endpoint(describeByClass = true) public static Send create(Scope scope, Operand tensor, String tensorName) { OperationBuilder opBuilder = scope.env().opBuilder("XlaSend", scope.makeOpName("Send")); - opBuilder.addInput(tensor.asOutput()); + opBuilder.addInput(tensor.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("tensor_name", tensorName); return new Send(opBuilder.build()); 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 d8d879183d2..71a82b50097 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 @@ -45,7 +45,7 @@ public final class Sharding extends RawOp implements Operand @Endpoint(describeByClass = true) public static Sharding create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("XlaSharding", scope.makeOpName("Sharding")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sharding(opBuilder.build()); } @@ -57,7 +57,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 abafbd5e286..a72c4625005 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 @@ -50,7 +50,7 @@ public final class Sort extends RawOp implements Operand { @Endpoint(describeByClass = true) public static Sort create(Scope scope, Operand input) { OperationBuilder opBuilder = scope.env().opBuilder("XlaSort", scope.makeOpName("Sort")); - opBuilder.addInput(input.asOutput()); + opBuilder.addInput(input.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); return new Sort(opBuilder.build()); } @@ -63,7 +63,7 @@ public Output output() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } 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 e3571702151..6d5cb0cab1c 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 @@ -56,7 +56,7 @@ public final class Svd extends RawOp { @Endpoint(describeByClass = true) public static Svd create(Scope scope, Operand a, Long maxIter, Float epsilon, String precisionConfig) { OperationBuilder opBuilder = scope.env().opBuilder("XlaSvd", scope.makeOpName("Svd")); - opBuilder.addInput(a.asOutput()); + opBuilder.addInput(a.asOutput(scope)); opBuilder = scope.applyControlDependencies(opBuilder); opBuilder.setAttr("max_iter", maxIter); opBuilder.setAttr("epsilon", epsilon); diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/AbstractTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/AbstractTensor.java new file mode 100644 index 00000000000..71fd952bd6a --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/AbstractTensor.java @@ -0,0 +1,105 @@ +/* Copyright 2016 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; + +import static org.tensorflow.internal.c_api.global.tensorflow.TF_Dim; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_NumDims; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorByteSize; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorType; + +import java.util.function.Consumer; +import org.bytedeco.javacpp.PointerScope; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.types.family.TType; + +/** + * A basic implementation of a dense tensor. + * + *

Dense tensors are stored as a continuous segment of native memory, mapped in a n-dimensional + * space, normally by delegating all I/O operations to an {@link NdArray} instance. + * + *

Usage of this class is meant to be kept internal. + */ +public abstract class AbstractDenseTensor implements Tensor { + + @Override + @SuppressWarnings("unchecked") + public U expect(DataType dt) { + if (!dt.equals(this.dtype)) { + throw new IllegalArgumentException( + "Cannot cast from tensor of " + dtype + " to tensor of " + dt); + } + return (U)this; + } + + @Override + public void close() { + nativeHandle().close(); + } + + @Override + public DataType dataType() { + return dtype; + } + + @Override + public long numBytes() { + return TF_TensorByteSize(nativeHandle()); + } + + @Override + public ByteDataBuffer rawData() { + return TensorBuffers.toBytes(nativeHandle(), true); + } + + @Override + public String toString() { + return String.format("%s tensor with shape %s", dtype.toString(), shape()); + } + + protected AbstractDenseTensor(TF_Tensor nativeHandle, DataType dtype) { + this.nativeHandle = nativeHandle; + this.dtype = dtype; + nativeHandle.retainReference(); + } + + /** + * @return native handle to this tensor + * @throws IllegalStateException if tensor has been closed + */ + protected TF_Tensor nativeHandle() { + return requireHandle(nativeHandle); + } + + void attachTo(EagerSession session) { + session.attach(nativeHandle()); + nativeHandle.releaseReference(); + } + + protected static TF_Tensor requireHandle(TF_Tensor handle) { + if (handle == null || handle.isNull()) { + throw new IllegalStateException("close() was called on the Tensor"); + } + return handle; + } + + private final TF_Tensor nativeHandle; + private final DataType dtype; +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataType.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataType.java index 24bd0826fa8..70edafa391a 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataType.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataType.java @@ -23,7 +23,7 @@ public final class DataType { @FunctionalInterface - public interface TensorMapper { + public interface TensorInstantiator { /** * Maps tensor memory to a data structure for manipulating elements of this type. @@ -41,10 +41,10 @@ public interface TensorMapper { * @param name readable-name for this type * @param value must match the corresponding TF_* value in the TensorFlow C API. * @param byteSize size of an element of this type, in bytes, -1 if unknown - * @param tensorMapper method for mapping tensor memory to elements of this type + * @param tensorMapper method for instantiating tensor from a native reference */ - public static DataType create(String name, int value, int byteSize, TensorMapper tensorMapper) { - return new DataType<>(name, value, byteSize, tensorMapper); + public static DataType create(String name, int value, int byteSize, TensorInstantiator instantiator) { + return new DataType<>(name, value, byteSize, instantiator); } /** @@ -76,29 +76,29 @@ public String toString() { /** * Returns the numeric code for this datatype, as recognized by the native library (C API) */ - int nativeCode() { + public int nativeCode() { return nativeCode; } /** - * Maps a tensor to a data structure for manipulating elements of this type. + * Instantiate a tensor of this datatype from the provided native handle * - * @param tensor tensor to map - * @return data structure of elements of this type + * @param handle tensor native handle + * @return a tensor of this datatype */ - T map(Tensor tensor) { - return tensorMapper.apply(tensor.nativeHandle(), tensor.shape()); + T instantiateTensor(TF_Tensor handle, Shape shape) { + return tensorInstantiator.apply(handle, shape); } private final int nativeCode; private final int byteSize; private final String name; - private final TensorMapper tensorMapper; + private final TensorInstantiator tensorInstantiator; - private DataType(String name, int nativeCode, int byteSize, TensorMapper tensorMapper) { + private DataType(String name, int nativeCode, int byteSize, TensorInstantiator tensorInstantiator) { this.name = name; this.nativeCode = nativeCode; this.byteSize = byteSize; - this.tensorMapper = tensorMapper; + this.tensorInstantiator = tensorInstantiator; } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataTypes.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataTypes.java index 77c0de0c83f..03d613475b5 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataTypes.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/DataTypes.java @@ -43,8 +43,8 @@ final class DataTypes { * @return data type for this code * @throws IllegalArgumentException if the code matches no registered data type */ - static DataType fromNativeCode(int nativeCode) { - DataType dataType = DATA_TYPE_REGISTRY.get(nativeCode); + static DataType fromNativeCode(int nativeCode) { + DataType dataType = DATA_TYPE_REGISTRY.get(nativeCode); if (dataType == null) { throw new IllegalArgumentException( "DataType " + nativeCode + " is not recognized in Java (version " + TensorFlow.version() + ")"); @@ -52,7 +52,7 @@ static DataType fromNativeCode(int nativeCode) { return dataType; } - private static final Map> DATA_TYPE_REGISTRY = new HashMap<>(); + private static final Map> DATA_TYPE_REGISTRY = new HashMap<>(); static { register(TBool.DTYPE); @@ -68,7 +68,7 @@ static DataType fromNativeCode(int nativeCode) { // TODO (karllessard): Right now this method is private but we might want to expose it // to allow user to register custom data types? - private static void register(DataType dataType) { + private static void register(DataType dataType) { DATA_TYPE_REGISTRY.put(dataType.nativeCode(), dataType); DATA_TYPE_REGISTRY.put(dataType.nativeCode() + 100, dataType); } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperation.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperation.java index 012981ac59c..cc0d93d6bac 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperation.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperation.java @@ -135,7 +135,7 @@ private Tensor resolveTensor(int outputIndex) { // instead. Tensor tensor = resolveTensorHandle(getUnsafeNativeHandle(outputIndex), session); if (!outputTensors.compareAndSet(outputIndex, null, tensor)) { - session.detach(tensor.nativeHandle()); + session.detach(((AbstractTensor)tensor).nativeHandle()); tensor = outputTensors.get(outputIndex); } return tensor; @@ -160,9 +160,11 @@ private static Tensor resolveTensorHandle(TFE_TensorHandle handle, EagerSessi requireTensorHandle(handle); try (PointerScope scope = new PointerScope()) { TF_Status status = TF_Status.newStatus(); - TF_Tensor tensor = TFE_TensorHandleResolve(handle, status).withDeallocator(); + TF_Tensor nativeTensor = TFE_TensorHandleResolve(handle, status).withDeallocator(); status.throwExceptionIfNotOK(); - return Tensor.fromHandle(tensor, session); + Tensor t = Tensors.fromHandle(nativeTensor); + ((AbstractTensor)t).attachTo(session); + return t; } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java index f14795df55a..8bebb554e57 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java @@ -176,7 +176,7 @@ public EagerOperationBuilder setAttr(String name, DataType[] values) { @Override public EagerOperationBuilder setAttr(String name, Tensor value) { - setAttrTensor(opHandle, name, value.nativeHandle()); + setAttrTensor(opHandle, name, ((AbstractTensor)value).nativeHandle()); return this; } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/GraphOperationBuilder.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/GraphOperationBuilder.java index 2ef5c9010a1..e57c997b4b0 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/GraphOperationBuilder.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/GraphOperationBuilder.java @@ -250,7 +250,7 @@ public GraphOperationBuilder setAttr(String name, DataType[] value) { public GraphOperationBuilder setAttr(String name, Tensor value) { Graph.Reference r = graph.ref(); try { - setAttrTensor(unsafeNativeHandle, name, value.nativeHandle()); + setAttrTensor(unsafeNativeHandle, name, ((AbstractTensor)value).nativeHandle()); } finally { r.close(); } @@ -262,7 +262,7 @@ public GraphOperationBuilder setAttr(String name, Tensor[] value) { TF_Tensor[] handles = new TF_Tensor[value.length]; int idx = 0; for (Tensor t : value) { - handles[idx++] = t.nativeHandle(); + handles[idx++] = ((AbstractTensor)t).nativeHandle(); } Graph.Reference r = graph.ref(); try { diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Operand.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Operand.java index fa21f32d4ce..d80ce85dab2 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Operand.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Operand.java @@ -16,6 +16,7 @@ package org.tensorflow; import org.tensorflow.op.Op; +import org.tensorflow.op.Scope; import org.tensorflow.types.family.TType; /** @@ -47,9 +48,26 @@ public interface Operand extends Op { *

Inputs to TensorFlow operations are outputs of another TensorFlow operation. This method is * used to obtain a symbolic handle that represents the computation of the input. * + *

If a valid non-null value is provided as the {@code scope} of this operand, the implementor + * can program additional computations before returning its output. This might be required if, + * for instance, the implementor has not yet been added as a node to the graph.

+ * + * @param scope if non-null, scope that can be used by the operand to produce a new output * @see OperationBuilder#addInput(Output) */ - Output asOutput(); + Output asOutput(Scope scope); + + /** + * Returns the symbolic handle of the tensor. + * + *

Inputs to TensorFlow operations are outputs of another TensorFlow operation. This method is + * used to obtain a symbolic handle that represents the computation of the input. + * + * @see OperationBuilder#addInput(Output) + */ + default Output asOutput() { + return asOutput(null); + } /** * Returns this operand as a tensor. @@ -60,20 +78,21 @@ public interface Operand extends Op { * @return the tensor * @throws IllegalStateException if this is an operand of a graph */ - default Tensor asTensor() { + default T asTensor() { return asOutput().tensor(); } /** - * Returns the data of this operand. + * Returns this operand as a tensor of the given type. * * Only works when running in an eager execution - *

This helper method is equivalent to {@code asTensor().data()} + *

This helper method is equivalent to {@code asOutput().tensor()} * - * @return the tensor data + * @return the tensor * @throws IllegalStateException if this is an operand of a graph + * @throws IllegalArgumentException if the {@code dataType} is incompatible with tensor type */ - default T data() { - return asOutput().tensor().data(); + default U asTensor(DataType dataType) { + return (U)asOutput().tensor().expect(dataType); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Output.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Output.java index a873df8ff4c..55979a5f6da 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Output.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Output.java @@ -18,6 +18,7 @@ import java.util.Objects; import org.bytedeco.javacpp.Pointer; import org.tensorflow.ndarray.Shape; +import org.tensorflow.op.Scope; import org.tensorflow.types.family.TType; /** @@ -80,8 +81,8 @@ public Output expect(DataType dt) { * @see EagerSession */ @SuppressWarnings("unchecked") - public Tensor tensor() { - return (Tensor) operation.tensor(index); + public T tensor() { + return (T)operation.tensor(index); } @Override @@ -90,7 +91,7 @@ public Operation op() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return this; } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Session.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Session.java index 0676ce8ec4e..47a96c1c3f7 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Session.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Session.java @@ -15,7 +15,16 @@ package org.tensorflow; +import static org.tensorflow.Graph.resolveOutputs; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_CloseSession; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_DeleteSession; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_NewSession; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_SessionRun; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_SetConfig; + import com.google.protobuf.InvalidProtocolBufferException; +import java.util.ArrayList; +import java.util.List; import org.bytedeco.javacpp.BytePointer; import org.bytedeco.javacpp.Pointer; import org.bytedeco.javacpp.PointerPointer; @@ -34,12 +43,6 @@ import org.tensorflow.proto.framework.RunMetadata; import org.tensorflow.proto.framework.RunOptions; -import java.util.ArrayList; -import java.util.List; - -import static org.tensorflow.Graph.resolveOutputs; -import static org.tensorflow.internal.c_api.global.tensorflow.*; - /** * Driver for {@link Graph} execution. * @@ -309,7 +312,7 @@ private Run runHelper(boolean wantMetadata) { // validity of the Graph and graphRef ensures that. int idx = 0; for (Tensor t : inputTensors) { - inputTensorHandles[idx++] = t.nativeHandle(); + inputTensorHandles[idx++] = ((AbstractTensor)t).nativeHandle(); } idx = 0; for (Output o : inputs) { @@ -596,7 +599,7 @@ private static RunMetadata run( for (int i = 0; i < noutputs; ++i) { TF_Tensor h = outputValues.get(TF_Tensor.class, i).withDeallocator(); - outputTensors.add(Tensor.fromHandle(h)); + outputTensors.add(Tensors.fromHandle(h)); } try { return runMetadata != null ? RunMetadata.parseFrom(runMetadata.dataAsByteBuffer()) : null; diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensor.java index 62c09926f64..03860c44f05 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensor.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensor.java @@ -15,18 +15,10 @@ package org.tensorflow; -import static org.tensorflow.internal.c_api.global.tensorflow.TF_Dim; -import static org.tensorflow.internal.c_api.global.tensorflow.TF_NumDims; -import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorByteSize; -import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorType; - -import java.util.function.Consumer; -import org.bytedeco.javacpp.PointerScope; -import org.tensorflow.internal.buffer.TensorBuffers; -import org.tensorflow.internal.c_api.TF_Tensor; +import org.checkerframework.checker.units.qual.C; import org.tensorflow.ndarray.NdArray; -import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.ndarray.buffer.DataBuffer; import org.tensorflow.types.family.TType; /** @@ -44,148 +36,7 @@ * } * } */ -public final class Tensor implements AutoCloseable { - - /** - * Allocates a tensor of a given datatype and shape. - * - *

The amount of memory to allocate is derived from the datatype and the shape of the tensor. - * Memory is left uninitialized after this method returns, so it is the responsibility of the - * caller to initialize the tensor data before it is used, via the {@link #data()} accessor. - * For example: - * - * 

{@code
-   * FloatNdArray data = ...
-   * try (Tensor t = Tensor.of(TFloat32.DTYPE, Shape.of(2, 2))) {
-   *   data.copyTo(t.data());
-   *   ...
-   * }
-   * }
- * - * @param the tensor element type - * @param dtype datatype of the tensor - * @param shape shape of the tensor - * @return an allocated but uninitialized tensor - * @throws IllegalStateException if tensor failed to be allocated - */ - public static Tensor of(DataType dtype, Shape shape) { - return of(dtype, shape, shape.size() * dtype.byteSize()); - } - - /** - * Allocates a tensor of a given datatype, shape and size. - * - *

This method is identical to {@link #of(DataType, Shape)}, except that the final size of the - * tensor is explicitly set instead of computing it from the datatype and shape. - * - *

This could be useful for tensor types that stores data but also metadata in the tensor memory, - * like {@link org.tensorflow.types.TString TString}. - * - * @param the tensor element type - * @param dtype datatype of the tensor - * @param shape shape of the tensor - * @param size size, in bytes, of the tensor - * @return an allocated but uninitialized tensor - * @see #of(DataType, Shape) - * @throws IllegalArgumentException if {@code size} is smaller than the minimum space required to - * store the tensor data - * @throws IllegalStateException if tensor failed to be allocated - */ - public static Tensor of(DataType dtype, Shape shape, long size) { - // Minimum requirements for datatypes of variable length cannot be verified in a relevant way so - // we only validate them for fixed length datatypes - if (!dtype.isVariableLength() && shape.size() * dtype.byteSize() > size) { - throw new IllegalArgumentException("Tensor size is not large enough to contain all scalar values"); - } - Tensor t = new Tensor<>(dtype, shape); - TF_Tensor nativeHandle = allocate(t.dtype.nativeCode(), shape.asArray(), size); - try (PointerScope scope = new PointerScope()) { - scope.attach(nativeHandle); - t.tensorHandle = nativeHandle; - t.tensorScope = scope.extend(); - return t; - } - } - - /** - * Allocates and initialize a tensor of a given datatype and shape. - * - *

The amount of memory to allocate is derived from the datatype and the shape of the tensor. - * Tensor data is initialized by calling the {@code dataInitializer}, which receives in argument - * the value returned by {@link #data()} on the allocated tensor. For example: - * - * 

{@code
-   * FloatNdArray data = ...
-   * try (Tensor t = Tensor.of(TFloat32.DTYPE, Shape.of(2, 2), data::copyTo)) {
-   *   ...
-   * }
-   * }
- * - *

If {@code dataInitializer} fails and throws an exception, the allocated tensor will be - * automatically released before rethrowing the same exception. - * - * @param the tensor element type - * @param dtype datatype of the tensor - * @param shape shape of the tensor - * @param dataInitializer method receiving accessor to the allocated tensor data for initialization - * @return an allocated and initialized tensor - * @throws IllegalStateException if tensor failed to be allocated - */ - public static Tensor of(DataType dtype, Shape shape, - Consumer dataInitializer) { - return of(dtype, shape, shape.size() * dtype.byteSize(), dataInitializer); - } - - /** - * Allocates a tensor of a given datatype, shape and size. - * - *

This method is identical to {@link #of(DataType, Shape, Consumer)}, except that the final - * size for the tensor is explicitly set instead of being computed from the datatype and shape. - * - *

This could be useful for tensor types that stores data but also metadata in the tensor memory, - * such as {@link org.tensorflow.types.TString TString}. - * - * @param the tensor element type - * @param dtype datatype of the tensor - * @param shape shape of the tensor - * @param size size, in bytes, of the tensor - * @param dataInitializer method receiving accessor to the allocated tensor data for initialization - * @return an allocated and initialized tensor - * @see #of(DataType, Shape, long, Consumer) - * @throws IllegalArgumentException if {@code size} is smaller than the minimum space required to - * store the tensor data - * @throws IllegalStateException if tensor failed to be allocated - */ - public static Tensor of(DataType dtype, Shape shape, long size, - Consumer dataInitializer) { - Tensor tensor = of(dtype, shape, size); - try { - dataInitializer.accept(tensor.data()); - return tensor; - } catch (Throwable t) { - tensor.close(); - throw t; - } - } - - /** - * Creates a Tensor of any type from the raw data provided by the given buffer. - * - *

Data must have been encoded into {@code data} as per the specification of the TensorFlow C API. - * - * @param the tensor element type - * @param dtype the tensor element data type - * @param shape the tensor shape. - * @param rawData a buffer containing the tensor raw data. - * @throws IllegalArgumentException if {@code rawData} is not large enough to contain the tensor data - * @throws IllegalStateException if tensor failed to be allocated with the given parameters - */ - public static Tensor of(DataType dtype, Shape shape, ByteDataBuffer rawData) { - Tensor t = of(dtype, shape, rawData.size()); - rawData.copyTo(TensorBuffers.toBytes(t.nativeHandle()), rawData.size()); - return t; - } +public interface Tensor extends NdArray, AutoCloseable { /** * Returns this Tensor object with the type {@code Tensor}. This method is useful when given a @@ -195,14 +46,7 @@ public static Tensor of(DataType dtype, Shape shape, Byt * @throws IllegalArgumentException if the actual data type of this object does not match the type * {@code U}. */ - @SuppressWarnings("unchecked") - public Tensor expect(DataType dt) { - if (!dt.equals(this.dtype)) { - throw new IllegalArgumentException( - "Cannot cast from tensor of " + dtype + " to tensor of " + dt); - } - return ((Tensor) this); - } + U expect(DataType dt); /** * Release resources associated with the Tensor. @@ -213,73 +57,13 @@ public Tensor expect(DataType dt) { *

The Tensor object is no longer usable after {@code close} returns. */ @Override - public void close() { - tensorScope.close(); - } + void close(); /** Returns the {@link DataType} of elements stored in the Tensor. */ - public DataType dataType() { - return dtype; - } + DataType dataType(); /** Returns the size, in bytes, of the tensor data. */ - public long numBytes() { - if (numBytes == null) { - numBytes = TF_TensorByteSize(tensorHandle); - } - return numBytes; - } - - /** - * Returns the shape of - * the Tensor, i.e., the sizes of each dimension. - * - * @return shape of this tensor - */ - public Shape shape() { - return shape; - } - - /** - * Returns the data of this tensor. - * - *

This method returns an accessor to the tensor data as an instance of {@code T}, which - * commonly maps this data to an {@link NdArray NdArray}. Input and - * output operations performed on the returned n-dimensional array are applied directly to the - * tensor native memory. For example: - * - * 

{@code
-   * Ops tf = Ops.create();
-   * try (Tensor t = TFloat32.tensorOf(Shape.of(2, 2))) {
-   *   TFloat32 data = t.data();
-   *
-   *   StdArrays.copyTo(data, new float[][] {
-   *     {1.0f, 2.0f},
-   *     {3.0f, 4.0f}
-   *   });
-   *   assertEquals(NdArrays.vectorOf(3.0f, 4.0f), data.getFloat(1));
-   *
-   *   Constant c = tf.constant(t);
-   *   assertEquals(4.0f, c.data().getFloat(1, 1));
-   * }
-   * }
- * - *

Please refer to the documentation of the {@link NdArray NdArray} - * classes for more information on the various techniques to read or write data in an - * n-dimensional space using this data structure. - * - * @return the tensor data mapped to an n-dimensional space - * @throws IllegalStateException if the tensor has been closed - * @see NdArray - */ - public T data() { - if (data == null) { - data = dtype.map(this); - } else { - nativeHandle(); // Checks that the tensor has not been released or will throw - } - return data; - } + long numBytes(); /** * Returns the raw data of this tensor as a buffer of bytes. @@ -291,95 +75,23 @@ public T data() { * @return the tensor raw data mapped to a read-only byte buffer * @throws IllegalStateException if the tensor has been closed */ - public ByteDataBuffer rawData() { - return TensorBuffers.toBytes(nativeHandle(), true); - } + ByteDataBuffer rawData(); - /** Returns a string describing the type and shape of the Tensor. */ @Override - public String toString() { - return String.format("%s tensor with shape %s", dtype.toString(), shape); - } + Tensor set(NdArray src, long... coordinates); - /** - * Create a Tensor object from a handle to the C TF_Tensor object. - * - *

Takes ownership of the handle. - */ - static Tensor fromHandle(TF_Tensor handle) { - Tensor t = new Tensor<>(DataTypes.fromNativeCode(dtype(handle)), Shape.of(shape(handle))); - try (PointerScope scope = new PointerScope()) { - scope.attach(handle); - t.tensorHandle = handle; - t.tensorScope = scope.extend(); - } - return t; - } - - /** - * Create an eager Tensor object from a handle to the C TF_Tensor object. - * - *

Takes ownership of the handle. - */ - static Tensor fromHandle(TF_Tensor handle, EagerSession session) { - Tensor t = fromHandle(handle); - session.attach(handle); - t.tensorScope.detach(handle); - return t; - } - - /** - * @return native handle to this tensor - * @throws IllegalStateException if tensor has been closed - */ - TF_Tensor nativeHandle() { - return requireHandle(tensorHandle); - } - - private PointerScope tensorScope; - private TF_Tensor tensorHandle; - - private static TF_Tensor requireHandle(TF_Tensor handle) { - if (handle == null || handle.isNull()) { - throw new IllegalStateException("close() was called on the Tensor"); - } - return handle; - } + @Override + Tensor setObject(T value, long... coordinates); - private static TF_Tensor allocate(int dtype, long[] shape, long byteSize) { - TF_Tensor t = TF_Tensor.allocateTensor(dtype, shape, byteSize); - if (t == null || t.isNull()) { - throw new IllegalStateException("unable to allocate memory for the Tensor"); - } - return t; - } + @Override + Tensor copyTo(NdArray dst); - private static int dtype(TF_Tensor handle) { - requireHandle(handle); - return TF_TensorType(handle); - } + @Override + Tensor read(DataBuffer dst); - private static long[] shape(TF_Tensor handle) { - requireHandle(handle); - int numDims = TF_NumDims(handle); - long[] dims = new long[numDims]; - for (int i = 0; i < numDims; ++i) { - dims[i] = TF_Dim(handle, i); - } - return dims; - } + @Override + Tensor write(DataBuffer src); +} - private final DataType dtype; - private final Shape shape; - private T data = null; - private Long numBytes = null; - private Tensor(DataType dtype, Shape shape) { - this.dtype = dtype; - this.shape = shape; - } - static { - TensorFlow.init(); - } -} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensors.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensors.java new file mode 100644 index 00000000000..3df1df81ddf --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Tensors.java @@ -0,0 +1,197 @@ +package org.tensorflow; + +import static org.tensorflow.internal.c_api.global.tensorflow.TF_Dim; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_NumDims; +import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorType; + +import java.util.function.Consumer; +import org.bytedeco.javacpp.PointerScope; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.types.family.TType; + +public final class Tensors { + + /** + * Allocates a tensor of a given datatype and shape. + * + *

The amount of memory to allocate is derived from the datatype and the shape of the tensor. + * Memory is left uninitialized after this method returns, so it is the responsibility of the + * caller to initialize the tensor data before it is used, via the {@link #data()} accessor. + * For example: + * + * 

{@code
+   * FloatNdArray data = ...
+   * try (Tensor t = Tensor.of(TFloat32.DTYPE, Shape.of(2, 2))) {
+   *   data.copyTo(t.data());
+   *   ...
+   * }
+   * }
+ * + * @param the tensor element type + * @param dtype datatype of the tensor + * @param shape shape of the tensor + * @return an allocated but uninitialized tensor + * @throws IllegalStateException if tensor failed to be allocated + */ + public static T of(DataType dtype, Shape shape) { + return of(dtype, shape, shape.size() * dtype.byteSize()); + } + + /** + * Allocates a tensor of a given datatype, shape and size. + * + *

This method is identical to {@link #of(DataType, Shape)}, except that the final size of the + * tensor is explicitly set instead of computing it from the datatype and shape. + * + *

This could be useful for tensor types that stores data but also metadata in the tensor memory, + * like {@link org.tensorflow.types.TString TString}. + * + * @param the tensor element type + * @param dtype datatype of the tensor + * @param shape shape of the tensor + * @param size size, in bytes, of the tensor + * @return an allocated but uninitialized tensor + * @see #of(DataType, Shape) + * @throws IllegalArgumentException if {@code size} is smaller than the minimum space required to + * store the tensor data + * @throws IllegalStateException if tensor failed to be allocated + */ + public static T of(DataType dtype, Shape shape, long size) { + return Tensors.allocate(dtype, shape, size); + } + + /** + * Allocates and initialize a tensor of a given datatype and shape. + * + *

The amount of memory to allocate is derived from the datatype and the shape of the tensor. + * Tensor data is initialized by calling the {@code dataInitializer}, which receives in argument + * the value returned by {@link #data()} on the allocated tensor. For example: + * + * 

{@code
+   * FloatNdArray data = ...
+   * try (Tensor t = Tensor.of(TFloat32.DTYPE, Shape.of(2, 2), data::copyTo)) {
+   *   ...
+   * }
+   * }
+ * + *

If {@code dataInitializer} fails and throws an exception, the allocated tensor will be + * automatically released before rethrowing the same exception. + * + * @param the tensor element type + * @param dtype datatype of the tensor + * @param shape shape of the tensor + * @param dataInitializer method receiving accessor to the allocated tensor data for initialization + * @return an allocated and initialized tensor + * @throws IllegalStateException if tensor failed to be allocated + */ + public static T of(DataType dtype, Shape shape, Consumer dataInitializer) { + return of(dtype, shape, shape.size() * dtype.byteSize(), dataInitializer); + } + + /** + * Allocates a tensor of a given datatype, shape and size. + * + *

This method is identical to {@link #of(DataType, Shape, Consumer)}, except that the final + * size for the tensor is explicitly set instead of being computed from the datatype and shape. + * + *

This could be useful for tensor types that stores data but also metadata in the tensor memory, + * such as {@link org.tensorflow.types.TString TString}. + * + * @param the tensor element type + * @param dtype datatype of the tensor + * @param shape shape of the tensor + * @param size size, in bytes, of the tensor + * @param tensorInit method receiving accessor to the allocated tensor data for initialization + * @return an allocated and initialized tensor + * @see #of(DataType, Shape, long, Consumer) + * @throws IllegalArgumentException if {@code size} is smaller than the minimum space required to + * store the tensor data + * @throws IllegalStateException if tensor failed to be allocated + */ + public static T of(DataType dtype, Shape shape, long size, Consumer tensorInit) { + T tensor = of(dtype, shape, size); + try { + tensorInit.accept(tensor); + return tensor; + } catch (Throwable t) { + tensor.close(); + throw t; + } + } + + /** + * Creates a Tensor of any type from the raw data provided by the given buffer. + * + *

Data must have been encoded into {@code data} as per the specification of the TensorFlow C API. + * + * @param the tensor element type + * @param dtype the tensor element data type + * @param shape the tensor shape. + * @param rawData a buffer containing the tensor raw data. + * @throws IllegalArgumentException if {@code rawData} is not large enough to contain the tensor data + * @throws IllegalStateException if tensor failed to be allocated with the given parameters + */ + public static T of(DataType dtype, Shape shape, ByteDataBuffer rawData) { + T tensor = of(dtype, shape, rawData.size()); + rawData.copyTo(TensorBuffers.toBytes(((AbstractTensor)tensor).nativeHandle()), rawData.size()); + return tensor; + } + + static T allocate(DataType dataType, Shape shape, long size) { + // Minimum requirements for datatypes of variable length cannot be verified in a relevant way so + // we only validate them for fixed length datatypes + if (!dataType.isVariableLength() && shape.size() * dataType.byteSize() > size) { + throw new IllegalArgumentException("Tensor size is not large enough to contain all scalar values"); + } + TF_Tensor nativeHandle = allocate(dataType.nativeCode(), shape.asArray(), size); + try (PointerScope scope = new PointerScope()) { + scope.attach(nativeHandle); + return dataType.instantiateTensor(nativeHandle, shape); + } + } + + /** + * Create a Tensor object from a handle to the C TF_Tensor object. + * + *

Takes ownership of the handle. + */ + static Tensor fromHandle(TF_Tensor handle) { + DataType dataType = DataTypes.fromNativeCode(dtype(handle)); + Shape shape = Shape.of(shape(handle)); + return dataType.instantiateTensor(handle, shape); + } + + private static TF_Tensor requireHandle(TF_Tensor handle) { + if (handle == null || handle.isNull()) { + throw new IllegalStateException("close() was called on the Tensor"); + } + return handle; + } + + private static TF_Tensor allocate(int dtype, long[] shape, long byteSize) { + TF_Tensor t = TF_Tensor.allocateTensor(dtype, shape, byteSize); + if (t == null || t.isNull()) { + throw new IllegalStateException("unable to allocate memory for the Tensor"); + } + return t; + } + + private static int dtype(TF_Tensor handle) { + requireHandle(handle); + return TF_TensorType(handle); + } + + private static long[] shape(TF_Tensor handle) { + requireHandle(handle); + int numDims = TF_NumDims(handle); + long[] dims = new long[numDims]; + for (int i = 0; i < numDims; ++i) { + dims[i] = TF_Dim(handle, i); + } + return dims; + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/BooleanTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/BooleanTensorImpl.java new file mode 100644 index 00000000000..9c7c059691d --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/BooleanTensorImpl.java @@ -0,0 +1,143 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.Tensor; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.ndarray.BooleanNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.BooleanDataBuffer; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.BooleanTensor; + +public class BooleanTensorImpl extends AbstractTensor implements BooleanTensor { + + private final BooleanNdArray data; + + public BooleanTensorImpl(TF_Tensor nativeHandle, DataType dataType, Shape shape, + BooleanDataBuffer buffer) { + super(nativeHandle, dataType); + data = NdArrays.wrap(shape, buffer); + } + + @Override + public boolean getBoolean(long... coordinates) { + requireHandle(nativeHandle); + return data.getBoolean(coordinates); + } + + @Override + public BooleanTensor setBoolean(boolean value, long... coordinates) { + requireHandle(nativeHandle); + data.setBoolean(value, coordinates); + return this; + } + + @Override + public BooleanNdArray slice(Index... coordinates) { + requireHandle(nativeHandle); + return data.slice(coordinates); + } + + @Override + public BooleanTensor get(long... coordinates) { + requireHandle(nativeHandle); + data.get(coordinates); + return this; + } + + @Override + public BooleanTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public Boolean getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public BooleanTensor setObject(Boolean value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public NdArraySequence elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public BooleanTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public BooleanTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public BooleanTensor read(BooleanDataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public BooleanTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public BooleanTensor write(BooleanDataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/ByteTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/ByteTensorImpl.java new file mode 100644 index 00000000000..18d993219c6 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/ByteTensorImpl.java @@ -0,0 +1,143 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.Tensor; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.ndarray.ByteNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.ByteTensor; + +public class ByteTensorImpl extends AbstractTensor implements ByteTensor { + + private final ByteNdArray data; + + public ByteTensorImpl(TF_Tensor nativeHandle, DataType dataType, Shape shape, + ByteDataBuffer buffer) { + super(nativeHandle, dataType); + data = NdArrays.wrap(shape, buffer); + } + + @Override + public byte getByte(long... coordinates) { + requireHandle(nativeHandle); + return data.getByte(coordinates); + } + + @Override + public ByteTensor setByte(byte value, long... coordinates) { + requireHandle(nativeHandle); + data.setByte(value, coordinates); + return this; + } + + @Override + public ByteNdArray slice(Index... coordinates) { + requireHandle(nativeHandle); + return data.slice(coordinates); + } + + @Override + public ByteTensor get(long... coordinates) { + requireHandle(nativeHandle); + data.get(coordinates); + return this; + } + + @Override + public ByteTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public Byte getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public ByteTensor setObject(Byte value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public NdArraySequence elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public ByteTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public ByteTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public ByteTensor read(ByteDataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public ByteTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public ByteTensor write(ByteDataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/DoubleTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/DoubleTensorImpl.java new file mode 100644 index 00000000000..7f85d86c372 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/DoubleTensorImpl.java @@ -0,0 +1,143 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.Tensor; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.ndarray.DoubleNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.DoubleDataBuffer; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.DoubleTensor; + +public class DoubleTensorImpl extends AbstractTensor implements DoubleTensor { + + private final DoubleNdArray data; + + public DoubleTensorImpl(TF_Tensor nativeHandle, DataType dataType, Shape shape, + DoubleDataBuffer buffer) { + super(nativeHandle, dataType); + data = NdArrays.wrap(shape, buffer); + } + + @Override + public double getDouble(long... coordinates) { + requireHandle(nativeHandle); + return data.getDouble(coordinates); + } + + @Override + public DoubleTensor setDouble(double value, long... coordinates) { + requireHandle(nativeHandle); + data.setDouble(value, coordinates); + return this; + } + + @Override + public DoubleNdArray slice(Index... coordinates) { + requireHandle(nativeHandle); + return data.slice(coordinates); + } + + @Override + public DoubleTensor get(long... coordinates) { + requireHandle(nativeHandle); + data.get(coordinates); + return this; + } + + @Override + public DoubleTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public Double getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public DoubleTensor setObject(Double value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public NdArraySequence elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public DoubleTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public DoubleTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public DoubleTensor read(DoubleDataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public DoubleTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public DoubleTensor write(DoubleDataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/FloatTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/FloatTensorImpl.java new file mode 100644 index 00000000000..e2d42bba37c --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/FloatTensorImpl.java @@ -0,0 +1,142 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.ndarray.FloatNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.FloatDataBuffer; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.FloatTensor; + +public class FloatTensorImpl extends AbstractTensor implements FloatTensor { + + private final FloatNdArray data; + + public FloatTensorImpl(TF_Tensor nativeHandle, DataType dataType, Shape shape, + FloatDataBuffer buffer) { + super(nativeHandle, dataType); + data = NdArrays.wrap(shape, buffer); + } + + @Override + public float getFloat(long... coordinates) { + requireHandle(nativeHandle); + return data.getFloat(coordinates); + } + + @Override + public FloatTensor setFloat(float value, long... coordinates) { + requireHandle(nativeHandle); + data.setFloat(value, coordinates); + return this; + } + + @Override + public FloatNdArray slice(Index... coordinates) { + requireHandle(nativeHandle); + return data.slice(coordinates); + } + + @Override + public FloatTensor get(long... coordinates) { + requireHandle(nativeHandle); + data.get(coordinates); + return this; + } + + @Override + public FloatTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public Float getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public FloatTensor setObject(Float value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public NdArraySequence elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public FloatTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public FloatTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public FloatTensor read(FloatDataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public FloatTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public FloatTensor write(FloatDataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/IntTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/IntTensorImpl.java new file mode 100644 index 00000000000..bff637e38ab --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/IntTensorImpl.java @@ -0,0 +1,143 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.Tensor; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.ndarray.IntNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.IntDataBuffer; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.IntTensor; + +public class IntTensorImpl extends AbstractTensor implements IntTensor { + + private final IntNdArray data; + + public IntTensorImpl(TF_Tensor nativeHandle, DataType dataType, Shape shape, + IntDataBuffer buffer) { + super(nativeHandle, dataType); + data = NdArrays.wrap(shape, buffer); + } + + @Override + public int getInt(long... coordinates) { + requireHandle(nativeHandle); + return data.getInt(coordinates); + } + + @Override + public IntTensor setInt(int value, long... coordinates) { + requireHandle(nativeHandle); + data.setInt(value, coordinates); + return this; + } + + @Override + public IntNdArray slice(Index... coordinates) { + requireHandle(nativeHandle); + return data.slice(coordinates); + } + + @Override + public IntTensor get(long... coordinates) { + requireHandle(nativeHandle); + data.get(coordinates); + return this; + } + + @Override + public IntTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public Integer getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public IntTensor setObject(Integer value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public NdArraySequence elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public IntTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public IntTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public IntTensor read(IntDataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public IntTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public IntTensor write(IntDataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/LongTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/LongTensorImpl.java new file mode 100644 index 00000000000..8b3436b4e77 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/LongTensorImpl.java @@ -0,0 +1,143 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.Tensor; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.ndarray.LongNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.LongDataBuffer; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.LongTensor; + +public class LongTensorImpl extends AbstractTensor implements LongTensor { + + private final LongNdArray data; + + public LongTensorImpl(TF_Tensor nativeHandle, DataType dataType, Shape shape, + LongDataBuffer buffer) { + super(nativeHandle, dataType); + data = NdArrays.wrap(shape, buffer); + } + + @Override + public long getLong(long... coordinates) { + requireHandle(nativeHandle); + return data.getLong(coordinates); + } + + @Override + public LongTensor setLong(long value, long... coordinates) { + requireHandle(nativeHandle); + data.setLong(value, coordinates); + return this; + } + + @Override + public LongNdArray slice(Index... coordinates) { + requireHandle(nativeHandle); + return data.slice(coordinates); + } + + @Override + public LongTensor get(long... coordinates) { + requireHandle(nativeHandle); + data.get(coordinates); + return this; + } + + @Override + public LongTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public Long getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public LongTensor setObject(Long value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public NdArraySequence elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public LongTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public LongTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public LongTensor read(LongDataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public LongTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public LongTensor write(LongDataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/StringTensorImpl.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/StringTensorImpl.java new file mode 100644 index 00000000000..4a1cd3333e5 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/StringTensorImpl.java @@ -0,0 +1,132 @@ +package org.tensorflow.internal.tensor; + +import org.tensorflow.AbstractTensor; +import org.tensorflow.DataType; +import org.tensorflow.Tensor; +import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.internal.tensor.buffer.ByteSequenceTensorBuffer; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArraySequence; +import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.layout.DataLayout; +import org.tensorflow.ndarray.index.Index; +import org.tensorflow.tensor.StringTensor; + +public class StringTensorImpl extends AbstractTensor implements StringTensor { + + private final ByteSequenceTensorBuffer rawBuffer; + private final NdArray data; + + public StringTensorImpl( + TF_Tensor nativeHandle, + DataType dataType, + Shape shape, + DataLayout, String> layout, + ByteSequenceTensorBuffer buffer + ) { + super(nativeHandle, dataType); + this.rawBuffer = buffer; + data = NdArrays.wrap(shape, layout.applyTo(buffer)); + } + + @Override + public NdArray asBytes() { + requireHandle(nativeHandle); + return NdArrays.wrap(shape(), rawBuffer); + } + + @Override + public NdArraySequence> elements(int dimensionIdx) { + requireHandle(nativeHandle); + return data.elements(dimensionIdx); + } + + @Override + public NdArraySequence> scalars() { + requireHandle(nativeHandle); + return data.scalars(); + } + + @Override + public NdArray slice(Index... indices) { + requireHandle(nativeHandle); + return data.slice(indices); + } + + @Override + public NdArray get(long... coordinates) { + requireHandle(nativeHandle); + return data.get(coordinates); + } + + @Override + public StringTensor set(NdArray src, long... coordinates) { + requireHandle(nativeHandle); + data.set(src, coordinates); + return this; + } + + @Override + public String getObject(long... coordinates) { + requireHandle(nativeHandle); + return data.getObject(coordinates); + } + + @Override + public StringTensor setObject(String value, long... coordinates) { + requireHandle(nativeHandle); + data.setObject(value, coordinates); + return this; + } + + @Override + public StringTensor copyTo(NdArray dst) { + requireHandle(nativeHandle); + data.copyTo(dst); + return this; + } + + @Override + public StringTensor read(DataBuffer dst) { + requireHandle(nativeHandle); + data.read(dst); + return this; + } + + @Override + public StringTensor write(DataBuffer src) { + requireHandle(nativeHandle); + data.write(src); + return this; + } + + @Override + public Shape shape() { + requireHandle(nativeHandle); + return data.shape(); + } + + @Override + public int rank() { + requireHandle(nativeHandle); + return data.rank(); + } + + @Override + public long size() { + requireHandle(nativeHandle); + return data.size(); + } + + @Override + public boolean equals(Object obj) { + requireHandle(nativeHandle); + return data.equals(obj); + } + + protected ByteSequenceTensorBuffer rawBuffer() { + return rawBuffer; + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/StringTensorBuffer.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/ByteSequenceTensorBuffer.java similarity index 90% rename from tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/StringTensorBuffer.java rename to tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/ByteSequenceTensorBuffer.java index 24a8f54fedc..be7701153e9 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/StringTensorBuffer.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/ByteSequenceTensorBuffer.java @@ -15,7 +15,7 @@ * ======================================================================= */ -package org.tensorflow.internal.buffer; +package org.tensorflow.internal.tensor.buffer; import java.nio.ReadOnlyBufferException; import java.util.function.Function; @@ -50,7 +50,7 @@ *

After its data has been initialized, the buffer is read-only as it is not possible to change * safely a value without reinitializing the whole data. */ -public class StringTensorBuffer extends AbstractDataBuffer { +public class ByteSequenceTensorBuffer extends AbstractDataBuffer { /** * Computes how many bytes are required to store the given data in a string buffer. @@ -66,7 +66,7 @@ public static long computeSize(NdArray data, Function getBytes // reserve space to store length and data of each values for (NdArray scalar : data.scalars()) { byte[] elementBytes = getBytes.apply(scalar.getObject()); - size += elementBytes.length + StringTensorBuffer.varintLength(elementBytes.length); + size += elementBytes.length + ByteSequenceTensorBuffer.varintLength(elementBytes.length); } return size; } @@ -128,8 +128,8 @@ public boolean isReadOnly() { @Override public DataBuffer copyTo(DataBuffer dst, long size) { - if (size == size() && dst instanceof StringTensorBuffer) { - StringTensorBuffer tensorDst = (StringTensorBuffer) dst; + if (size == size() && dst instanceof ByteSequenceTensorBuffer) { + ByteSequenceTensorBuffer tensorDst = (ByteSequenceTensorBuffer) dst; if (offsets.size() != size || data.size() != size) { throw new IllegalArgumentException( "Cannot copy string tensor data to another tensor of a different size"); @@ -144,20 +144,20 @@ public DataBuffer copyTo(DataBuffer dst, long size) { @Override public DataBuffer offset(long index) { - return new StringTensorBuffer(offsets.offset(index), data); + return new ByteSequenceTensorBuffer(offsets.offset(index), data); } @Override public DataBuffer narrow(long size) { - return new StringTensorBuffer(offsets.narrow(size), data); + return new ByteSequenceTensorBuffer(offsets.narrow(size), data); } @Override public DataBuffer slice(long index, long size) { - return new StringTensorBuffer(offsets.slice(index, size), data); + return new ByteSequenceTensorBuffer(offsets.slice(index, size), data); } - StringTensorBuffer(LongDataBuffer offsets, ByteDataBuffer data) { + ByteSequenceTensorBuffer(LongDataBuffer offsets, ByteDataBuffer data) { this.offsets = offsets; this.data = data; } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/TensorBuffers.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/TensorBuffers.java similarity index 97% rename from tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/TensorBuffers.java rename to tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/TensorBuffers.java index f29396dd321..f06de6631c1 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/TensorBuffers.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/TensorBuffers.java @@ -15,7 +15,7 @@ * ======================================================================= */ -package org.tensorflow.internal.buffer; +package org.tensorflow.internal.tensor.buffer; import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorByteSize; import static org.tensorflow.internal.c_api.global.tensorflow.TF_TensorData; @@ -156,7 +156,7 @@ public static BooleanDataBuffer toBooleans(TF_Tensor nativeTensor) { * @param nativeTensor native reference to the tensor * @return a string buffer */ - public static StringTensorBuffer toStrings(TF_Tensor nativeTensor, long numElements) { + public static ByteSequenceTensorBuffer toStrings(TF_Tensor nativeTensor, long numElements) { Pointer tensorMemory = tensorMemory(nativeTensor); if (TensorRawDataBufferFactory.canBeUsed()) { return TensorRawDataBufferFactory.mapTensorToStrings(tensorMemory, numElements); @@ -173,7 +173,7 @@ public static StringTensorBuffer toStrings(TF_Tensor nativeTensor, long numEleme dataBuffer.position((int)numElements * Long.BYTES); ByteDataBuffer data = DataBuffers.of(dataBuffer.slice()); - return new StringTensorBuffer(offsets, data); + return new ByteSequenceTensorBuffer(offsets, data); } private static Pointer tensorMemory(TF_Tensor nativeTensor) { diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/TensorRawDataBufferFactory.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/TensorRawDataBufferFactory.java similarity index 93% rename from tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/TensorRawDataBufferFactory.java rename to tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/TensorRawDataBufferFactory.java index 1cfb1c9ab9a..3a35edf0485 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/TensorRawDataBufferFactory.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/tensor/buffer/TensorRawDataBufferFactory.java @@ -15,7 +15,7 @@ * ======================================================================= */ -package org.tensorflow.internal.buffer; +package org.tensorflow.internal.tensor.buffer; import org.bytedeco.javacpp.Pointer; import org.tensorflow.ndarray.buffer.BooleanDataBuffer; @@ -57,13 +57,13 @@ static BooleanDataBuffer mapTensorToBooleans(Pointer tensorMemory) { return mapNativeBooleans(tensorMemory.address(), tensorMemory.capacity(), false); } - static StringTensorBuffer mapTensorToStrings(Pointer tensorMemory, long numElements) { + static ByteSequenceTensorBuffer mapTensorToStrings(Pointer tensorMemory, long numElements) { long offsetByteSize = numElements * Long.BYTES; LongDataBuffer offsets = mapNativeLongs(tensorMemory.address(), offsetByteSize, false); ByteDataBuffer data = mapNativeBytes( tensorMemory.address() + offsetByteSize, tensorMemory.capacity() - offsetByteSize, false); - return new StringTensorBuffer(offsets, data); + return new ByteSequenceTensorBuffer(offsets, data); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/Operands.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/Operands.java index ac48da80326..5496eaa3d15 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/Operands.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/Operands.java @@ -30,13 +30,18 @@ public final class Operands { *

Operation wrappers need to convert back a list of inputs into an array of outputs in order * to build an operation, see {@link OperationBuilder#addInputList(Output[])}. * + *

If a valid non-null value is provided as the {@code scope} of this operand, the implementor + * can program additional computations before returning its output. This might be required if, + * for instance, the implementor has not yet been added as a node to the graph.

+ * + * @param scope if non-null, scope that can be used an operand to produce a new output * @param inputs an iteration of input operands * @return an array of outputs */ - public static Output[] asOutputs(Iterable> inputs) { + public static Output[] asOutputs(Scope scope, Iterable> inputs) { List> outputList = new ArrayList<>(); for (Operand input : inputs) { - outputList.add(input.asOutput()); + outputList.add(input.asOutput(scope)); } return outputList.toArray(new Output[outputList.size()]); } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Constant.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Constant.java index 6c214cc6819..e7ce5158ff0 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Constant.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Constant.java @@ -21,18 +21,7 @@ import org.tensorflow.Operation; import org.tensorflow.Output; import org.tensorflow.Tensor; -import org.tensorflow.op.RawOp; -import org.tensorflow.op.Scope; -import org.tensorflow.op.annotation.Endpoint; -import org.tensorflow.op.annotation.Operator; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.BooleanDataBuffer; -import org.tensorflow.ndarray.buffer.ByteDataBuffer; -import org.tensorflow.ndarray.buffer.DataBuffer; -import org.tensorflow.ndarray.buffer.DoubleDataBuffer; -import org.tensorflow.ndarray.buffer.FloatDataBuffer; -import org.tensorflow.ndarray.buffer.IntDataBuffer; -import org.tensorflow.ndarray.buffer.LongDataBuffer; +import org.tensorflow.Tensors; import org.tensorflow.ndarray.BooleanNdArray; import org.tensorflow.ndarray.ByteNdArray; import org.tensorflow.ndarray.DoubleNdArray; @@ -41,7 +30,20 @@ import org.tensorflow.ndarray.LongNdArray; import org.tensorflow.ndarray.NdArray; import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; +import org.tensorflow.ndarray.buffer.BooleanDataBuffer; +import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.DoubleDataBuffer; +import org.tensorflow.ndarray.buffer.FloatDataBuffer; +import org.tensorflow.ndarray.buffer.IntDataBuffer; +import org.tensorflow.ndarray.buffer.LongDataBuffer; +import org.tensorflow.op.RawOp; +import org.tensorflow.op.Scope; +import org.tensorflow.op.annotation.Endpoint; +import org.tensorflow.op.annotation.Operator; +import org.tensorflow.tensor.BooleanTensor; import org.tensorflow.types.TBool; import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; @@ -77,7 +79,7 @@ public final class Constant extends RawOp implements Operand */ @Endpoint public static Constant scalarOf(Scope scope, int data) { - try (Tensor value = TInt32.scalarOf(data)) { + try (TInt32 value = TInt32.scalarOf(data)) { return create(scope, value); } } @@ -92,7 +94,7 @@ public static Constant scalarOf(Scope scope, int data) { */ @Endpoint public static Constant vectorOf(Scope scope, int[] data) { - try (Tensor value = TInt32.vectorOf(data)) { + try (TInt32 value = TInt32.vectorOf(data)) { return create(scope, value); } } @@ -122,7 +124,7 @@ public static Constant arrayOf(Scope scope, int... data) { */ @Endpoint public static Constant tensorOf(Scope scope, int[][] data) { - try (Tensor value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt32 value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -138,7 +140,7 @@ public static Constant tensorOf(Scope scope, int[][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, int[][][] data) { - try (Tensor value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt32 value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -154,7 +156,7 @@ public static Constant tensorOf(Scope scope, int[][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, int[][][][] data) { - try (Tensor value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt32 value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -170,7 +172,7 @@ public static Constant tensorOf(Scope scope, int[][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, int[][][][][] data) { - try (Tensor value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt32 value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -186,7 +188,7 @@ public static Constant tensorOf(Scope scope, int[][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, int[][][][][][] data) { - try (Tensor value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt32 value = TInt32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -201,7 +203,7 @@ public static Constant tensorOf(Scope scope, int[][][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, IntNdArray data) { - try (Tensor value = TInt32.tensorOf(data)) { + try (TInt32 value = TInt32.tensorOf(data)) { return create(scope, value); } } @@ -217,7 +219,7 @@ public static Constant tensorOf(Scope scope, IntNdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Shape shape, IntDataBuffer data) { - try (Tensor value = TInt32.tensorOf(shape, data)) { + try (TInt32 value = TInt32.tensorOf(shape, data)) { return create(scope, value); } } @@ -231,7 +233,7 @@ public static Constant tensorOf(Scope scope, Shape shape, IntDataBuffer */ @Endpoint public static Constant scalarOf(Scope scope, float data) { - try (Tensor value = TFloat32.scalarOf(data)) { + try (TFloat32 value = TFloat32.scalarOf(data)) { return create(scope, value); } } @@ -246,7 +248,7 @@ public static Constant scalarOf(Scope scope, float data) { */ @Endpoint public static Constant vectorOf(Scope scope, float[] data) { - try (Tensor value = TFloat32.vectorOf(data)) { + try (TFloat32 value = TFloat32.vectorOf(data)) { return create(scope, value); } } @@ -276,7 +278,7 @@ public static Constant arrayOf(Scope scope, float... data) { */ @Endpoint public static Constant tensorOf(Scope scope, float[][] data) { - try (Tensor value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat32 value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -292,7 +294,7 @@ public static Constant tensorOf(Scope scope, float[][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, float[][][] data) { - try (Tensor value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat32 value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -308,7 +310,7 @@ public static Constant tensorOf(Scope scope, float[][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, float[][][][] data) { - try (Tensor value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat32 value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -324,7 +326,7 @@ public static Constant tensorOf(Scope scope, float[][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, float[][][][][] data) { - try (Tensor value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat32 value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -340,7 +342,7 @@ public static Constant tensorOf(Scope scope, float[][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, float[][][][][][] data) { - try (Tensor value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat32 value = TFloat32.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -355,7 +357,7 @@ public static Constant tensorOf(Scope scope, float[][][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, FloatNdArray data) { - try (Tensor value = TFloat32.tensorOf(data)) { + try (TFloat32 value = TFloat32.tensorOf(data)) { return create(scope, value); } } @@ -371,7 +373,7 @@ public static Constant tensorOf(Scope scope, FloatNdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Shape shape, FloatDataBuffer data) { - try (Tensor value = TFloat32.tensorOf(shape, data)) { + try (TFloat32 value = TFloat32.tensorOf(shape, data)) { return create(scope, value); } } @@ -385,7 +387,7 @@ public static Constant tensorOf(Scope scope, Shape shape, FloatDataBuf */ @Endpoint public static Constant scalarOf(Scope scope, double data) { - try (Tensor value = TFloat64.scalarOf(data)) { + try (TFloat64 value = TFloat64.scalarOf(data)) { return create(scope, value); } } @@ -400,7 +402,7 @@ public static Constant scalarOf(Scope scope, double data) { */ @Endpoint public static Constant vectorOf(Scope scope, double[] data) { - try (Tensor value = TFloat64.vectorOf(data)) { + try (TFloat64 value = TFloat64.vectorOf(data)) { return create(scope, value); } } @@ -430,7 +432,7 @@ public static Constant arrayOf(Scope scope, double... data) { */ @Endpoint public static Constant tensorOf(Scope scope, double[][] data) { - try (Tensor value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat64 value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -446,7 +448,7 @@ public static Constant tensorOf(Scope scope, double[][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, double[][][] data) { - try (Tensor value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat64 value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -462,7 +464,7 @@ public static Constant tensorOf(Scope scope, double[][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, double[][][][] data) { - try (Tensor value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat64 value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -478,7 +480,7 @@ public static Constant tensorOf(Scope scope, double[][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, double[][][][][] data) { - try (Tensor value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat64 value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -494,7 +496,7 @@ public static Constant tensorOf(Scope scope, double[][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, double[][][][][][] data) { - try (Tensor value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( + try (TFloat64 value = TFloat64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo( data, t))) { return create(scope, value); } @@ -509,7 +511,7 @@ public static Constant tensorOf(Scope scope, double[][][][][][] data) */ @Endpoint public static Constant tensorOf(Scope scope, DoubleNdArray data) { - try (Tensor value = TFloat64.tensorOf(data)) { + try (TFloat64 value = TFloat64.tensorOf(data)) { return create(scope, value); } } @@ -525,7 +527,7 @@ public static Constant tensorOf(Scope scope, DoubleNdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Shape shape, DoubleDataBuffer data) { - try (Tensor value = TFloat64.tensorOf(shape, data)) { + try (TFloat64 value = TFloat64.tensorOf(shape, data)) { return create(scope, value); } } @@ -539,7 +541,7 @@ public static Constant tensorOf(Scope scope, Shape shape, DoubleDataBu */ @Endpoint public static Constant scalarOf(Scope scope, long data) { - try (Tensor value = TInt64.scalarOf(data)) { + try (TInt64 value = TInt64.scalarOf(data)) { return create(scope, value); } } @@ -554,7 +556,7 @@ public static Constant scalarOf(Scope scope, long data) { */ @Endpoint public static Constant vectorOf(Scope scope, long[] data) { - try (Tensor value = TInt64.vectorOf(data)) { + try (TInt64 value = TInt64.vectorOf(data)) { return create(scope, value); } } @@ -569,7 +571,7 @@ public static Constant vectorOf(Scope scope, long[] data) { */ @Endpoint public static Constant tensorOf(Scope scope, long[][] data) { - try (Tensor value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt64 value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -600,7 +602,7 @@ public static Constant arrayOf(Scope scope, long... data) { */ @Endpoint public static Constant tensorOf(Scope scope, long[][][] data) { - try (Tensor value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt64 value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -616,7 +618,7 @@ public static Constant tensorOf(Scope scope, long[][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, long[][][][] data) { - try (Tensor value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt64 value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -632,7 +634,7 @@ public static Constant tensorOf(Scope scope, long[][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, long[][][][][] data) { - try (Tensor value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt64 value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -648,7 +650,7 @@ public static Constant tensorOf(Scope scope, long[][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, long[][][][][][] data) { - try (Tensor value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TInt64 value = TInt64.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -663,7 +665,7 @@ public static Constant tensorOf(Scope scope, long[][][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, LongNdArray data) { - try (Tensor value = TInt64.tensorOf(data)) { + try (TInt64 value = TInt64.tensorOf(data)) { return create(scope, value); } } @@ -679,7 +681,7 @@ public static Constant tensorOf(Scope scope, LongNdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Shape shape, LongDataBuffer data) { - try (Tensor value = TInt64.tensorOf(shape, data)) { + try (TInt64 value = TInt64.tensorOf(shape, data)) { return create(scope, value); } } @@ -693,7 +695,7 @@ public static Constant tensorOf(Scope scope, Shape shape, LongDataBuffer */ @Endpoint public static Constant scalarOf(Scope scope, boolean data) { - try (Tensor value = TBool.scalarOf(data)) { + try (TBool value = TBool.scalarOf(data)) { return create(scope, value); } } @@ -708,7 +710,7 @@ public static Constant scalarOf(Scope scope, boolean data) { */ @Endpoint public static Constant vectorOf(Scope scope, boolean[] data) { - try (Tensor value = TBool.vectorOf(data)) { + try (TBool value = TBool.vectorOf(data)) { return create(scope, value); } } @@ -738,7 +740,7 @@ public static Constant arrayOf(Scope scope, boolean... data) { */ @Endpoint public static Constant tensorOf(Scope scope, boolean[][] data) { - try (Tensor value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TBool value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -754,7 +756,7 @@ public static Constant tensorOf(Scope scope, boolean[][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, boolean[][][] data) { - try (Tensor value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TBool value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -770,7 +772,7 @@ public static Constant tensorOf(Scope scope, boolean[][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, boolean[][][][] data) { - try (Tensor value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TBool value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -786,7 +788,7 @@ public static Constant tensorOf(Scope scope, boolean[][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, boolean[][][][][] data) { - try (Tensor value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TBool value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -802,7 +804,7 @@ public static Constant tensorOf(Scope scope, boolean[][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, boolean[][][][][][] data) { - try (Tensor value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, + try (TBool value = TBool.tensorOf(StdArrays.shapeOf(data), t -> StdArrays.copyTo(data, t))) { return create(scope, value); } @@ -817,7 +819,7 @@ public static Constant tensorOf(Scope scope, boolean[][][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, BooleanNdArray data) { - try (Tensor value = TBool.tensorOf(data)) { + try (TBool value = TBool.tensorOf(data)) { return create(scope, value); } } @@ -833,7 +835,7 @@ public static Constant tensorOf(Scope scope, BooleanNdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Shape shape, BooleanDataBuffer data) { - try (Tensor value = TBool.tensorOf(shape, data)) { + try (TBool value = TBool.tensorOf(shape, data)) { return create(scope, value); } } @@ -847,7 +849,7 @@ public static Constant tensorOf(Scope scope, Shape shape, BooleanDataBuff */ @Endpoint public static Constant scalarOf(Scope scope, byte data) { - try (Tensor value = TUint8.scalarOf(data)) { + try (TUint8 value = TUint8.scalarOf(data)) { return create(scope, value); } } @@ -862,7 +864,7 @@ public static Constant scalarOf(Scope scope, byte data) { */ @Endpoint public static Constant vectorOf(Scope scope, byte[] data) { - try (Tensor value = TUint8.vectorOf(data)) { + try (TUint8 value = TUint8.vectorOf(data)) { return create(scope, value); } } @@ -892,7 +894,7 @@ public static Constant arrayOf(Scope scope, byte... data) { */ @Endpoint public static Constant tensorOf(Scope scope, byte[][] data) { - try (Tensor value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, + try (TUint8 value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, d))) { return create(scope, value); } @@ -908,7 +910,7 @@ public static Constant tensorOf(Scope scope, byte[][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, byte[][][] data) { - try (Tensor value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, + try (TUint8 value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, d))) { return create(scope, value); } @@ -924,7 +926,7 @@ public static Constant tensorOf(Scope scope, byte[][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, byte[][][][] data) { - try (Tensor value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, + try (TUint8 value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, d))) { return create(scope, value); } @@ -940,7 +942,7 @@ public static Constant tensorOf(Scope scope, byte[][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, byte[][][][][] data) { - try (Tensor value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, + try (TUint8 value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, d))) { return create(scope, value); } @@ -956,7 +958,7 @@ public static Constant tensorOf(Scope scope, byte[][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, byte[][][][][][] data) { - try (Tensor value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, + try (TUint8 value = TUint8.tensorOf(StdArrays.shapeOf(data), d -> StdArrays.copyTo(data, d))) { return create(scope, value); } @@ -971,7 +973,7 @@ public static Constant tensorOf(Scope scope, byte[][][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, ByteNdArray data) { - try (Tensor value = TUint8.tensorOf(data)) { + try (TUint8 value = TUint8.tensorOf(data)) { return create(scope, value); } } @@ -987,7 +989,7 @@ public static Constant tensorOf(Scope scope, ByteNdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Shape shape, ByteDataBuffer data) { - try (Tensor value = TUint8.tensorOf(shape, data)) { + try (TUint8 value = TUint8.tensorOf(shape, data)) { return create(scope, value); } } @@ -1006,7 +1008,7 @@ public static Constant tensorOf(Scope scope, Shape shape, ByteDataBuffer @Endpoint public static Constant tensorOf(Scope scope, DataType type, Shape shape, ByteDataBuffer data) { - try (Tensor value = Tensor.of(type, shape, data)) { + try (T value = Tensors.of(type, shape, data)) { return create(scope, value); } } @@ -1020,7 +1022,7 @@ public static Constant tensorOf(Scope scope, DataType ty */ @Endpoint public static Constant scalarOf(Scope scope, String data) { - try (Tensor value = TString.scalarOf(data)) { + try (TString value = TString.scalarOf(data)) { return create(scope, value); } } @@ -1035,7 +1037,7 @@ public static Constant scalarOf(Scope scope, String data) { */ @Endpoint public static Constant scalarOf(Scope scope, Charset charset, String data) { - try (Tensor value = TString.tensorOf(charset, NdArrays.scalarOfObject(data))) { + try (TString value = TString.tensorOf(charset, NdArrays.scalarOfObject(data))) { return create(scope, value); } } @@ -1049,7 +1051,7 @@ public static Constant scalarOf(Scope scope, Charset charset, String da */ public static Constant vectorOf(Scope scope, String[] data) { NdArray src = NdArrays.vectorOfObjects(data); - try (Tensor value = TString.tensorOf(src)) { + try (TString value = TString.tensorOf(src)) { return create(scope, value); } } @@ -1065,7 +1067,7 @@ public static Constant vectorOf(Scope scope, String[] data) { */ @Endpoint public static Constant vectorOf(Scope scope, Charset charset, String[] data) { - try (Tensor value = TString.tensorOf(charset, NdArrays.vectorOfObjects(data))) { + try (TString value = TString.tensorOf(charset, NdArrays.vectorOfObjects(data))) { return Constant.create(scope, value); } } @@ -1112,7 +1114,7 @@ public static Constant arrayOf(Scope scope, Charset charset, String... public static Constant tensorOf(Scope scope, String[][] data) { NdArray src = NdArrays.ofObjects(String.class, StdArrays.shapeOf(data)); StdArrays.copyTo(data, src); - try (Tensor value = TString.tensorOf(src)) { + try (TString value = TString.tensorOf(src)) { return create(scope, value); } } @@ -1127,7 +1129,7 @@ public static Constant tensorOf(Scope scope, String[][] data) { public static Constant tensorOf(Scope scope, String[][][] data) { NdArray src = NdArrays.ofObjects(String.class, StdArrays.shapeOf(data)); StdArrays.copyTo(data, src); - try (Tensor value = TString.tensorOf(src)) { + try (TString value = TString.tensorOf(src)) { return create(scope, value); } } @@ -1142,7 +1144,7 @@ public static Constant tensorOf(Scope scope, String[][][] data) { public static Constant tensorOf(Scope scope, String[][][][] data) { NdArray src = NdArrays.ofObjects(String.class, StdArrays.shapeOf(data)); StdArrays.copyTo(data, src); - try (Tensor value = TString.tensorOf(src)) { + try (TString value = TString.tensorOf(src)) { return create(scope, value); } } @@ -1157,7 +1159,7 @@ public static Constant tensorOf(Scope scope, String[][][][] data) { public static Constant tensorOf(Scope scope, String[][][][][] data) { NdArray src = NdArrays.ofObjects(String.class, StdArrays.shapeOf(data)); StdArrays.copyTo(data, src); - try (Tensor value = TString.tensorOf(src)) { + try (TString value = TString.tensorOf(src)) { return create(scope, value); } } @@ -1172,7 +1174,7 @@ public static Constant tensorOf(Scope scope, String[][][][][] data) { public static Constant tensorOf(Scope scope, String[][][][][][] data) { NdArray src = NdArrays.ofObjects(String.class, StdArrays.shapeOf(data)); StdArrays.copyTo(data, src); - try (Tensor value = TString.tensorOf(src)) { + try (TString value = TString.tensorOf(src)) { return create(scope, value); } } @@ -1187,7 +1189,7 @@ public static Constant tensorOf(Scope scope, String[][][][][][] data) { */ @Endpoint public static Constant tensorOf(Scope scope, NdArray data) { - try (Tensor value = TString.tensorOf(data)) { + try (TString value = TString.tensorOf(data)) { return create(scope, value); } } @@ -1203,7 +1205,7 @@ public static Constant tensorOf(Scope scope, NdArray data) { */ @Endpoint public static Constant tensorOf(Scope scope, Charset charset, NdArray data) { - try (Tensor value = TString.tensorOf(charset, data)) { + try (TString value = TString.tensorOf(charset, data)) { return create(scope, value); } } @@ -1220,7 +1222,7 @@ public static Constant tensorOf(Scope scope, Charset charset, NdArray tensorOf(Scope scope, Shape shape, DataBuffer data) { - try (Tensor value = TString.tensorOf(shape, data)) { + try (TString value = TString.tensorOf(shape, data)) { return create(scope, value); } } @@ -1238,7 +1240,7 @@ public static Constant tensorOf(Scope scope, Shape shape, DataBuffer tensorOf(Scope scope, Charset charset, Shape shape, DataBuffer data) { - try (Tensor value = TString.tensorOf(charset, shape, data)) { + try (TString value = TString.tensorOf(charset, shape, data)) { return create(scope, value); } } @@ -1263,8 +1265,8 @@ public static Constant tensorOf(Scope scope, Shape shape) { * @param tensor a Tensor holding the constant value * @return a constant of the same data type as `tensor` */ - @Endpoint - public static Constant create(Scope scope, Tensor tensor) { + @Endpoint(name = "capture") + public static Constant create(Scope scope, T tensor) { return new Constant<>( scope .env() @@ -1275,7 +1277,7 @@ public static Constant create(Scope scope, Tensor tensor } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return output; } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Gradients.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Gradients.java index 2827276c32c..bda5f97cd96 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Gradients.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Gradients.java @@ -22,7 +22,7 @@ import org.tensorflow.Graph; import org.tensorflow.Operand; import org.tensorflow.Output; -import org.tensorflow.op.Op; +import org.tensorflow.Tensor; import org.tensorflow.op.Operands; import org.tensorflow.op.Scope; import org.tensorflow.op.annotation.Endpoint; @@ -97,13 +97,15 @@ public static Gradients create( if (options != null) { for (Options opts : options) { if (opts.dx != null) { - dx = Operands.asOutputs(opts.dx); + dx = Operands.asOutputs(scope, opts.dx); } } } - Output[] dy = - graph.addGradients( - scope.makeOpName("Gradients"), Operands.asOutputs(y), Operands.asOutputs(x), dx); + Output[] dy = graph.addGradients( + scope.makeOpName("Gradients"), + Operands.asOutputs(scope, y), + Operands.asOutputs(scope, x), dx + ); return new Gradients(Arrays.asList(dy)); } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Shapes.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Shapes.java index 613cb729341..a2dc0cc6b5d 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Shapes.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Shapes.java @@ -15,16 +15,14 @@ package org.tensorflow.op.core; import java.util.Arrays; - import org.tensorflow.DataType; import org.tensorflow.Operand; +import org.tensorflow.Tensor; import org.tensorflow.op.Scope; import org.tensorflow.op.annotation.Endpoint; import org.tensorflow.op.annotation.Operator; - -import org.tensorflow.op.math.FloorMod; - import org.tensorflow.op.dtypes.Cast; +import org.tensorflow.op.math.FloorMod; import org.tensorflow.op.math.NotEqual; import org.tensorflow.op.math.Sub; import org.tensorflow.types.TBool; diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java index 4aad417b117..db8fb8b9671 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java @@ -68,7 +68,7 @@ public Operation op() { } @Override - public Output asOutput() { + public Output asOutput(Scope scope) { return fill.asOutput(); } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/BooleanTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/BooleanTensor.java new file mode 100644 index 00000000000..106e18de8f6 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/BooleanTensor.java @@ -0,0 +1,37 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.BooleanNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.BooleanDataBuffer; +import org.tensorflow.ndarray.buffer.DataBuffer; + +/** + * A {@link Tensor} of booleans. + */ +public interface BooleanTensor extends BooleanNdArray, Tensor { + + @Override + BooleanTensor setBoolean(boolean value, long... coordinates); + + @Override + BooleanTensor set(NdArray src, long... coordinates); + + @Override + BooleanTensor setObject(Boolean value, long... coordinates); + + @Override + BooleanTensor copyTo(NdArray dst); + + @Override + BooleanTensor read(DataBuffer dst); + + @Override + BooleanTensor read(BooleanDataBuffer dst); + + @Override + BooleanTensor write(DataBuffer src); + + @Override + BooleanTensor write(BooleanDataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/ByteTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/ByteTensor.java new file mode 100644 index 00000000000..16b7825422d --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/ByteTensor.java @@ -0,0 +1,37 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.ByteNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.ndarray.buffer.DataBuffer; + +/** + * A {@link Tensor} of bytes. + */ +public interface ByteTensor extends ByteNdArray, Tensor { + + @Override + ByteTensor setByte(byte value, long... coordinates); + + @Override + ByteTensor set(NdArray src, long... coordinates); + + @Override + ByteTensor setObject(Byte value, long... coordinates); + + @Override + ByteTensor copyTo(NdArray dst); + + @Override + ByteTensor read(DataBuffer dst); + + @Override + ByteTensor read(ByteDataBuffer dst); + + @Override + ByteTensor write(DataBuffer src); + + @Override + ByteTensor write(ByteDataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/DoubleTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/DoubleTensor.java new file mode 100644 index 00000000000..5f6036fa08f --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/DoubleTensor.java @@ -0,0 +1,37 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.DoubleNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.DoubleDataBuffer; + +/** + * A {@link Tensor} of doubles. + */ +public interface DoubleTensor extends DoubleNdArray, Tensor { + + @Override + DoubleTensor setDouble(double value, long... coordinates); + + @Override + DoubleTensor set(NdArray src, long... coordinates); + + @Override + DoubleTensor setObject(Double value, long... coordinates); + + @Override + DoubleTensor copyTo(NdArray dst); + + @Override + DoubleTensor read(DataBuffer dst); + + @Override + DoubleTensor read(DoubleDataBuffer dst); + + @Override + DoubleTensor write(DataBuffer src); + + @Override + DoubleTensor write(DoubleDataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/FloatTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/FloatTensor.java new file mode 100644 index 00000000000..c4222d8c1d6 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/FloatTensor.java @@ -0,0 +1,37 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.FloatNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.FloatDataBuffer; + +/** + * A {@link Tensor} of floats. + */ +public interface FloatTensor extends FloatNdArray, Tensor { + + @Override + FloatTensor setFloat(float value, long... coordinates); + + @Override + FloatTensor set(NdArray src, long... coordinates); + + @Override + FloatTensor setObject(Float value, long... coordinates); + + @Override + FloatTensor copyTo(NdArray dst); + + @Override + FloatTensor read(DataBuffer dst); + + @Override + FloatTensor read(FloatDataBuffer dst); + + @Override + FloatTensor write(DataBuffer src); + + @Override + FloatTensor write(FloatDataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/IntTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/IntTensor.java new file mode 100644 index 00000000000..67aab65f309 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/IntTensor.java @@ -0,0 +1,37 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.IntNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.IntDataBuffer; + +/** + * A {@link Tensor} of integers. + */ +public interface IntTensor extends IntNdArray, Tensor { + + @Override + IntTensor setInt(int value, long... coordinates); + + @Override + IntTensor set(NdArray src, long... coordinates); + + @Override + IntTensor setObject(Integer value, long... coordinates); + + @Override + IntTensor copyTo(NdArray dst); + + @Override + IntTensor read(DataBuffer dst); + + @Override + IntTensor read(IntDataBuffer dst); + + @Override + IntTensor write(DataBuffer src); + + @Override + IntTensor write(IntDataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/LongTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/LongTensor.java new file mode 100644 index 00000000000..3d708bf869e --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/LongTensor.java @@ -0,0 +1,37 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.LongNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.DataBuffer; +import org.tensorflow.ndarray.buffer.LongDataBuffer; + +/** + * A {@link Tensor} of longs. + */ +public interface LongTensor extends LongNdArray, Tensor { + + @Override + LongTensor setLong(long value, long... coordinates); + + @Override + LongTensor set(NdArray src, long... coordinates); + + @Override + LongTensor setObject(Long value, long... coordinates); + + @Override + LongTensor copyTo(NdArray dst); + + @Override + LongTensor read(DataBuffer dst); + + @Override + LongTensor read(LongDataBuffer dst); + + @Override + LongTensor write(DataBuffer src); + + @Override + LongTensor write(LongDataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/StringTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/StringTensor.java new file mode 100644 index 00000000000..7a74276e8df --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/tensor/StringTensor.java @@ -0,0 +1,31 @@ +package org.tensorflow.types.tensor; + +import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.buffer.DataBuffer; + +/** + * A {@link Tensor} of strings. + */ +public interface StringTensor extends Tensor { + + /** + * @return the tensor data as a n-dimensional array of raw byte sequences. + */ + NdArray asBytes(); + + @Override + StringTensor set(NdArray src, long... coordinates); + + @Override + StringTensor setObject(String value, long... coordinates); + + @Override + StringTensor copyTo(NdArray dst); + + @Override + StringTensor read(DataBuffer dst); + + @Override + StringTensor write(DataBuffer src); +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBfloat16.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBfloat16.java index 531bedc5e40..b318c943c87 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBfloat16.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBfloat16.java @@ -19,18 +19,18 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.internal.tensor.FloatTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; +import org.tensorflow.ndarray.NdArray; import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.StdArrays; import org.tensorflow.ndarray.buffer.FloatDataBuffer; import org.tensorflow.ndarray.buffer.layout.DataLayouts; -import org.tensorflow.ndarray.FloatNdArray; -import org.tensorflow.ndarray.NdArray; -import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.FloatDenseNdArray; -import org.tensorflow.types.family.TNumber; +import org.tensorflow.tensor.FloatTensor; +import org.tensorflow.types.family.TFloating; /** * Brain 16-bit float tensor type. @@ -47,10 +47,10 @@ *

Note that some CPUs support the bfloat16 format natively, which can result in faster computation * compared to {@link TFloat16} when GPUs are not used. */ -public interface TBfloat16 extends FloatNdArray, TNumber { +public interface TBfloat16 extends FloatTensor, TFloating { /** Type metadata */ - DataType DTYPE = DataType.create("BFLOAT16", 14, 2, TBfloat16Impl::mapTensor); + DataType DTYPE = DataType.create("BFLOAT16", 14, 2, TBfloat16Impl::new); /** * Allocates a new tensor for storing a single float value. @@ -58,8 +58,8 @@ public interface TBfloat16 extends FloatNdArray, TNumber { * @param value float to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(float value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setFloat(value)); + static TBfloat16 scalarOf(float value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setFloat(value)); } /** @@ -68,11 +68,11 @@ static Tensor scalarOf(float value) { * @param values floats to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(float... values) { + static TBfloat16 vectorOf(float... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -83,8 +83,8 @@ static Tensor vectorOf(float... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TBfloat16 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -93,8 +93,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TBfloat16 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -104,34 +104,34 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of floats to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, FloatDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TBfloat16 tensorOf(Shape shape, FloatDataBuffer data) { + return Tensors.of(DTYPE, shape, t -> t.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TBfloat16 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TBfloat16} */ -class TBfloat16Impl extends FloatDenseNdArray implements TBfloat16 { +class TBfloat16Impl extends FloatTensorImpl implements TBfloat16 { - static TBfloat16 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TBfloat16Impl(DataLayouts.BFLOAT16.applyTo(TensorBuffers.toShorts(nativeTensor)), shape); + TBfloat16Impl(TF_Tensor nativeTensorHandle, Shape shape) { + super(nativeTensorHandle, DTYPE, shape, mapMemory(nativeTensorHandle)); } - private TBfloat16Impl(FloatDataBuffer buffer, Shape shape) { - super(buffer, shape); + private static FloatDataBuffer mapMemory(TF_Tensor nativeTensorHandle) { + return DataLayouts.BFLOAT16.applyTo(TensorBuffers.toShorts(nativeTensorHandle)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBool.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBool.java index 835d0a1be31..f09c8df90e1 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBool.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TBool.java @@ -19,17 +19,17 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; -import org.tensorflow.ndarray.buffer.layout.DataLayouts; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.BooleanDataBuffer; -import org.tensorflow.ndarray.BooleanNdArray; +import org.tensorflow.internal.tensor.BooleanTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.BooleanDenseNdArray; +import org.tensorflow.ndarray.buffer.BooleanDataBuffer; +import org.tensorflow.ndarray.buffer.layout.DataLayouts; +import org.tensorflow.tensor.BooleanTensor; import org.tensorflow.types.family.TType; /** @@ -40,10 +40,10 @@ * {@link DataLayouts#BOOL BOOL} layout, which may impact I/O * performances. */ -public interface TBool extends BooleanNdArray, TType { +public interface TBool extends BooleanTensor, TType { /** Type metadata */ - DataType DTYPE = DataType.create("BOOL", 10, 1, TBoolImpl::mapTensor); + DataType DTYPE = DataType.create("BOOL", 10, 1, TBoolImpl::new); /** * Allocates a new tensor for storing a single boolean value. @@ -51,8 +51,8 @@ public interface TBool extends BooleanNdArray, TType { * @param value boolean to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(boolean value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setBoolean(value)); + static TBool scalarOf(boolean value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setBoolean(value)); } /** @@ -61,11 +61,11 @@ static Tensor scalarOf(boolean value) { * @param values booleans to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(boolean... values) { + static TBool vectorOf(boolean... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -76,8 +76,8 @@ static Tensor vectorOf(boolean... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TBool tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -86,8 +86,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TBool tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -97,33 +97,29 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of booleans to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, BooleanDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TBool tensorOf(Shape shape, BooleanDataBuffer data) { + return Tensors.of(DTYPE, shape, d -> d.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TBool tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TBool} */ -class TBoolImpl extends BooleanDenseNdArray implements TBool { - - static TBool mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TBoolImpl(TensorBuffers.toBooleans(nativeTensor), shape); - } +class TBoolImpl extends BooleanTensorImpl implements TBool { - private TBoolImpl(BooleanDataBuffer buffer, Shape shape) { - super(buffer, shape); + TBoolImpl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, TensorBuffers.toBooleans(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat16.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat16.java index 3f0deb00d0f..5126c7caff8 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat16.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat16.java @@ -19,18 +19,18 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.internal.tensor.FloatTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; +import org.tensorflow.ndarray.NdArray; import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.StdArrays; import org.tensorflow.ndarray.buffer.FloatDataBuffer; import org.tensorflow.ndarray.buffer.layout.DataLayouts; -import org.tensorflow.ndarray.FloatNdArray; -import org.tensorflow.ndarray.NdArray; -import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.FloatDenseNdArray; -import org.tensorflow.types.family.TNumber; +import org.tensorflow.tensor.FloatTensor; +import org.tensorflow.types.family.TFloating; /** * IEEE-754 half-precision 16-bit float tensor type. @@ -44,10 +44,10 @@ * CPUs do not support this format natively. For CPU computation on 16-bit floats, the {@link TBfloat16} * tensor type might be a better option. */ -public interface TFloat16 extends FloatNdArray, TNumber { +public interface TFloat16 extends FloatTensor, TFloating { /** Type metadata */ - DataType DTYPE = DataType.create("FLOAT16", 19, 2, TFloat16Impl::mapTensor); + DataType DTYPE = DataType.create("FLOAT16", 19, 2, TFloat16Impl::new); /** * Allocates a new tensor for storing a single float value. @@ -55,8 +55,8 @@ public interface TFloat16 extends FloatNdArray, TNumber { * @param value float to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(float value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setFloat(value)); + static TFloat16 scalarOf(float value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setFloat(value)); } /** @@ -65,11 +65,11 @@ static Tensor scalarOf(float value) { * @param values floats to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(float... values) { + static TFloat16 vectorOf(float... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -80,8 +80,8 @@ static Tensor vectorOf(float... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TFloat16 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -90,8 +90,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TFloat16 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -101,34 +101,34 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of floats to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, FloatDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TFloat16 tensorOf(Shape shape, FloatDataBuffer data) { + return Tensors.of(DTYPE, shape, t -> t.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TFloat16 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TFloat16} */ -class TFloat16Impl extends FloatDenseNdArray implements TFloat16 { +class TFloat16Impl extends FloatTensorImpl implements TFloat16 { - static TFloat16 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TFloat16Impl(DataLayouts.FLOAT16.applyTo(TensorBuffers.toShorts(nativeTensor)), shape); + TFloat16Impl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, mapMemory(nativeTensor)); } - private TFloat16Impl(FloatDataBuffer buffer, Shape shape) { - super(buffer, shape); + private static FloatDataBuffer mapMemory(TF_Tensor nativeTensor) { + return DataLayouts.FLOAT16.applyTo(TensorBuffers.toShorts(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat32.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat32.java index 4b06ad2d57e..152591cb245 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat32.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat32.java @@ -19,25 +19,25 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.FloatDataBuffer; -import org.tensorflow.ndarray.FloatNdArray; +import org.tensorflow.internal.tensor.FloatTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.FloatDenseNdArray; -import org.tensorflow.types.family.TNumber; +import org.tensorflow.ndarray.buffer.FloatDataBuffer; +import org.tensorflow.tensor.FloatTensor; +import org.tensorflow.types.family.TFloating; /** * IEEE-754 single-precision 32-bit float tensor type. */ -public interface TFloat32 extends FloatNdArray, TNumber { +public interface TFloat32 extends FloatTensor, TFloating { /** Type metadata */ - DataType DTYPE = DataType.create("FLOAT", 1, 4, TFloat32Impl::mapTensor); + DataType DTYPE = DataType.create("FLOAT", 1, 4, TFloat32Impl::new); /** * Allocates a new tensor for storing a single float value. @@ -45,8 +45,8 @@ public interface TFloat32 extends FloatNdArray, TNumber { * @param value float to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(float value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setFloat(value)); + static TFloat32 scalarOf(float value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setFloat(value)); } /** @@ -55,11 +55,11 @@ static Tensor scalarOf(float value) { * @param values floats to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(float... values) { + static TFloat32 vectorOf(float... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -70,8 +70,8 @@ static Tensor vectorOf(float... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TFloat32 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -80,8 +80,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TFloat32 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -91,34 +91,30 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of floats to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, FloatDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TFloat32 tensorOf(Shape shape, FloatDataBuffer data) { + return Tensors.of(DTYPE, shape, t -> t.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TFloat32 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TFloat32} */ -class TFloat32Impl extends FloatDenseNdArray implements TFloat32 { - - static TFloat32 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TFloat32Impl(TensorBuffers.toFloats(nativeTensor), shape); - } +class TFloat32Impl extends FloatTensorImpl implements TFloat32 { - private TFloat32Impl(FloatDataBuffer buffer, Shape shape) { - super(buffer, shape); + TFloat32Impl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, TensorBuffers.toFloats(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat64.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat64.java index 0b2109ac374..c75a6a5a1bc 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat64.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TFloat64.java @@ -19,25 +19,25 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.DoubleDataBuffer; -import org.tensorflow.ndarray.DoubleNdArray; +import org.tensorflow.internal.tensor.DoubleTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.DoubleDenseNdArray; -import org.tensorflow.types.family.TNumber; +import org.tensorflow.ndarray.buffer.DoubleDataBuffer; +import org.tensorflow.tensor.DoubleTensor; +import org.tensorflow.types.family.TFloating; /** * IEEE-754 double-precision 64-bit float tensor type. */ -public interface TFloat64 extends DoubleNdArray, TNumber { +public interface TFloat64 extends DoubleTensor, TFloating { /** Type metadata */ - DataType DTYPE = DataType.create("DOUBLE", 2, 8, TFloat64Impl::mapTensor); + DataType DTYPE = DataType.create("DOUBLE", 2, 8, TFloat64Impl::new); /** * Allocates a new tensor for storing a single double value. @@ -45,8 +45,8 @@ public interface TFloat64 extends DoubleNdArray, TNumber { * @param value double to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(double value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setDouble(value)); + static TFloat64 scalarOf(double value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setDouble(value)); } /** @@ -55,11 +55,11 @@ static Tensor scalarOf(double value) { * @param values doubles to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(double... values) { + static TFloat64 vectorOf(double... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -70,8 +70,8 @@ static Tensor vectorOf(double... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TFloat64 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -80,8 +80,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TFloat64 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -91,33 +91,29 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of doubles to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, DoubleDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TFloat64 tensorOf(Shape shape, DoubleDataBuffer data) { + return Tensors.of(DTYPE, shape, t -> t.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TFloat64 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TFloat64} */ -class TFloat64Impl extends DoubleDenseNdArray implements TFloat64 { - - static TFloat64 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TFloat64Impl(TensorBuffers.toDoubles(nativeTensor), shape); - } +class TFloat64Impl extends DoubleTensorImpl implements TFloat64 { - private TFloat64Impl(DoubleDataBuffer buffer, Shape shape) { - super(buffer, shape); + TFloat64Impl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, TensorBuffers.toDoubles(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt32.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt32.java index ac0dbec1d42..d05edddf64f 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt32.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt32.java @@ -19,24 +19,24 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; -import org.tensorflow.internal.buffer.TensorBuffers; +import org.tensorflow.Tensors; import org.tensorflow.internal.c_api.TF_Tensor; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.IntDataBuffer; -import org.tensorflow.ndarray.IntNdArray; +import org.tensorflow.internal.tensor.IntTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.IntDenseNdArray; +import org.tensorflow.ndarray.buffer.IntDataBuffer; +import org.tensorflow.tensor.IntTensor; import org.tensorflow.types.family.TNumber; /** * 32-bit signed integer tensor type. */ -public interface TInt32 extends IntNdArray, TNumber { +public interface TInt32 extends IntTensor, TNumber { /** Type metadata */ - DataType DTYPE = DataType.create("INT32", 3, 4, TInt32Impl::mapTensor); + DataType DTYPE = DataType.create("INT32", 3, 4, TInt32Impl::new); /** * Allocates a new tensor for storing a single int value. @@ -44,8 +44,8 @@ public interface TInt32 extends IntNdArray, TNumber { * @param value int to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(int value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setInt(value)); + static TInt32 scalarOf(int value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setInt(value)); } /** @@ -55,11 +55,11 @@ static Tensor scalarOf(int value) { * @return the new tensor * @throws IllegalArgumentException if no values are provided */ - static Tensor vectorOf(int... values) { + static TInt32 vectorOf(int... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -70,8 +70,8 @@ static Tensor vectorOf(int... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TInt32 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -80,8 +80,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TInt32 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -91,32 +91,28 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of ints to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, IntDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TInt32 tensorOf(Shape shape, IntDataBuffer data) { + return Tensors.of(DTYPE, shape, t -> t.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TInt32 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TInt32} */ -class TInt32Impl extends IntDenseNdArray implements TInt32 { - - static TInt32 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TInt32Impl(TensorBuffers.toInts(nativeTensor), shape); - } +class TInt32Impl extends IntTensorImpl implements TInt32 { - private TInt32Impl(IntDataBuffer buffer, Shape shape) { - super(buffer, shape); + TInt32Impl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, TensorBuffers.toInts(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt64.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt64.java index bbe05f9b1ff..64819b6b1f9 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt64.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TInt64.java @@ -19,25 +19,25 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.LongDataBuffer; -import org.tensorflow.ndarray.LongNdArray; +import org.tensorflow.internal.tensor.LongTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.LongDenseNdArray; +import org.tensorflow.ndarray.buffer.LongDataBuffer; +import org.tensorflow.tensor.LongTensor; import org.tensorflow.types.family.TNumber; /** * 64-bit signed integer tensor type. */ -public interface TInt64 extends LongNdArray, TNumber { +public interface TInt64 extends LongTensor, TNumber { /** Type metadata */ - DataType DTYPE = DataType.create("INT64", 9, 8, TInt64Impl::mapTensor); + DataType DTYPE = DataType.create("INT64", 9, 8, TInt64Impl::new); /** * Allocates a new tensor for storing a single long value. @@ -45,8 +45,8 @@ public interface TInt64 extends LongNdArray, TNumber { * @param value long to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(long value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setLong(value)); + static TInt64 scalarOf(long value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setLong(value)); } /** @@ -55,11 +55,11 @@ static Tensor scalarOf(long value) { * @param values longs to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(long... values) { + static TInt64 vectorOf(long... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -70,8 +70,8 @@ static Tensor vectorOf(long... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TInt64 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -80,8 +80,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TInt64 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -91,33 +91,29 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of longs to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, LongDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TInt64 tensorOf(Shape shape, LongDataBuffer data) { + return Tensors.of(DTYPE, shape, t -> t.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TInt64 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TInt64} */ -class TInt64Impl extends LongDenseNdArray implements TInt64 { - - static TInt64 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TInt64Impl(TensorBuffers.toLongs(nativeTensor), shape); - } +class TInt64Impl extends LongTensorImpl implements TInt64 { - private TInt64Impl(LongDataBuffer buffer, Shape shape) { - super(buffer, shape); + TInt64Impl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, TensorBuffers.toLongs(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TString.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TString.java index 90ae4ef9cb8..ed49c28aaf8 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TString.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TString.java @@ -21,17 +21,18 @@ import java.nio.charset.StandardCharsets; import java.util.function.Function; import org.tensorflow.DataType; -import org.tensorflow.Tensor; -import org.tensorflow.internal.buffer.StringTensorBuffer; -import org.tensorflow.internal.buffer.TensorBuffers; +import org.tensorflow.Tensors; import org.tensorflow.internal.c_api.TF_Tensor; +import org.tensorflow.internal.tensor.StringTensorImpl; +import org.tensorflow.internal.tensor.buffer.ByteSequenceTensorBuffer; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.buffer.DataBuffer; import org.tensorflow.ndarray.buffer.layout.DataLayout; import org.tensorflow.ndarray.buffer.layout.DataLayouts; -import org.tensorflow.ndarray.NdArray; -import org.tensorflow.ndarray.NdArrays; -import org.tensorflow.ndarray.impl.dense.DenseNdArray; +import org.tensorflow.tensor.StringTensor; import org.tensorflow.types.family.TType; /** @@ -43,12 +44,12 @@ * its values initially, so TensorFlow can compute and allocate the right amount of memory. Then * the data in the tensor is initialized once and cannot be modified afterwards. */ -public interface TString extends NdArray, TType { +public interface TString extends StringTensor, TType { /** * Type metadata */ - DataType DTYPE = DataType.create("STRING", 7, -1, TStringImpl::mapTensor); + DataType DTYPE = DataType.create("STRING", 7, -1, TStringImpl::new); /** * Allocates a new tensor for storing a string scalar. @@ -58,7 +59,7 @@ public interface TString extends NdArray, TType { * @param value scalar value to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(String value) { + static TString scalarOf(String value) { return tensorOf(NdArrays.scalarOfObject(value)); } @@ -70,7 +71,7 @@ static Tensor scalarOf(String value) { * @param values values to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(String... values) { + static TString vectorOf(String... values) { if (values == null) { throw new IllegalArgumentException(); } @@ -86,7 +87,7 @@ static Tensor vectorOf(String... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { + static TString tensorOf(NdArray src) { return tensorOf(StandardCharsets.UTF_8, src); } @@ -111,7 +112,7 @@ static Tensor tensorOf(NdArray src) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(Charset charset, NdArray src) { + static TString tensorOf(Charset charset, NdArray src) { return TStringImpl.createTensor(src, s -> s.getBytes(charset)); } @@ -125,7 +126,7 @@ static Tensor tensorOf(Charset charset, NdArray src) { * @param data buffer of strings to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, DataBuffer data) { + static TString tensorOf(Shape shape, DataBuffer data) { return tensorOf(NdArrays.wrap(shape, data)); } @@ -152,7 +153,7 @@ static Tensor tensorOf(Shape shape, DataBuffer data) { * @param data buffer of strings to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Charset charset, Shape shape, DataBuffer data) { + static TString tensorOf(Charset charset, Shape shape, DataBuffer data) { return tensorOf(charset, NdArrays.wrap(shape, data)); } @@ -171,7 +172,7 @@ static Tensor tensorOf(Charset charset, Shape shape, DataBuffer * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOfBytes(NdArray src) { + static TString tensorOfBytes(NdArray src) { return TStringImpl.createTensor(src, Function.identity()); } @@ -190,7 +191,7 @@ static Tensor tensorOfBytes(NdArray src) { * @param data the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOfBytes(Shape shape, DataBuffer data) { + static TString tensorOfBytes(Shape shape, DataBuffer data) { return tensorOfBytes(NdArrays.wrap(shape, data)); } @@ -211,47 +212,33 @@ static Tensor tensorOfBytes(Shape shape, DataBuffer data) { * @return string tensor data using this charset */ TString using(Charset charset); - - /** - * @return the tensor data as a n-dimensional array of raw byte sequences. - */ - NdArray asBytes(); } /** * Hidden implementation of a {@code TString} */ -class TStringImpl extends DenseNdArray implements TString { +class TStringImpl extends StringTensorImpl implements TString { @Override public TString using(Charset charset) { - return new TStringImpl(tensorBuffer, DataLayouts.ofStrings(charset), shape()); + return new TStringImpl(nativeHandle, shape(), DataLayouts.ofStrings(charset), rawBuffer()); } - @Override - public NdArray asBytes() { - return NdArrays.wrap(shape(), tensorBuffer); - } - - static Tensor createTensor(NdArray src, Function getBytes) { - long size = StringTensorBuffer.computeSize(src, getBytes); - return Tensor.of(TString.DTYPE, src.shape(), size, data -> - ((TStringImpl)data).tensorBuffer.init(src, getBytes) + static TString createTensor(NdArray src, Function getBytes) { + long size = ByteSequenceTensorBuffer.computeSize(src, getBytes); + return Tensors.of(TString.DTYPE, src.shape(), size, t -> + ((TStringImpl)t).rawBuffer().init(src, getBytes) ); } - static TString mapTensor(TF_Tensor nativeTensor, Shape shape) { - StringTensorBuffer buffer = TensorBuffers.toStrings(nativeTensor, shape.size()); - return new TStringImpl(buffer, UTF_8_LAYOUT, shape); + TStringImpl(TF_Tensor nativeTensor, Shape shape) { + this(nativeTensor, shape, UTF_8_LAYOUT, TensorBuffers.toStrings(nativeTensor, shape.size())); } - private static DataLayout, String> UTF_8_LAYOUT = DataLayouts.ofStrings(StandardCharsets.UTF_8); - - private final StringTensorBuffer tensorBuffer; + private static final DataLayout, String> UTF_8_LAYOUT = DataLayouts.ofStrings(StandardCharsets.UTF_8); - private TStringImpl(StringTensorBuffer buffer, DataLayout, String> layout, Shape shape) { - super(layout.applyTo(buffer), shape); - tensorBuffer = buffer; + private TStringImpl(TF_Tensor nativeTensor, Shape shape, DataLayout, String> layout, ByteSequenceTensorBuffer rawBuffer) { + super(nativeTensor, TString.DTYPE, shape, layout, rawBuffer); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TUint8.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TUint8.java index f55959194e5..c0cffe6d1cf 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TUint8.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/TUint8.java @@ -19,25 +19,25 @@ import java.util.function.Consumer; import org.tensorflow.DataType; -import org.tensorflow.Tensor; +import org.tensorflow.Tensors; import org.tensorflow.exceptions.TensorFlowException; -import org.tensorflow.internal.buffer.TensorBuffers; import org.tensorflow.internal.c_api.TF_Tensor; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.ByteDataBuffer; -import org.tensorflow.ndarray.ByteNdArray; +import org.tensorflow.internal.tensor.ByteTensorImpl; +import org.tensorflow.internal.tensor.buffer.TensorBuffers; import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; -import org.tensorflow.ndarray.impl.dense.ByteDenseNdArray; +import org.tensorflow.ndarray.buffer.ByteDataBuffer; +import org.tensorflow.tensor.ByteTensor; import org.tensorflow.types.family.TNumber; /** * 8-bit unsigned integer tensor type. */ -public interface TUint8 extends ByteNdArray, TNumber { +public interface TUint8 extends ByteTensor, TNumber { /** Type metadata */ - DataType DTYPE = DataType.create("UINT8", 4, 1, TUint8Impl::mapTensor); + DataType DTYPE = DataType.create("UINT8", 4, 1, TUint8Impl::new); /** * Allocates a new tensor for storing a single byte value. @@ -45,8 +45,8 @@ public interface TUint8 extends ByteNdArray, TNumber { * @param value byte to store in the new tensor * @return the new tensor */ - static Tensor scalarOf(byte value) { - return Tensor.of(DTYPE, Shape.scalar(), data -> data.setByte(value)); + static TUint8 scalarOf(byte value) { + return Tensors.of(DTYPE, Shape.scalar(), t -> t.setByte(value)); } /** @@ -55,11 +55,11 @@ static Tensor scalarOf(byte value) { * @param values bytes to store in the new tensor * @return the new tensor */ - static Tensor vectorOf(byte... values) { + static TUint8 vectorOf(byte... values) { if (values == null) { throw new IllegalArgumentException(); } - return Tensor.of(DTYPE, Shape.of(values.length), data -> StdArrays.copyTo(values, data)); + return Tensors.of(DTYPE, Shape.of(values.length), t -> StdArrays.copyTo(values, t)); } /** @@ -70,8 +70,8 @@ static Tensor vectorOf(byte... values) { * @param src the source array giving the shape and data to the new tensor * @return the new tensor */ - static Tensor tensorOf(NdArray src) { - return Tensor.of(DTYPE, src.shape(), src::copyTo); + static TUint8 tensorOf(NdArray src) { + return Tensors.of(DTYPE, src.shape(), src::copyTo); } /** @@ -80,8 +80,8 @@ static Tensor tensorOf(NdArray src) { * @param shape shape of the tensor to allocate * @return the new tensor */ - static Tensor tensorOf(Shape shape) { - return Tensor.of(DTYPE, shape); + static TUint8 tensorOf(Shape shape) { + return Tensors.of(DTYPE, shape); } /** @@ -91,33 +91,29 @@ static Tensor tensorOf(Shape shape) { * @param data buffer of bytes to initialize the tensor with * @return the new tensor */ - static Tensor tensorOf(Shape shape, ByteDataBuffer data) { - return Tensor.of(DTYPE, shape, d -> d.write(data)); + static TUint8 tensorOf(Shape shape, ByteDataBuffer data) { + return Tensors.of(DTYPE, shape, d -> d.write(data)); } /** * Allocates a new tensor of the given shape and initialize its data. * * @param shape shape of the tensor to allocate - * @param dataInit tensor data initializer + * @param tensorInit tensor data initializer * @return the new tensor * @throws TensorFlowException if the tensor cannot be allocated or initialized */ - static Tensor tensorOf(Shape shape, Consumer dataInit) { - return Tensor.of(DTYPE, shape, dataInit); + static TUint8 tensorOf(Shape shape, Consumer tensorInit) { + return Tensors.of(DTYPE, shape, tensorInit); } } /** * Hidden implementation of a {@code TUint8} */ -class TUint8Impl extends ByteDenseNdArray implements TUint8 { - - static TUint8 mapTensor(TF_Tensor nativeTensor, Shape shape) { - return new TUint8Impl(TensorBuffers.toBytes(nativeTensor), shape); - } +class TUint8Impl extends ByteTensorImpl implements TUint8 { - private TUint8Impl(ByteDataBuffer buffer, Shape shape) { - super(buffer, shape); + TUint8Impl(TF_Tensor nativeTensor, Shape shape) { + super(nativeTensor, DTYPE, shape, TensorBuffers.toBytes(nativeTensor)); } } diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TFloating.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TFloating.java new file mode 100644 index 00000000000..8e4038245d0 --- /dev/null +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TFloating.java @@ -0,0 +1,5 @@ +package org.tensorflow.types.family; + +public interface TFloating extends TNumber { + +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TNumber.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TNumber.java index 97ee59af095..4fa2b563cae 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TNumber.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TNumber.java @@ -32,4 +32,4 @@ * tf.nn.softmax(tf.constant(tensor2)); // Compilation failure * } */ -public interface TNumber extends TType {} +public interface TNumber extends TType {} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java index 8f3451b9a68..d8a8063eeb9 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java @@ -17,6 +17,14 @@ package org.tensorflow.types.family; +import org.tensorflow.Operand; +import org.tensorflow.Operation; +import org.tensorflow.Output; +import org.tensorflow.Tensor; +import org.tensorflow.op.Ops; +import org.tensorflow.op.Scope; +import org.tensorflow.op.core.Constant; + /** * Marker interface for all tensor types. * @@ -25,13 +33,31 @@ * between operands of a computation at compile-time. For example: * * 

{@code
- * Tensor tensor1 = TFloat32.ofShape(2, 3, 2);
- * Tensor tensor2 = TFloat32.ofShape(2, 3, 2);
- * Tensor tensor3 = TInt32.ofShape(2, 3, 2);
+ * TFloat32 tensor1 = TFloat32.ofShape(2, 3, 2);
+ * TFloat32 tensor2 = TFloat32.ofShape(2, 3, 2);
+ * TInt32 tensor3 = TInt32.ofShape(2, 3, 2);
  *
  * Ops tf = Ops.create();
- * tf.math.add(tf.constant(tensor1), tf.constant(tensor2));  // OK
- * tf.math.add(tf.constant(tensor1), tf.constant(tensor3));  // Compilation failure
+ * tf.math.add(tensor1, tensor2);  // OK
+ * tf.math.add(tensor1, tensor3);  // Compilation failure
  * }
*/ -public interface TType {} +public interface TType extends Tensor, Operand { + + default Constant toConstant(Scope scope) { + if (scope == null) { + throw new IllegalArgumentException("Scope is required"); + } + return Constant.create(scope, (T)this); + } + + @Override + default Output asOutput(Scope scope) { + return toConstant(scope).asOutput(); + } + + @Override + default Operation op() { + throw new IllegalStateException("A tensor is not attached to a specific operation"); + } +} diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/package-info.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/package-info.java index fcf1f554133..79e9e93fea3 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/package-info.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/package-info.java @@ -21,8 +21,5 @@ *

Some operations enforces that only operands of a type from a given family can be passed * in argument. For example, if an operation only allows numeric operands, such operands must be * bound to the {@link org.tensorflow.types.family.TNumber TNumber} interface. - * - *

All tensor types is bound to {@link org.tensorflow.types.family.TType TType}, which lays at - * the root of the family hierarchy. */ package org.tensorflow.types.family; diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java index 6802ead9592..8fb3f22cd8d 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java @@ -93,7 +93,7 @@ public void setAttrs() { try (EagerSession session = EagerSession.create()) { Ops tf = Ops.create(session); // dtype, tensor attributes. - try (Tensor t = TInt32.scalarOf(1)) { + try (TInt32 t = TInt32.scalarOf(1)) { opBuilder(session, "Const", "DataTypeAndTensor") .setAttr("dtype", TInt32.DTYPE) .setAttr("value", t) diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationTest.java index 09d2214cc6a..6f069506f5f 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationTest.java @@ -46,7 +46,7 @@ public void failToCreateIfSessionIsClosed() { @Test public void outputDataTypeAndShape() { try (EagerSession session = EagerSession.create(); - Tensor t = TInt32.tensorOf(Shape.of(2, 3))) { + TInt32 t = TInt32.tensorOf(Shape.of(2, 3))) { EagerOperation op = opBuilder(session, "Const", "OutputAttrs") .setAttr("dtype", TInt32.DTYPE) @@ -67,7 +67,7 @@ public void outputTensor() { .addInput(tf.constant(2).asOutput()) .addInput(tf.constant(4).asOutput()) .build(); - assertEquals(6, add.tensor(0).expect(TInt32.DTYPE).data().getInt()); + assertEquals(6, add.tensor(0).expect(TInt32.DTYPE).getInt()); // Validate that we retrieve the right shape and datatype from the tensor // that has been resolved diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphOperationBuilderTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphOperationBuilderTest.java index 35bfa808238..7573a25ac13 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphOperationBuilderTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphOperationBuilderTest.java @@ -50,7 +50,7 @@ public void failWhenMixingOperationsOnDifferentGraphs() { @Test public void failOnUseAfterBuild() { try (Graph g = new Graph(); - Tensor t = TInt32.scalarOf(1)) { + TInt32 t = TInt32.scalarOf(1)) { OperationBuilder b = g.opBuilder("Const", "Const").setAttr("dtype", t.dataType()).setAttr("value", t); b.build(); @@ -66,7 +66,7 @@ public void failOnUseAfterBuild() { public void failOnUseAfterGraphClose() { OperationBuilder b = null; try (Graph g = new Graph(); - Tensor t = TInt32.scalarOf(1)) { + TInt32 t = TInt32.scalarOf(1)) { b = g.opBuilder("Const", "Const").setAttr("dtype", t.dataType()).setAttr("value", t); } try { @@ -88,7 +88,7 @@ public void setAttr() { try (Graph g = new Graph()) { Ops tf = Ops.create(g); // dtype, tensor attributes. - try (Tensor t = TInt32.scalarOf(1)) { + try (TInt32 t = TInt32.scalarOf(1)) { g.opBuilder("Const", "DataTypeAndTensor") .setAttr("dtype", TInt32.DTYPE) .setAttr("value", t) @@ -169,8 +169,8 @@ public void setAttrShapeList() { public void addControlInput() { try (Graph g = new Graph(); Session s = new Session(g); - Tensor yes = TBool.scalarOf(true); - Tensor no = TBool.scalarOf(false)) { + TBool yes = TBool.scalarOf(true); + TBool no = TBool.scalarOf(false)) { Ops tf = Ops.create(g); Output placeholder = tf.placeholder(TBool.DTYPE).asOutput(); GraphOperation check = diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphTest.java index de376015e3f..efa6c09f2a5 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphTest.java @@ -157,8 +157,8 @@ public void addGradientsToGraph() { assertEquals(TFloat32.DTYPE, grads1[0].dataType()); assertEquals(TFloat32.DTYPE, grads1[1].dataType()); - try (Tensor c1 = TFloat32.scalarOf(3.0f); - Tensor c2 = TFloat32.scalarOf(2.0f); + try (TFloat32 c1 = TFloat32.scalarOf(3.0f); + TFloat32 c2 = TFloat32.scalarOf(2.0f); AutoCloseableList> outputs = new AutoCloseableList<>( s.runner() .feed(x1, c1) @@ -169,9 +169,9 @@ public void addGradientsToGraph() { .run())) { assertEquals(3, outputs.size()); - assertEquals(108.0f, outputs.get(0).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); - assertEquals(6.0f, outputs.get(1).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); - assertEquals(1.0f, outputs.get(2).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); + assertEquals(108.0f, outputs.get(0).expect(TFloat32.DTYPE).getFloat(), 0.0f); + assertEquals(6.0f, outputs.get(1).expect(TFloat32.DTYPE).getFloat(), 0.0f); + assertEquals(1.0f, outputs.get(2).expect(TFloat32.DTYPE).getFloat(), 0.0f); } } } @@ -191,14 +191,14 @@ public void addGradientSumsToGraph() { assertEquals(1, grad.length); assertEquals(TFloat32.DTYPE, grad[0].dataType()); - try (Tensor c = TFloat32.scalarOf(3.0f); - Tensor output = s.runner() + try (TFloat32 c = TFloat32.scalarOf(3.0f); + TFloat32 output = s.runner() .feed(x, c) .fetch(grad[0]) .run() .get(0) .expect(TFloat32.DTYPE)) { - assertEquals(114.0f, output.data().getFloat(), 0.0f); + assertEquals(114.0f, output.getFloat(), 0.0f); } } } @@ -223,14 +223,14 @@ public void addGradientsWithInitialValuesToGraph() { assertEquals(1, grad1.length); assertEquals(TFloat32.DTYPE, grad1[0].dataType()); - try (Tensor c = TFloat32.scalarOf(3.0f); - Tensor output = s.runner() + try (TFloat32 c = TFloat32.scalarOf(3.0f); + TFloat32 output = s.runner() .feed(x, c) .fetch(grad1[0]) .run() .get(0) .expect(TFloat32.DTYPE)) { - assertEquals(108.0f, output.data().getFloat(), 0.0f); + assertEquals(108.0f, output.getFloat(), 0.0f); } } } @@ -284,14 +284,14 @@ public void buildWhileLoopSingleInput() { }, "test_loop"); - try (Tensor c = TInt32.scalarOf(2); - Tensor output = s.runner() + try (TInt32 c = TInt32.scalarOf(2); + TInt32 output = s.runner() .feed(input, c) .fetch(loopOutputs[0]) .run() .get(0) .expect(TInt32.DTYPE)) { - assertEquals(16, output.data().getInt()); // ((2^2)^2) + assertEquals(16, output.getInt()); // ((2^2)^2) } } } @@ -320,8 +320,8 @@ public void buildWhileLoopMultipleInputs() { }, "test_loop"); - try (Tensor c1 = TInt32.scalarOf(2); - Tensor c2 = TInt32.scalarOf(5); + try (TInt32 c1 = TInt32.scalarOf(2); + TInt32 c2 = TInt32.scalarOf(5); AutoCloseableList> outputs = new AutoCloseableList<>( s.runner() @@ -331,8 +331,8 @@ public void buildWhileLoopMultipleInputs() { .fetch(loopOutputs[1]) .run())) { assertEquals(2, outputs.size()); - assertEquals(16, outputs.get(0).expect(TInt32.DTYPE).data().getInt()); // ((2^2)^2) - assertEquals(625, outputs.get(1).expect(TInt32.DTYPE).data().getInt()); // ((5^2)^2) + assertEquals(16, outputs.get(0).expect(TInt32.DTYPE).getInt()); // ((2^2)^2) + assertEquals(625, outputs.get(1).expect(TInt32.DTYPE).getInt()); // ((5^2)^2) } } } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SessionTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SessionTest.java index 7faf8c6fbdb..e72c461212b 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SessionTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SessionTest.java @@ -42,11 +42,11 @@ public void runUsingOperationNames() { Session s = new Session(g)) { Ops tf = Ops.create(g); transpose_A_times_X(tf, new int[][] {{2}, {3}}); - try (Tensor x = TInt32.tensorOf(StdArrays.ndCopyOf(new int[][] {{5}, {7}})); + try (TInt32 x = TInt32.tensorOf(StdArrays.ndCopyOf(new int[][] {{5}, {7}})); AutoCloseableList> outputs = new AutoCloseableList<>(s.runner().feed("X", x).fetch("Y").run())) { assertEquals(1, outputs.size()); - assertEquals(31, outputs.get(0).expect(TInt32.DTYPE).data().getInt(0, 0)); + assertEquals(31, outputs.get(0).expect(TInt32.DTYPE).getInt(0, 0)); } } } @@ -59,11 +59,11 @@ public void runUsingOperationHandles() { transpose_A_times_X(tf, new int[][] {{2}, {3}}); Output feed = g.operation("X").output(0); Output fetch = g.operation("Y").output(0); - try (Tensor x = TInt32.tensorOf(StdArrays.ndCopyOf(new int[][] {{5}, {7}})); + try (TInt32 x = TInt32.tensorOf(StdArrays.ndCopyOf(new int[][] {{5}, {7}})); AutoCloseableList> outputs = new AutoCloseableList<>(s.runner().feed(feed, x).fetch(fetch).run())) { assertEquals(1, outputs.size()); - assertEquals(31, outputs.get(0).expect(TInt32.DTYPE).data().getInt(0, 0)); + assertEquals(31, outputs.get(0).expect(TInt32.DTYPE).getInt(0, 0)); } } } @@ -77,14 +77,14 @@ public void runUsingColonSeparatedNames() { tf.math.add(split.output().get(0), split.output().get(1)); // Fetch using colon separated names. - try (Tensor fetched = + try (TInt32 fetched = s.runner().fetch("Split:1").run().get(0).expect(TInt32.DTYPE)) { - assertEquals(3, fetched.data().getInt(0)); - assertEquals(4, fetched.data().getInt(1)); + assertEquals(3, fetched.getInt(0)); + assertEquals(4, fetched.getInt(1)); } // Feed using colon separated names. - try (Tensor fed = TInt32.vectorOf(4, 3, 2, 1); - Tensor fetched = + try (TInt32 fed = TInt32.vectorOf(4, 3, 2, 1); + TInt32 fetched = s.runner() .feed("Split:0", fed) .feed("Split:1", fed) @@ -92,7 +92,7 @@ public void runUsingColonSeparatedNames() { .run() .get(0) .expect(TInt32.DTYPE)) { - assertEquals(NdArrays.vectorOf(8, 6, 4, 2), fetched.data()); + assertEquals(NdArrays.vectorOf(8, 6, 4, 2), fetched); } } } @@ -103,7 +103,7 @@ public void runWithMetadata() { Session s = new Session(g)) { Ops tf = Ops.create(g); transpose_A_times_X(tf, new int[][] {{2}, {3}}); - try (Tensor x = TInt32.tensorOf(StdArrays.ndCopyOf(new int[][] {{5}, {7}}))) { + try (TInt32 x = TInt32.tensorOf(StdArrays.ndCopyOf(new int[][] {{5}, {7}}))) { Session.Run result = s.runner() .feed("X", x) @@ -113,7 +113,7 @@ public void runWithMetadata() { // Sanity check on outputs. AutoCloseableList> outputs = new AutoCloseableList<>(result.outputs); assertEquals(1, outputs.size()); - assertEquals(31, outputs.get(0).expect(TInt32.DTYPE).data().getInt(0, 0)); + assertEquals(31, outputs.get(0).expect(TInt32.DTYPE).getInt(0, 0)); // Sanity check on metadata assertNotNull(result.metadata); assertTrue(result.metadata.hasStepStats(), result.metadata.toString()); @@ -132,8 +132,8 @@ public void runMultipleOutputs() { AutoCloseableList> outputs = new AutoCloseableList<>(s.runner().fetch("c2").fetch("c1").run()); assertEquals(2, outputs.size()); - assertEquals(31415, outputs.get(0).expect(TInt32.DTYPE).data().getInt()); - assertEquals(2718, outputs.get(1).expect(TInt32.DTYPE).data().getInt()); + assertEquals(31415, outputs.get(0).expect(TInt32.DTYPE).getInt()); + assertEquals(2718, outputs.get(1).expect(TInt32.DTYPE).getInt()); outputs.close(); } } @@ -171,8 +171,8 @@ public void runInit() { try (Session s = new Session(g)) { s.run(tf.init()); - try (Tensor t = s.runner().fetch(add).run().get(0).expect(TInt32.DTYPE)) { - assertEquals(30, t.data().getInt()); + try (TInt32 t = s.runner().fetch(add).run().get(0).expect(TInt32.DTYPE)) { + assertEquals(30, t.getInt()); } } } @@ -192,8 +192,8 @@ public void runInitByName() { try (Session s = new Session(g)) { s.run("init_test"); - try (Tensor t = s.runner().fetch(add).run().get(0).expect(TInt32.DTYPE)) { - assertEquals(30, t.data().getInt()); + try (TInt32 t = s.runner().fetch(add).run().get(0).expect(TInt32.DTYPE)) { + assertEquals(30, t.getInt()); } try { s.run("wrong_name"); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorTest.java index 01ef11efedd..6aa33ef0a73 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/TensorTest.java @@ -30,9 +30,6 @@ import java.nio.IntBuffer; import java.nio.LongBuffer; import org.junit.jupiter.api.Test; -import org.tensorflow.op.Ops; -import org.tensorflow.ndarray.Shape; -import org.tensorflow.ndarray.buffer.DataBuffers; import org.tensorflow.ndarray.BooleanNdArray; import org.tensorflow.ndarray.DoubleNdArray; import org.tensorflow.ndarray.FloatNdArray; @@ -40,7 +37,10 @@ import org.tensorflow.ndarray.LongNdArray; import org.tensorflow.ndarray.NdArray; import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.StdArrays; +import org.tensorflow.ndarray.buffer.DataBuffers; +import org.tensorflow.op.Ops; import org.tensorflow.types.TBool; import org.tensorflow.types.TFloat32; import org.tensorflow.types.TFloat64; @@ -64,22 +64,22 @@ public void createWithRawData() { String strings = "test"; Shape strings_shape = Shape.scalar(); byte[] strings_; // raw TF_STRING - try (Tensor t = TString.tensorOf(NdArrays.scalarOfObject(strings))) { + try (TString t = TString.tensorOf(NdArrays.scalarOfObject(strings))) { strings_ = new byte[(int)t.numBytes()]; t.rawData().read(strings_); } // validate creating a tensor using a raw data byte buffers { - try (Tensor t = Tensor.of(TBool.DTYPE, bools_shape, DataBuffers.of(bools_))) { + try (TBool t = Tensors.of(TBool.DTYPE, bools_shape, DataBuffers.of(bools_))) { boolean[] actual = new boolean[bools_.length]; - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertArrayEquals(bools, actual); } // note: the buffer is expected to contain raw TF_STRING (as per C API) - try (Tensor t = Tensor.of(TString.DTYPE, strings_shape, DataBuffers.of(strings_))) { - assertEquals(strings, t.data().getObject()); + try (TString t = Tensors.of(TString.DTYPE, strings_shape, DataBuffers.of(strings_))) { + assertEquals(strings, t.getObject()); } } @@ -87,15 +87,15 @@ public void createWithRawData() { { DoubleBuffer buf = ByteBuffer.allocateDirect(8 * doubles.length).order(ByteOrder.nativeOrder()) .asDoubleBuffer().put(doubles); - try (Tensor t = TFloat64.tensorOf(doubles_shape, d -> d.write(DataBuffers.of(buf)))) { + try (TFloat64 t = TFloat64.tensorOf(doubles_shape, d -> d.write(DataBuffers.of(buf)))) { double[] actual = new double[doubles.length]; - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertArrayEquals(doubles, actual, EPSILON); } } // validate shape checking - try (Tensor t = Tensor.of(TBool.DTYPE, Shape.of(bools_.length * 2), DataBuffers.of(bools_))) { + try (TBool t = Tensors.of(TBool.DTYPE, Shape.of(bools_.length * 2), DataBuffers.of(bools_))) { fail("should have failed on incompatible buffer"); } catch (IllegalArgumentException e) { // expected @@ -111,9 +111,9 @@ public void createFromBufferWithNativeByteOrder() { .asDoubleBuffer() .put(doubles); flipBuffer(buf); - try (Tensor t = TFloat64.tensorOf(Shape.of(4), DataBuffers.of(buf))) { + try (TFloat64 t = TFloat64.tensorOf(Shape.of(4), DataBuffers.of(buf))) { double[] actual = new double[doubles.length]; - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertArrayEquals(doubles, actual, EPSILON); } } @@ -130,9 +130,9 @@ public void createFromBufferWithNonNativeByteOrder() { .asDoubleBuffer() .put(doubles); flipBuffer(buf); - try (Tensor t = TFloat64.tensorOf(Shape.of(4), DataBuffers.of(buf))) { + try (TFloat64 t = TFloat64.tensorOf(Shape.of(4), DataBuffers.of(buf))) { double[] actual = new double[doubles.length]; - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertArrayEquals(doubles, actual, EPSILON); } } @@ -147,24 +147,24 @@ public void createWithTypedBuffer() { // validate creating a tensor using a typed buffer { Shape shape = Shape.of(4); - try (Tensor t = TFloat64.tensorOf(shape, DataBuffers.of(doubles))) { + try (TFloat64 t = TFloat64.tensorOf(shape, DataBuffers.of(doubles))) { DoubleBuffer actual = DoubleBuffer.allocate(doubles.capacity()); - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertEquals(doubles, actual); } - try (Tensor t = TFloat32.tensorOf(shape, DataBuffers.of(floats))) { + try (TFloat32 t = TFloat32.tensorOf(shape, DataBuffers.of(floats))) { FloatBuffer actual = FloatBuffer.allocate(floats.capacity()); - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertEquals(floats, actual); } - try (Tensor t = TInt32.tensorOf(shape, DataBuffers.of(ints))) { + try (TInt32 t = TInt32.tensorOf(shape, DataBuffers.of(ints))) { IntBuffer actual = IntBuffer.allocate(ints.capacity()); - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertEquals(ints, actual); } - try (Tensor t = TInt64.tensorOf(shape, DataBuffers.of(longs))) { + try (TInt64 t = TInt64.tensorOf(shape, DataBuffers.of(longs))) { LongBuffer actual = LongBuffer.allocate(longs.capacity()); - t.data().read(DataBuffers.of(actual)); + t.read(DataBuffers.of(actual)); assertEquals(longs, actual); } } @@ -172,22 +172,22 @@ public void createWithTypedBuffer() { // validate shape-checking { Shape shape = Shape.of(5); - try (Tensor t = TFloat64.tensorOf(shape, DataBuffers.of(doubles))) { + try (TFloat64 t = TFloat64.tensorOf(shape, DataBuffers.of(doubles))) { fail("should have failed on incompatible buffer"); } catch (BufferUnderflowException e) { // expected } - try (Tensor t = TFloat32.tensorOf(shape, DataBuffers.of(floats))) { + try (TFloat32 t = TFloat32.tensorOf(shape, DataBuffers.of(floats))) { fail("should have failed on incompatible buffer"); } catch (BufferUnderflowException e) { // expected } - try (Tensor t = TInt32.tensorOf(shape, DataBuffers.of(ints))) { + try (TInt32 t = TInt32.tensorOf(shape, DataBuffers.of(ints))) { fail("should have failed on incompatible buffer"); } catch (BufferUnderflowException e) { // expected } - try (Tensor t = TInt64.tensorOf(shape, DataBuffers.of(longs))) { + try (TInt64 t = TInt64.tensorOf(shape, DataBuffers.of(longs))) { fail("should have failed on incompatible buffer"); } catch (BufferUnderflowException e) { // expected @@ -203,11 +203,11 @@ public void readFromRawData() { long[] longs = {1L, 2L, 3L}; boolean[] bools = {true, false, true}; - try (Tensor tints = TInt32.vectorOf(ints); - Tensor tfloats = TFloat32.vectorOf(floats); - Tensor tdoubles = TFloat64.vectorOf(doubles); - Tensor tlongs = TInt64.vectorOf(longs); - Tensor tbools = TBool.vectorOf(bools)) { + try (TInt32 tints = TInt32.vectorOf(ints); + TFloat32 tfloats = TFloat32.vectorOf(floats); + TFloat64 tdoubles = TFloat64.vectorOf(doubles); + TInt64 tlongs = TInt64.vectorOf(longs); + TBool tbools = TBool.vectorOf(bools)) { // validate that any datatype is readable with ByteBuffer (content, position) { @@ -266,79 +266,79 @@ public void readFromRawData() { @Test public void scalars() { - try (Tensor t = TFloat32.scalarOf(2.718f)) { + try (TFloat32 t = TFloat32.scalarOf(2.718f)) { assertEquals(TFloat32.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertEquals(2.718f, t.data().getFloat(), EPSILON_F); + assertEquals(2.718f, t.getFloat(), EPSILON_F); } - try (Tensor t = TFloat64.scalarOf(3.1415)) { + try (TFloat64 t = TFloat64.scalarOf(3.1415)) { assertEquals(TFloat64.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertEquals(3.1415, t.data().getDouble(), EPSILON); + assertEquals(3.1415, t.getDouble(), EPSILON); } - try (Tensor t = TInt32.scalarOf(-33)) { + try (TInt32 t = TInt32.scalarOf(-33)) { assertEquals(TInt32.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertEquals(-33, t.data().getInt()); + assertEquals(-33, t.getInt()); } - try (Tensor t = TInt64.scalarOf(8589934592L)) { + try (TInt64 t = TInt64.scalarOf(8589934592L)) { assertEquals(TInt64.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertEquals(8589934592L, t.data().getLong()); + assertEquals(8589934592L, t.getLong()); } - try (Tensor t = TBool.scalarOf(true)) { + try (TBool t = TBool.scalarOf(true)) { assertEquals(TBool.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertTrue(t.data().getBoolean()); + assertTrue(t.getBoolean()); } - try (Tensor t = TString.scalarOf("sombrero")) { + try (TString t = TString.scalarOf("sombrero")) { assertEquals(TString.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertEquals("sombrero", t.data().getObject()); + assertEquals("sombrero", t.getObject()); } final byte[] bytes = {1, 2, 3, 4}; - try (Tensor t = TString.tensorOfBytes(NdArrays.scalarOfObject(bytes))) { + try (TString t = TString.tensorOfBytes(NdArrays.scalarOfObject(bytes))) { assertEquals(TString.DTYPE, t.dataType()); assertEquals(0, t.shape().numDimensions()); - assertArrayEquals(bytes, t.data().asBytes().getObject()); + assertArrayEquals(bytes, t.asBytes().getObject()); } } @Test public void nDimensional() { DoubleNdArray vector = StdArrays.ndCopyOf(new double[]{1.414, 2.718, 3.1415}); - try (Tensor t = TFloat64.tensorOf(vector)) { + try (TFloat64 t = TFloat64.tensorOf(vector)) { assertEquals(TFloat64.DTYPE, t.dataType()); assertEquals(1, t.shape().numDimensions()); assertEquals(3, t.shape().size(0)); - assertEquals(vector, t.data()); + assertEquals(vector, t); } IntNdArray matrix = StdArrays.ndCopyOf(new int[][]{{1, 2, 3}, {4, 5, 6}}); - try (Tensor t = TInt32.tensorOf(matrix)) { + try (TInt32 t = TInt32.tensorOf(matrix)) { assertEquals(TInt32.DTYPE, t.dataType()); assertEquals(2, t.shape().numDimensions()); assertEquals(2, t.shape().size(0)); assertEquals(3, t.shape().size(1)); - assertEquals(matrix, t.data()); + assertEquals(matrix, t); } LongNdArray threeD = StdArrays.ndCopyOf(new long[][][]{ {{1}, {3}, {5}, {7}, {9}}, {{2}, {4}, {6}, {8}, {0}}, }); - try (Tensor t = TInt64.tensorOf(threeD)) { + try (TInt64 t = TInt64.tensorOf(threeD)) { assertEquals(TInt64.DTYPE, t.dataType()); assertEquals(3, t.shape().numDimensions()); assertEquals(2, t.shape().size(0)); assertEquals(5, t.shape().size(1)); assertEquals(1, t.shape().size(2)); - assertEquals(threeD, t.data()); + assertEquals(threeD, t); } BooleanNdArray fourD = StdArrays.ndCopyOf(new boolean[][][][]{ @@ -346,14 +346,14 @@ public void nDimensional() { {{{false, false, true, true}, {false, true, false, false}}}, {{{false, true, false, true}, {false, true, true, false}}}, }); - try (Tensor t = TBool.tensorOf(fourD)) { + try (TBool t = TBool.tensorOf(fourD)) { assertEquals(TBool.DTYPE, t.dataType()); assertEquals(4, t.shape().numDimensions()); assertEquals(3, t.shape().size(0)); assertEquals(1, t.shape().size(1)); assertEquals(2, t.shape().size(2)); assertEquals(4, t.shape().size(3)); - assertEquals(fourD, t.data()); + assertEquals(fourD, t); } } @@ -365,36 +365,36 @@ public void testNDimensionalStringTensor() { matrix.setObject(String.format("(%d, %d) = %d", i, j, i << j), i, j); } } - try (Tensor t = TString.tensorOf(matrix)) { + try (TString t = TString.tensorOf(matrix)) { assertEquals(TString.DTYPE, t.dataType()); assertEquals(2, t.shape().numDimensions()); assertEquals(4, t.shape().size(0)); assertEquals(3, t.shape().size(1)); - assertEquals(matrix, t.data()); + assertEquals(matrix, t); } NdArray byteMatrix = NdArrays.ofObjects(byte[].class, matrix.shape()); matrix.scalars().forEachIndexed((i, s) -> byteMatrix.setObject(s.getObject().getBytes(UTF_8), i)); - try (Tensor t = TString.tensorOfBytes(byteMatrix)) { + try (TString t = TString.tensorOfBytes(byteMatrix)) { assertEquals(TString.DTYPE, t.dataType()); assertEquals(2, t.shape().numDimensions()); assertEquals(4, t.shape().size(0)); assertEquals(3, t.shape().size(1)); - assertEquals(byteMatrix, t.data().asBytes()); - assertEquals(matrix, t.data()); + assertEquals(byteMatrix, t.asBytes()); + assertEquals(matrix, t); } } @Test public void testUint8TensorFromArray() { byte[] vector = new byte[] {1, 2, 3, 4}; - try (Tensor t = TUint8.vectorOf(vector)) { + try (TUint8 t = TUint8.vectorOf(vector)) { assertEquals(TUint8.DTYPE, t.dataType()); assertEquals(1, t.shape().numDimensions()); assertEquals(4, t.shape().size(0)); byte[] got = new byte[4]; - t.data().read(DataBuffers.of(got)); + t.read(DataBuffers.of(got)); assertArrayEquals(vector, got); } } @@ -402,13 +402,13 @@ public void testUint8TensorFromArray() { @Test public void testCreateFromArrayOfBoxed() { Integer[] vector = new Integer[] {1, 2, 3, 4}; - try (Tensor t = TInt32.tensorOf(Shape.of(4), d -> d.write(DataBuffers.ofObjects(vector)))) { + try (TInt32 t = TInt32.tensorOf(Shape.of(4), d -> d.write(DataBuffers.ofObjects(vector)))) { assertEquals(TInt32.DTYPE, t.dataType()); assertEquals(1, t.shape().numDimensions()); assertEquals(4, t.shape().size(0)); Integer[] got = new Integer[4]; - t.data().read(DataBuffers.ofObjects(got)); + t.read(DataBuffers.ofObjects(got)); assertArrayEquals(vector, got); } } @@ -421,7 +421,7 @@ public void failCreateOnMismatchedDimensions() { invalid[x][y] = new int[x + y + 1]; } } - try (Tensor t = TInt32.tensorOf(StdArrays.ndCopyOf(invalid))) { + try (TInt32 t = TInt32.tensorOf(StdArrays.ndCopyOf(invalid))) { fail("Tensor.create() should fail because of differing sizes in the 3rd dimension"); } catch (IllegalArgumentException e) { // The expected exception. @@ -433,11 +433,11 @@ public void tensorWithZeroDimension() { // Note: Historically, TF Java failed on purpose when trying to allocate a tensor with a shape // that has one or more dimensions set to 0 elements. But Python API allows it, so we should do // the same. - try (Tensor t = TInt32.tensorOf(Shape.of(3, 0, 1))) { + try (TInt32 t = TInt32.tensorOf(Shape.of(3, 0, 1))) { assertEquals(0, t.numBytes()); assertEquals(0, t.shape().size()); } - try (Tensor t = TInt32.tensorOf(StdArrays.ndCopyOf(new int[3][0][1]))) { + try (TInt32 t = TInt32.tensorOf(StdArrays.ndCopyOf(new int[3][0][1]))) { assertEquals(0, t.numBytes()); assertEquals(0, t.shape().size()); } @@ -445,49 +445,37 @@ public void tensorWithZeroDimension() { @Test public void allocateTensorWithSize() { - try (Tensor t = Tensor.of(TInt32.DTYPE, Shape.of(2, 2, 2), 8 * TInt32.DTYPE.byteSize())) { + try (TInt32 t = Tensors.of(TInt32.DTYPE, Shape.of(2, 2, 2), 8 * TInt32.DTYPE.byteSize())) { // ok } - try (Tensor t = Tensor.of(TInt32.DTYPE, Shape.of(2, 2, 2), 9 * TInt32.DTYPE.byteSize())) { + try (TInt32 t = Tensors.of(TInt32.DTYPE, Shape.of(2, 2, 2), 9 * TInt32.DTYPE.byteSize())) { // ok (size requested is larger that minimum space required) } try { - Tensor.of(TInt32.DTYPE, Shape.of(2, 2, 2), 8 * TInt32.DTYPE.byteSize() - 1); + Tensors.of(TInt32.DTYPE, Shape.of(2, 2, 2), 8 * TInt32.DTYPE.byteSize() - 1); fail(); } catch (IllegalArgumentException e) { // as expected } } - @Test - public void useAfterClose() { - int n = 4; - Tensor t = TInt32.scalarOf(n); - t.close(); - try { - t.data(); - } catch (IllegalStateException e) { - // The expected exception. - } - } - @Test public void eagerTensorIsReleasedAfterSessionIsClosed() { - Tensor sum; + TInt32 sum; try (EagerSession session = EagerSession.create()) { Ops tf = Ops.create(session); sum = tf.math.add(tf.constant(10), tf.constant(20)).asTensor(); - sum.nativeHandle(); // does not throw - assertEquals(30, sum.data().getInt()); + ((AbstractTensor)sum).nativeHandle(); // does not throw + assertEquals(30, sum.getInt()); } try { - sum.nativeHandle(); + ((AbstractTensor)sum).nativeHandle(); fail("Tensor native handle should have been closed by ending eager session"); } catch (IllegalStateException e) { // as expected } try { - sum.data().getInt(); + sum.getInt(); fail("Tensor data should not be accessible after tensor is closed"); } catch (IllegalStateException e) { // as expected @@ -503,12 +491,12 @@ public void fromHandle() { // An exception is made for this test, where the pitfalls of this is avoided by not calling // close() on both Tensors. final FloatNdArray matrix = StdArrays.ndCopyOf(new float[][]{{1, 2, 3}, {4, 5, 6}}); - try (Tensor src = TFloat32.tensorOf(matrix)) { - Tensor cpy = Tensor.fromHandle(src.nativeHandle()).expect(TFloat32.DTYPE); + try (TFloat32 src = TFloat32.tensorOf(matrix)) { + TFloat32 cpy = Tensors.fromHandle(((AbstractTensor)src).nativeHandle()).expect(TFloat32.DTYPE); assertEquals(src.dataType(), cpy.dataType()); assertEquals(src.shape().numDimensions(), cpy.shape().numDimensions()); assertEquals(src.shape(), cpy.shape()); - assertEquals(matrix, cpy.data()); + assertEquals(matrix, cpy); } } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/OperandsTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/OperandsTest.java index bc3e418e6f4..f2c27c4cdf0 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/OperandsTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/OperandsTest.java @@ -31,7 +31,7 @@ public void createOutputArrayFromOperandList() { try (Graph g = new Graph()) { Ops tf = Ops.create(g); Split split = tf.split(tf.constant(0), tf.array(0, 1, 2), 3L); - Output[] array = Operands.asOutputs(split.output()); + Output[] array = Operands.asOutputs(tf.scope(), split.output()); assertEquals(split.output().size(), array.length); assertSame(array[0], split.output().get(0)); assertSame(array[1], split.output().get(1)); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/ScopeTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/ScopeTest.java index bbebfd5f454..af3523c9e28 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/ScopeTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/ScopeTest.java @@ -169,11 +169,11 @@ public void composite() { // assertNotNull(g.operation("variance/zero")); // Verify correct results as well. - Tensor result = + TInt32 result = sess.runner().fetch(var1.output()).run().get(0).expect(TInt32.DTYPE); - assertEquals(21704, result.data().getInt()); + assertEquals(21704, result.getInt()); result = sess.runner().fetch(var2.output()).run().get(0).expect(TInt32.DTYPE); - assertEquals(21704, result.data().getInt()); + assertEquals(21704, result.getInt()); } } @@ -189,7 +189,7 @@ static Const create(Scope s, int[] v) { return create(s, TInt32.vectorOf(v)); } - static Const create(Scope s, Tensor value) { + static Const create(Scope s, T value) { return new Const<>( s.env() .opBuilder("Const", s.makeOpName("Const")) diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ConstantTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ConstantTest.java index 266a62bd1ed..cd9f4c94a24 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ConstantTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ConstantTest.java @@ -18,11 +18,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.DoubleBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.LongBuffer; import org.junit.jupiter.api.Test; import org.tensorflow.AutoCloseableList; import org.tensorflow.Graph; @@ -64,8 +59,8 @@ public void createInts() { Constant op2 = Constant.tensorOf(scope, array); try (AutoCloseableList> t = new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) { - assertEquals(array, t.get(0).expect(TInt32.DTYPE).data()); - assertEquals(array, t.get(1).expect(TInt32.DTYPE).data()); + assertEquals(array, t.get(0).expect(TInt32.DTYPE)); + assertEquals(array, t.get(1).expect(TInt32.DTYPE)); } } } @@ -83,8 +78,8 @@ public void createFloats() { Constant op2 = Constant.tensorOf(scope, array); try (AutoCloseableList> t = new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) { - assertEquals(array, t.get(0).expect(TFloat32.DTYPE).data()); - assertEquals(array, t.get(1).expect(TFloat32.DTYPE).data()); + assertEquals(array, t.get(0).expect(TFloat32.DTYPE)); + assertEquals(array, t.get(1).expect(TFloat32.DTYPE)); } } } @@ -102,8 +97,8 @@ public void createDoubles() { Constant op2 = Constant.tensorOf(scope, array); try (AutoCloseableList> t = new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) { - assertEquals(array, t.get(0).expect(TFloat64.DTYPE).data()); - assertEquals(array, t.get(1).expect(TFloat64.DTYPE).data()); + assertEquals(array, t.get(0).expect(TFloat64.DTYPE)); + assertEquals(array, t.get(1).expect(TFloat64.DTYPE)); } } } @@ -121,8 +116,8 @@ public void createLongs() { Constant op2 = Constant.tensorOf(scope, array); try (AutoCloseableList> t = new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) { - assertEquals(array, t.get(0).expect(TInt64.DTYPE).data()); - assertEquals(array, t.get(1).expect(TInt64.DTYPE).data()); + assertEquals(array, t.get(0).expect(TInt64.DTYPE)); + assertEquals(array, t.get(1).expect(TInt64.DTYPE)); } } } @@ -140,8 +135,8 @@ public void createStrings() throws IOException { Constant op2 = Constant.tensorOf(scope, array); try (AutoCloseableList> t = new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) { - assertEquals(array, t.get(0).expect(TString.DTYPE).data()); - assertEquals(array, t.get(1).expect(TString.DTYPE).data()); + assertEquals(array, t.get(0).expect(TString.DTYPE)); + assertEquals(array, t.get(1).expect(TString.DTYPE)); } } } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GeneratedOperationsTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GeneratedOperationsTest.java index a337bd73098..8d0c4764a91 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GeneratedOperationsTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GeneratedOperationsTest.java @@ -36,8 +36,8 @@ public void tensorInputTensorOutput() { Session sess = new Session(g)) { Ops ops = Ops.create(g); Operand x = ops.math.add(ops.constant(1), ops.constant(2)); - try (Tensor result = sess.runner().fetch(x).run().get(0).expect(TInt32.DTYPE)) { - assertEquals(3, result.data().getInt()); + try (TInt32 result = sess.runner().fetch(x).run().get(0).expect(TInt32.DTYPE)) { + assertEquals(3, result.getInt()); } } } @@ -52,8 +52,8 @@ public void testListInputTensorOutput() { inputs.add(ops.constant(2)); inputs.add(ops.constant(3)); Operand x = ops.math.addN(inputs); - try (Tensor result = sess.runner().fetch(x).run().get(0).expect(TInt32.DTYPE)) { - assertEquals(6, result.data().getInt()); + try (TInt32 result = sess.runner().fetch(x).run().get(0).expect(TInt32.DTYPE)) { + assertEquals(6, result.getInt()); } } } @@ -77,8 +77,8 @@ public void testControlDependencies() { Operand x = ops.withControlDependencies(controls).math.add(variable, ops.constant(0)); sess.runner().addTarget(initVariable).run(); - try (Tensor result = sess.runner().fetch(x).run().get(0).expect(TInt32.DTYPE)) { - assertEquals(3, result.data().getInt()); + try (TInt32 result = sess.runner().fetch(x).run().get(0).expect(TInt32.DTYPE)) { + assertEquals(3, result.getInt()); } } } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java index fe1503d415f..3303904f9e6 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java @@ -47,13 +47,13 @@ public void createGradients() { assertNotNull(grads.dy()); assertEquals(2, grads.dy().size()); - try (Tensor c = TFloat32.scalarOf(3.0f); + try (TFloat32 c = TFloat32.scalarOf(3.0f); AutoCloseableList> outputs = new AutoCloseableList<>( sess.runner().feed(x, c).fetch(grads.dy(0)).fetch(grads.dy(1)).run())) { - assertEquals(108.0f, outputs.get(0).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); - assertEquals(18.0f, outputs.get(1).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); + assertEquals(108.0f, outputs.get(0).expect(TFloat32.DTYPE).getFloat(), 0.0f); + assertEquals(18.0f, outputs.get(1).expect(TFloat32.DTYPE).getFloat(), 0.0f); } } } @@ -74,11 +74,11 @@ public void createGradientsWithSum() { assertNotNull(grads.dy()); assertEquals(1, grads.dy().size()); - try (Tensor c = TFloat32.scalarOf(3.0f); + try (TFloat32 c = TFloat32.scalarOf(3.0f); AutoCloseableList> outputs = new AutoCloseableList<>(sess.runner().feed(x, c).fetch(grads.dy(0)).run())) { - assertEquals(114.0f, outputs.get(0).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); + assertEquals(114.0f, outputs.get(0).expect(TFloat32.DTYPE).getFloat(), 0.0f); } } } @@ -100,12 +100,12 @@ public void createGradientsWithInitialValues() { assertNotNull(grads1.dy()); assertEquals(1, grads1.dy().size()); - try (Tensor c = TFloat32.scalarOf(3.0f); + try (TFloat32 c = TFloat32.scalarOf(3.0f); AutoCloseableList> outputs = new AutoCloseableList<>( sess.runner().feed(x, c).fetch(grads1.dy(0)).run())) { - assertEquals(108.0f, outputs.get(0).expect(TFloat32.DTYPE).data().getFloat(), 0.0f); + assertEquals(108.0f, outputs.get(0).expect(TFloat32.DTYPE).getFloat(), 0.0f); } } } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ShapesTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ShapesTest.java index d5eb7412ea3..583b3d14a0f 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ShapesTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ShapesTest.java @@ -47,15 +47,15 @@ public void testFlatten_Operand() { Shape tfshape = Shape.create(scope, actual, TInt64.DTYPE); AtomicInteger index = new AtomicInteger(); - try (Tensor result1 = + try (TInt64 result1 = session.runner().fetch(tfshape.asOutput()).run().get(0).expect(TInt64.DTYPE); - Tensor result2 = + TInt64 result2 = session.runner().fetch(expResult.asOutput()).run().get(0).expect(TInt64.DTYPE)) { result1 - .data() + .scalars() .forEach( - s -> assertEquals(result2.data().getLong(index.getAndIncrement()), s.getLong())); + s -> assertEquals(result2.getLong(index.getAndIncrement()), s.getLong())); } } } @@ -75,12 +75,12 @@ public void testFlatten_Shape() { AtomicInteger index = new AtomicInteger(); flattened .asOutput() - .data() + .asTensor() .scalars() .forEach( s -> assertEquals( - expShape.asOutput().data().getLong(index.getAndIncrement()), s.getLong())); + expShape.asTensor().getLong(index.getAndIncrement()), s.getLong())); } } @@ -97,9 +97,9 @@ public void testSize_Shape() { Operand size = Shapes.size(scope, tfshape, TInt64.DTYPE); AtomicInteger index = new AtomicInteger(); - try (Tensor result1 = + try (TInt64 result1 = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt64.DTYPE)) { - result1.data().scalars().forEach(s -> assertEquals(8, s.getLong())); + result1.scalars().forEach(s -> assertEquals(8, s.getLong())); } } } @@ -116,21 +116,21 @@ public void testSize_Shape_Operand() { Shape tfshape = Shape.create(scope, actual); Operand size = Shapes.size(scope, tfshape, Constant.scalarOf(scope, 0)); - try (Tensor result = + try (TInt32 result = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(4, s.getInt())); + result.scalars().forEach(s -> assertEquals(4, s.getInt())); } size = Shapes.size(scope, tfshape, Constant.scalarOf(scope, 1)); - try (Tensor result = + try (TInt32 result = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(2, s.getInt())); + result.scalars().forEach(s -> assertEquals(2, s.getInt())); } size = Shapes.size(scope, tfshape, Constant.scalarOf(scope, 2)); - try (Tensor result = + try (TInt32 result = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(1, s.getInt())); + result.scalars().forEach(s -> assertEquals(1, s.getInt())); } } } @@ -146,21 +146,21 @@ public void testSize_Operand_Operand() { Reshape.create(scope, operand, Constant.vectorOf(scope, new long[] {4, 2, 1})); Operand size = Shapes.size(scope, actual, Constant.scalarOf(scope, 0)); - try (Tensor result = + try (TInt32 result = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(4, s.getInt())); + result.scalars().forEach(s -> assertEquals(4, s.getInt())); } size = Shapes.size(scope, actual, Constant.scalarOf(scope, 1)); - try (Tensor result = + try (TInt32 result = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(2, s.getInt())); + result.scalars().forEach(s -> assertEquals(2, s.getInt())); } size = Shapes.size(scope, actual, Constant.scalarOf(scope, 2)); - try (Tensor result = + try (TInt32 result = session.runner().fetch(size.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(1, s.getInt())); + result.scalars().forEach(s -> assertEquals(1, s.getInt())); } } } @@ -177,9 +177,9 @@ public void testNumDimensions() { Shape tfshape = Shape.create(scope, actual); Operand nDims = Shapes.numDimensions(scope, tfshape); - try (Tensor result = + try (TInt32 result = session.runner().fetch(nDims.asOutput()).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(3, s.getInt())); + result.scalars().forEach(s -> assertEquals(3, s.getInt())); } } } @@ -199,7 +199,7 @@ public void testReduceDims_Operand_Operand() { AtomicInteger index = new AtomicInteger(); int[] expected = {8}; reducedShape - .data() + .asTensor() .scalars() .forEach( s -> { @@ -224,7 +224,7 @@ public void testReduceDims_Shape_Operand() { AtomicInteger index = new AtomicInteger(); int[] expected1 = {8}; reducedShape - .data() + .asTensor() .scalars() .forEach( s -> { @@ -237,7 +237,7 @@ public void testReduceDims_Shape_Operand() { index.set(0); int[] expected2 = {2, 4}; reducedShape - .data() + .asTensor() .scalars() .forEach( s -> { @@ -250,7 +250,7 @@ public void testReduceDims_Shape_Operand() { index.set(0); int[] expected3 = {2, 2, 2}; reducedShape - .data() + .asTensor() .scalars() .forEach( s -> { @@ -274,10 +274,10 @@ public void testSqueeze() { Operand squeezed = Shapes.squeeze(scope, tfshape); AtomicInteger index = new AtomicInteger(); int[] expected = {4, 2}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(squeezed.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -301,10 +301,10 @@ public void testHead() { Operand head = Shapes.head(scope, tfshape); AtomicInteger index = new AtomicInteger(); int[] expected = {4}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(head.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -328,10 +328,10 @@ public void testTake() { Operand take = Shapes.take(scope, tfshape, Constant.scalarOf(scope, 2)); AtomicInteger index = new AtomicInteger(); int[] expected = {4, 1}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(take.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -355,10 +355,10 @@ public void testTail() { Operand tail = Shapes.tail(scope, tfshape); AtomicInteger index = new AtomicInteger(); int[] expected = {1}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(tail.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -382,10 +382,10 @@ public void testTakeLast() { Operand takeLast = Shapes.takeLast(scope, tfshape, Constant.scalarOf(scope, 3)); AtomicInteger index = new AtomicInteger(); int[] expected = {1, 2, 1}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(takeLast.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -408,10 +408,10 @@ public void testPrependInt() { Operand prepend = Shapes.prepend(scope, tfshape, 3); AtomicInteger index = new AtomicInteger(); int[] expected = {3, 4, 2}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(prepend.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -434,10 +434,10 @@ public void testPrependLong() { Operand prepend = Shapes.prepend(scope, tfshape, 1L); AtomicInteger index = new AtomicInteger(); long[] expected = {1, 4, 2}; - try (Tensor result = + try (TInt64 result = session.runner().fetch(prepend.asOutput()).run().get(0).expect(TInt64.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -465,10 +465,10 @@ public void testPrependShapeTInt32() { Operand prepend = Shapes.prepend(scope, tfshape1, tfshape2); AtomicInteger index = new AtomicInteger(); int[] expected = {2, 4, 4, 2}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(prepend.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -496,10 +496,10 @@ public void testPrependShapeTInt64() { Operand prepend = Shapes.prepend(scope, tfshape1, tfshape2); AtomicInteger index = new AtomicInteger(); long[] expected = {2, 4, 4, 2}; - try (Tensor result = + try (TInt64 result = session.runner().fetch(prepend.asOutput()).run().get(0).expect(TInt64.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -522,10 +522,10 @@ public void testAppendLong() { Operand append = Shapes.append(scope, tfshape, 2L); AtomicInteger index = new AtomicInteger(); long[] expected = {4L, 2L, 2L}; - try (Tensor result = + try (TInt64 result = session.runner().fetch(append.asOutput()).run().get(0).expect(TInt64.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -548,10 +548,10 @@ public void testAppendInt() { Operand append = Shapes.append(scope, tfshape, 2); AtomicInteger index = new AtomicInteger(); int[] expected = {4, 2, 2}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(append.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -579,10 +579,10 @@ public void testAppendShapeTInt32() { Operand append = Shapes.append(scope, tfshape1, tfshape2); AtomicInteger index = new AtomicInteger(); int[] expected = {4, 2, 2, 4}; - try (Tensor result = + try (TInt32 result = session.runner().fetch(append.asOutput()).run().get(0).expect(TInt32.DTYPE)) { result - .data() + .scalars() .forEach( s -> { @@ -610,10 +610,10 @@ public void testAppendShapeTInt64() { Operand append = Shapes.append(scope, tfshape1, tfshape2); AtomicInteger index = new AtomicInteger(); long[] expected = {4, 2, 2, 4}; - try (Tensor result = + try (TInt64 result = session.runner().fetch(append.asOutput()).run().get(0).expect(TInt64.DTYPE)) { result - .data() + .scalars() .forEach( s -> { diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java index 9600f8b38fc..55dcef5ae3c 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java @@ -42,8 +42,8 @@ public void createIntZeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TInt32.DTYPE); - try (Tensor result = sess.runner().fetch(op).run().get(0).expect(TInt32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(0, s.getInt())); + try (TInt32 result = sess.runner().fetch(op).run().get(0).expect(TInt32.DTYPE)) { + result.scalars().forEach(s -> assertEquals(0, s.getInt())); } } } @@ -55,8 +55,8 @@ public void createFloatZeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TFloat32.DTYPE); - try (Tensor result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TFloat32.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(0.0f, s.getFloat(), 0)); + try (TFloat32 result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TFloat32.DTYPE)) { + result.scalars().forEach(s -> assertEquals(0.0f, s.getFloat(), 0)); } } } @@ -68,8 +68,8 @@ public void createDoubleZeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TFloat64.DTYPE); - try (Tensor result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TFloat64.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(0.0f, s.getDouble(), 0)); + try (TFloat64 result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TFloat64.DTYPE)) { + result.scalars().forEach(s -> assertEquals(0.0f, s.getDouble(), 0)); } } } @@ -81,8 +81,8 @@ public void createLongZeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TInt64.DTYPE); - try (Tensor result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TInt64.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(0L, s.getLong())); + try (TInt64 result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TInt64.DTYPE)) { + result.scalars().forEach(s -> assertEquals(0L, s.getLong())); } } } @@ -94,8 +94,8 @@ public void createBooleanZeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TBool.DTYPE); - try (Tensor result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TBool.DTYPE)) { - result.data().scalars().forEach(s -> assertFalse(s.getBoolean())); + try (TBool result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TBool.DTYPE)) { + result.scalars().forEach(s -> assertFalse(s.getBoolean())); } } } @@ -107,8 +107,8 @@ public void createUint8Zeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TUint8.DTYPE); - try (Tensor result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TUint8.DTYPE)) { - result.data().scalars().forEach(s -> assertEquals(0, s.getByte())); + try (TUint8 result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TUint8.DTYPE)) { + result.scalars().forEach(s -> assertEquals(0, s.getByte())); } } } @@ -120,8 +120,8 @@ public void createStringZeros() { Scope scope = new Scope(g); long[] shape = {2, 2}; Zeros op = Zeros.create(scope, Constant.vectorOf(scope, shape), TString.DTYPE); - try (Tensor result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TString.DTYPE)) { - result.data().scalars().forEach(s -> assertTrue(s.getObject().isEmpty())); + try (TString result = sess.runner().fetch(op.asOutput()).run().get(0).expect(TString.DTYPE)) { + result.scalars().forEach(s -> assertTrue(s.getObject().isEmpty())); } } } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/NumericTypesTestBase.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/NumericTypesTestBase.java index 87b24b0da2a..3c7dbea1450 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/NumericTypesTestBase.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/NumericTypesTestBase.java @@ -20,91 +20,97 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import org.tensorflow.DataType; import org.tensorflow.EagerSession; -import org.tensorflow.Tensor; -import org.tensorflow.op.Ops; -import org.tensorflow.op.core.Constant; -import org.tensorflow.op.math.Sub; -import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.IntNdArray; import org.tensorflow.ndarray.NdArray; import org.tensorflow.ndarray.NdArrays; +import org.tensorflow.ndarray.Shape; import org.tensorflow.ndarray.index.Indices; +import org.tensorflow.op.Ops; +import org.tensorflow.op.core.Constant; +import org.tensorflow.op.math.Add; +import org.tensorflow.op.math.Pow; +import org.tensorflow.op.math.Sub; +import org.tensorflow.tensor.IntTensor; import org.tensorflow.types.family.TNumber; -abstract class NumericTypesTestBase, U> { +abstract class NumericTypesTestBase { @Test public void initializeTensorsWithZeros() { // Allocate a tensor of 32-bits integer of the shape (2, 3, 2) - Tensor tensor = allocateTensor(Shape.of(2, 3, 2)); - NdArray tensorData = tensor.data(); + T tensor = allocateTensor(Shape.of(2, 3, 2)); - assertEquals(3, tensorData.rank()); - assertEquals(12, tensorData.size()); + assertEquals(3, tensor.rank()); + assertEquals(12, tensor.size()); try (EagerSession session = EagerSession.create()) { Ops tf = Ops.create(session); // Initialize tensor memory with zeros and take a snapshot - tensorData.scalars().forEach(scalar -> scalar.setObject(valueOf(0))); - Constant x = tf.constant(tensor); + tensor.scalars().forEach(scalar -> ((NdArray)scalar).setObject(valueOf(0))); + Constant x = tf.capture(tensor); // Initialize the same tensor memory with ones and take a snapshot - tensorData.scalars().forEach(scalar -> scalar.setObject(valueOf(1))); - Constant y = tf.constant(tensor); + tensor.scalars().forEach(scalar -> ((NdArray)scalar).setObject(valueOf(1))); + Constant y = tf.capture(tensor); // Subtract y from x and validate the result Sub sub = tf.math.sub(x, y); - sub.data().scalars().forEach(scalar -> - assertEquals(valueOf(-1), scalar.getObject()) + sub.asTensor().scalars().forEach(scalar -> + assertEquals(valueOf(-1), ((NdArray)scalar).getObject()) ); } } @Test - public void genericTest() { - IntNdArray heapData = NdArrays.vectorOf(0, 1, 2, 3); + public void setAndCompute() { + NdArray heapData = allocateNdArray(Shape.of(4)) + .setObject(valueOf(0), 0) + .setObject(valueOf(1), 1) + .setObject(valueOf(2), 2) + .setObject(valueOf(3), 3); // Creates a 2x2 matrix - try (Tensor tensor = TInt32.tensorOf(Shape.of(2, 2))) { - IntNdArray tensorData = tensor.data(); + try (T tensor = allocateTensor(Shape.of(2, 2))) { // Copy first 2 values of the vector to the first row of the matrix - tensorData.set(heapData.slice(Indices.range(0, 2)), 0); + tensor.set(heapData.slice(Indices.range(0, 2)), 0); // Copy values at an odd position in the vector as the second row of the matrix - tensorData.set(heapData.slice(Indices.odd()), 1); + tensor.set(heapData.slice(Indices.odd()), 1); - assertEquals(0, tensorData.getInt(0, 0)); - assertEquals(1, tensorData.getInt(0, 1)); - assertEquals(1, tensorData.getInt(1, 0)); - assertEquals(3, tensorData.getInt(1, 1)); + assertEquals(valueOf(0), tensor.getObject(0, 0)); + assertEquals(valueOf(1), tensor.getObject(0, 1)); + assertEquals(valueOf(1), tensor.getObject(1, 0)); + assertEquals(valueOf(3), tensor.getObject(1, 1)); // Read rows of the tensor in reverse order - IntNdArray reversedTensorData = tensorData.slice(Indices.all(), Indices.flip()); + NdArray flippedData = tensor.slice(Indices.flip(), Indices.flip()); - assertEquals(1, reversedTensorData.getInt(0, 0)); - assertEquals(0, reversedTensorData.getInt(0, 1)); - assertEquals(3, reversedTensorData.getInt(1, 0)); - assertEquals(1, reversedTensorData.getInt(1, 1)); + assertEquals(valueOf(3), flippedData.getObject(0, 0)); + assertEquals(valueOf(1), flippedData.getObject(0, 1)); + assertEquals(valueOf(1), flippedData.getObject(1, 0)); + assertEquals(valueOf(0), flippedData.getObject(1, 1)); try (EagerSession session = EagerSession.create()) { Ops tf = Ops.create(session); - // Compute the power of the tensor by itself - Constant x = tf.constant(tensor); - IntNdArray result = tf.math.pow(x, x).data(); + Add add = tf.math.add(tensor, tensor); + T result = add.asTensor(); - // Validate result by computing the same operation in Java - tensorData.scalars().forEachIndexed((coords, s) -> - assertEquals(Math.pow(s.getInt(), s.getInt()), result.getInt(coords), 1e-7f) - ); + assertEquals(valueOf(0), result.getObject(0, 0)); + assertEquals(valueOf(2), result.getObject(0, 1)); + assertEquals(valueOf(2), result.getObject(1, 0)); + assertEquals(valueOf(6), result.getObject(1, 1)); } } } - abstract Tensor allocateTensor(Shape shape); + abstract T allocateTensor(Shape shape); + + abstract NdArray allocateNdArray(Shape shape); abstract U valueOf(Integer value); } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TBfloat16Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TBfloat16Test.java index 8681e805e3d..70051fd1fc7 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TBfloat16Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TBfloat16Test.java @@ -18,15 +18,22 @@ package org.tensorflow.types; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; public class TBfloat16Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TBfloat16 allocateTensor(Shape shape) { return TBfloat16.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofFloats(shape); + } + @Override Float valueOf(Integer value) { return value.floatValue(); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat16Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat16Test.java index b72fe6fc01c..7fd65ba9654 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat16Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat16Test.java @@ -18,15 +18,22 @@ package org.tensorflow.types; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; public class TFloat16Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TFloat16 allocateTensor(Shape shape) { return TFloat16.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofFloats(shape); + } + @Override Float valueOf(Integer value) { return value.floatValue(); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat32Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat32Test.java index c4b1f6023f3..938179ab8f3 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat32Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat32Test.java @@ -18,15 +18,22 @@ package org.tensorflow.types; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; public class TFloat32Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TFloat32 allocateTensor(Shape shape) { return TFloat32.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofFloats(shape); + } + @Override Float valueOf(Integer value) { return value.floatValue(); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat64Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat64Test.java index 0e9c8947d0f..5eaf391692c 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat64Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TFloat64Test.java @@ -18,15 +18,22 @@ package org.tensorflow.types; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; public class TFloat64Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TFloat64 allocateTensor(Shape shape) { return TFloat64.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofDoubles(shape); + } + @Override Double valueOf(Integer value) { return value.doubleValue(); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt32Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt32Test.java index c52394bf210..5cae9392122 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt32Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt32Test.java @@ -17,16 +17,32 @@ package org.tensorflow.types; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; +import org.tensorflow.EagerSession; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.IntNdArray; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; +import org.tensorflow.ndarray.index.Indices; +import org.tensorflow.op.Ops; +import org.tensorflow.op.core.Constant; +import org.tensorflow.tensor.IntTensor; public class TInt32Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TInt32 allocateTensor(Shape shape) { return TInt32.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofInts(shape); + } + @Override Integer valueOf(Integer value) { return value; diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt64Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt64Test.java index 261ac546fc5..23af4f10c6a 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt64Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TInt64Test.java @@ -18,15 +18,22 @@ package org.tensorflow.types; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; public class TInt64Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TInt64 allocateTensor(Shape shape) { return TInt64.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofLongs(shape); + } + @Override Long valueOf(Integer value) { return value.longValue(); diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TStringTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TStringTest.java index 40331543370..827f466ff5e 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TStringTest.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TStringTest.java @@ -32,25 +32,19 @@ public class TStringTest { @Test public void createScalar() { - Tensor tensor = TString.scalarOf("Pretty vacant"); + TString tensor = TString.scalarOf("Pretty vacant"); assertNotNull(tensor); - - TString data = tensor.data(); - assertNotNull(data); - assertEquals(Shape.scalar(), data.shape()); - assertEquals("Pretty vacant", data.getObject()); + assertEquals(Shape.scalar(), tensor.shape()); + assertEquals("Pretty vacant", tensor.getObject()); } @Test public void createVector() { - Tensor tensor = TString.vectorOf("Pretty", "vacant"); + TString tensor = TString.vectorOf("Pretty", "vacant"); assertNotNull(tensor); - - TString data = tensor.data(); - assertNotNull(data); - assertEquals(Shape.of(2), data.shape()); - assertEquals("Pretty", data.getObject(0)); - assertEquals("vacant", data.getObject(1)); + assertEquals(Shape.of(2), tensor.shape()); + assertEquals("Pretty", tensor.getObject(0)); + assertEquals("vacant", tensor.getObject(1)); } @Test @@ -61,30 +55,27 @@ public void createCopy() { .setObject("New", 1, 0) .setObject("York", 1, 1); - Tensor tensor = TString.tensorOf(strings); + TString tensor = TString.tensorOf(strings); assertNotNull(tensor); - - TString data = tensor.data(); - assertNotNull(data); strings.scalars().forEachIndexed((idx, s) -> - assertEquals(s.getObject(), data.getObject(idx)) + assertEquals(s.getObject(), tensor.getObject(idx)) ); } @Test public void defaultCharsetIsUtf8() { - Tensor tensor = TString.tensorOf(NdArrays.scalarOfObject(BABY_CHICK)); - byte[] bytes = tensor.data().asBytes().getObject(); + TString tensor = TString.tensorOf(NdArrays.scalarOfObject(BABY_CHICK)); + byte[] bytes = tensor.asBytes().getObject(); assertArrayEquals(new byte[] { (byte)0xF0, (byte)0x9F, (byte)0x90, (byte)0xA5 }, bytes); - assertEquals(BABY_CHICK, tensor.data().getObject()); + assertEquals(BABY_CHICK, tensor.getObject()); } @Test public void usingDifferentCharset() { - Tensor tensor = TString.tensorOf(StandardCharsets.UTF_16LE, NdArrays.scalarOfObject(BABY_CHICK)); - byte[] bytes = tensor.data().asBytes().getObject(); + TString tensor = TString.tensorOf(StandardCharsets.UTF_16LE, NdArrays.scalarOfObject(BABY_CHICK)); + byte[] bytes = tensor.asBytes().getObject(); assertArrayEquals(new byte[] { (byte)0x3D, (byte)0xD8, (byte)0x25, (byte)0xDC }, bytes); - assertEquals(BABY_CHICK, tensor.data().using(StandardCharsets.UTF_16LE).getObject()); + assertEquals(BABY_CHICK, tensor.using(StandardCharsets.UTF_16LE).getObject()); } @Test @@ -94,11 +85,11 @@ public void initializingTensorWithRawBytes() { for (int i = 0; i < strings.length; ++i) { bytes.setObject(strings[i].getBytes(), i); } - Tensor tensor = TString.tensorOfBytes(bytes); + TString tensor = TString.tensorOfBytes(bytes); assertNotNull(tensor); assertEquals(bytes.shape(), tensor.shape()); - NdArray tensorBytes = tensor.data().asBytes(); + NdArray tensorBytes = tensor.asBytes(); for (int i = 0; i < strings.length; ++i) { assertArrayEquals(bytes.getObject(i), tensorBytes.getObject(i)); } diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TUint8Test.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TUint8Test.java index cc83087e018..e2ba52ef10b 100644 --- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TUint8Test.java +++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TUint8Test.java @@ -18,15 +18,22 @@ package org.tensorflow.types; import org.tensorflow.Tensor; +import org.tensorflow.ndarray.NdArray; +import org.tensorflow.ndarray.NdArrays; import org.tensorflow.ndarray.Shape; public class TUint8Test extends NumericTypesTestBase { @Override - Tensor allocateTensor(Shape shape) { + TUint8 allocateTensor(Shape shape) { return TUint8.tensorOf(shape); } + @Override + NdArray allocateNdArray(Shape shape) { + return NdArrays.ofBytes(shape); + } + @Override Byte valueOf(Integer value) { return value.byteValue(); diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/data/DatasetIterator.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/data/DatasetIterator.java index 9c89c1b319d..f71d04838b1 100644 --- a/tensorflow-framework/src/main/java/org/tensorflow/framework/data/DatasetIterator.java +++ b/tensorflow-framework/src/main/java/org/tensorflow/framework/data/DatasetIterator.java @@ -272,7 +272,7 @@ public Iterator>> iterator() { @Override public boolean hasNext() { - return nextOptional.hasValue().data().getBoolean(); + return nextOptional.hasValue().asTensor().getBoolean(); } @Override diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/BatchDatasetTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/BatchDatasetTest.java index 6a54cb08de6..e3c5c6ad06b 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/BatchDatasetTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/BatchDatasetTest.java @@ -45,14 +45,10 @@ public void testEagerBatchDataset() { int count = 0; for (List> components : dataset) { - try (Tensor batch1 = - components.get(0).asTensor().expect(TInt32.DTYPE); - Tensor batch2 = - components.get(1).asTensor().expect(TInt32.DTYPE);) { - - assertEquals(testMatrix1.slice(range(count, count + 2)), batch1.data()); - assertEquals(testMatrix2.slice(range(count, count + 2)), batch2.data()); - + try (TInt32 batch1 = components.get(0).asTensor(TInt32.DTYPE); + TInt32 batch2 = components.get(1).asTensor(TInt32.DTYPE);) { + assertEquals(testMatrix1.slice(range(count, count + 2)), batch1); + assertEquals(testMatrix2.slice(range(count, count + 2)), batch2); count += 2; } } @@ -63,23 +59,16 @@ public void testDropLastBatch() { Ops tf = Ops.create(); Dataset dataset = Dataset .fromTensorSlices(tf, - Arrays.asList( - tf.constant(testMatrix1), - tf.constant(testMatrix2)), + Arrays.asList(tf.constant(testMatrix1), tf.constant(testMatrix2)), Arrays.asList(TInt32.DTYPE, TInt32.DTYPE)) .batch(3, true); int count = 0; for (List> components : dataset) { - - try (Tensor batch1 = - components.get(0).asTensor().expect(TInt32.DTYPE); - Tensor batch2 = - components.get(1).asTensor().expect(TInt32.DTYPE);) { - - assertEquals(testMatrix1.slice(range(count, count + 3)), batch1.data()); - assertEquals(testMatrix2.slice(range(count, count + 3)), batch2.data()); - + try (TInt32 batch1 = components.get(0).asTensor(TInt32.DTYPE); + TInt32 batch2 = components.get(1).asTensor(TInt32.DTYPE);) { + assertEquals(testMatrix1.slice(range(count, count + 3)), batch1); + assertEquals(testMatrix2.slice(range(count, count + 3)), batch2); count += 3; } } @@ -90,9 +79,7 @@ public void testKeepLastBatch() { Ops tf = Ops.create(); Dataset dataset = Dataset .fromTensorSlices(tf, - Arrays.asList( - tf.constant(testMatrix1), - tf.constant(testMatrix2)), + Arrays.asList(tf.constant(testMatrix1), tf.constant(testMatrix2)), Arrays.asList(TInt32.DTYPE, TInt32.DTYPE)) .batch(3, false); @@ -100,21 +87,15 @@ public void testKeepLastBatch() { boolean foundLastBatch = false; for (List> components : dataset) { - try (Tensor batch1 = - components.get(0).asTensor().expect(TInt32.DTYPE); - Tensor batch2 = - components.get(1).asTensor().expect(TInt32.DTYPE);) { + try (TInt32 batch1 = components.get(0).asTensor(TInt32.DTYPE); + TInt32 batch2 = components.get(1).asTensor(TInt32.DTYPE);) { if (count == 0) { - assertEquals(testMatrix1.slice(range(count, count + 3)), - batch1.data()); - assertEquals(testMatrix2.slice(range(count, count + 3)), - batch2.data()); + assertEquals(testMatrix1.slice(range(count, count + 3)), batch1); + assertEquals(testMatrix2.slice(range(count, count + 3)), batch2); count += 3; } else { - assertEquals(testMatrix1.slice(range(count, count + 1)), - batch1.data()); - assertEquals(testMatrix2.slice(range(count, count + 1)), - batch2.data()); + assertEquals(testMatrix1.slice(range(count, count + 1)), batch1); + assertEquals(testMatrix2.slice(range(count, count + 1)), batch2); foundLastBatch = true; } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/DatasetIteratorTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/DatasetIteratorTest.java index 6bb6e21f330..d89419e8a3d 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/DatasetIteratorTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/DatasetIteratorTest.java @@ -56,10 +56,10 @@ public void testGraphIteration() { try { List> outputs = session.runner().fetch(x).fetch(y).run(); - try (Tensor xBatch = outputs.get(0).expect(TInt32.DTYPE); - Tensor yBatch = outputs.get(1).expect(TInt32.DTYPE)) { - assertEquals(testMatrix1.get(batches), xBatch.data()); - assertEquals(testMatrix2.get(batches), yBatch.data()); + try (TInt32 xBatch = outputs.get(0).expect(TInt32.DTYPE); + TInt32 yBatch = outputs.get(1).expect(TInt32.DTYPE)) { + assertEquals(testMatrix1.get(batches), xBatch); + assertEquals(testMatrix2.get(batches), yBatch); batches++; } } catch (TFOutOfRangeException e) { @@ -82,12 +82,10 @@ public void testEagerIteration() { Dataset dataset = Dataset.fromTensorSlices(tf, tensors, dataTypes); int count = 0; for (List> outputs : dataset) { - try (Tensor batch1 = outputs.get(0).asTensor().expect(TInt32.DTYPE); - Tensor batch2 = outputs.get(1).asTensor().expect(TInt32.DTYPE); ) { - - assertEquals(testMatrix1.get(count), batch1.data()); - assertEquals(testMatrix2.get(count), batch2.data()); - + try (TInt32 batch1 = outputs.get(0).asTensor(TInt32.DTYPE); + TInt32 batch2 = outputs.get(1).asTensor(TInt32.DTYPE); ) { + assertEquals(testMatrix1.get(count), batch1); + assertEquals(testMatrix2.get(count), batch2); count++; } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/MapDatasetTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/MapDatasetTest.java index 5960442ff70..c1dc0a98097 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/MapDatasetTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/MapDatasetTest.java @@ -81,12 +81,10 @@ public void testGraphIteration() { try { List> outputs = session.runner().fetch(X).fetch(y).run(); - try (Tensor XBatch = outputs.get(0).expect(TInt32.DTYPE); - Tensor yBatch = outputs.get(1).expect(TInt32.DTYPE)) { - - assertEquals(mapped1.get(batches), XBatch.data()); - assertEquals(mapped2.get(batches), yBatch.data()); - + try (TInt32 XBatch = outputs.get(0).expect(TInt32.DTYPE); + TInt32 yBatch = outputs.get(1).expect(TInt32.DTYPE)) { + assertEquals(mapped1.get(batches), XBatch); + assertEquals(mapped2.get(batches), yBatch); batches++; } } catch (TFOutOfRangeException e) { @@ -114,12 +112,10 @@ public void testEagerIteration() { int count = 0; for (List> outputs : dataset) { - try (Tensor XBatch = outputs.get(0).asTensor().expect(TInt32.DTYPE); - Tensor yBatch = outputs.get(1).asTensor().expect(TInt32.DTYPE); ) { - - assertEquals(mapped1.get(count), XBatch.data()); - assertEquals(mapped2.get(count), yBatch.data()); - + try (TInt32 XBatch = outputs.get(0).asTensor(TInt32.DTYPE); + TInt32 yBatch = outputs.get(1).asTensor(TInt32.DTYPE); ) { + assertEquals(mapped1.get(count), XBatch); + assertEquals(mapped2.get(count), yBatch); count++; } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/SkipDatasetTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/SkipDatasetTest.java index 9ff8080034d..eba3a273380 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/SkipDatasetTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/SkipDatasetTest.java @@ -40,11 +40,10 @@ public void testEagerSkipDataset() { int count = 2; for (List> components : dataset) { - try (Tensor batch1 = components.get(0).asTensor().expect(TInt32.DTYPE); - Tensor batch2 = - components.get(1).asTensor().expect(TInt32.DTYPE); ) { - assertEquals(testMatrix1.get(count), batch1.data()); - assertEquals(testMatrix2.get(count), batch2.data()); + try (TInt32 batch1 = components.get(0).asTensor(TInt32.DTYPE); + TInt32 batch2 = components.get(1).asTensor(TInt32.DTYPE); ) { + assertEquals(testMatrix1.get(count), batch1); + assertEquals(testMatrix2.get(count), batch2); count++; } } diff --git a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/TakeDatasetTest.java b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/TakeDatasetTest.java index 4419f4660db..e07272e3718 100644 --- a/tensorflow-framework/src/test/java/org/tensorflow/framework/data/TakeDatasetTest.java +++ b/tensorflow-framework/src/test/java/org/tensorflow/framework/data/TakeDatasetTest.java @@ -41,11 +41,10 @@ public void testEagerTakeDataset() { int count = 0; for (List> components : dataset) { - try (Tensor batch1 = components.get(0).asTensor().expect(TInt32.DTYPE); - Tensor batch2 = components.get(1).asTensor().expect(TInt32.DTYPE); ) { - - assertEquals(testMatrix1.get(count), batch1.data()); - assertEquals(testMatrix2.get(count), batch2.data()); + try (TInt32 batch1 = components.get(0).asTensor(TInt32.DTYPE); + TInt32 batch2 = components.get(1).asTensor(TInt32.DTYPE); ) { + assertEquals(testMatrix1.get(count), batch1); + assertEquals(testMatrix2.get(count), batch2); count++; } }