Skip to content

Various op-related changes #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 3, 2020
Merged

Various op-related changes #36

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dffbd0
Rollback operator 'val' to 'constant'
karllessard Mar 27, 2020
2cdccbc
Rename 'PrimitiveOp' to 'RawOp'
karllessard Mar 27, 2020
13cdae0
Execute graph initializers in a single call
karllessard Mar 28, 2020
98fb67b
Add an Op as a target
karllessard Mar 29, 2020
0f48e82
Run any single op from session
karllessard Apr 3, 2020
8be3139
Remove traces
karllessard Apr 3, 2020
27e27f0
Update exception message
karllessard Apr 3, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ void GenerateOp(const OpSpec& op, const EndpointSpec& endpoint,
Env* env) {
Type op_class(
ClassOf(endpoint, base_package)
.add_supertype(Type::Class("PrimitiveOp", "org.tensorflow.op")));
.add_supertype(Type::Class("RawOp", "org.tensorflow.op")));
Javadoc op_javadoc(endpoint.javadoc());

// op interfaces
Expand Down
9,553 changes: 4,816 additions & 4,737 deletions tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...rflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/AudioSpectrogram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -57,7 +57,7 @@
* resulting spectrogram as a PNG image.
*/
@Operator(group = "audio")
public final class AudioSpectrogram extends PrimitiveOp implements Operand<TFloat32> {
public final class AudioSpectrogram extends RawOp implements Operand<TFloat32> {

/**
* Optional attributes for {@link org.tensorflow.op.audio.AudioSpectrogram}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/DecodeWav.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -48,7 +48,7 @@
* output shape of [10, 2].
*/
@Operator(group = "audio")
public final class DecodeWav extends PrimitiveOp {
public final class DecodeWav extends RawOp {

/**
* Optional attributes for {@link org.tensorflow.op.audio.DecodeWav}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/EncodeWav.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -41,7 +41,7 @@
* `sample_rate` is a scalar Tensor holding the rate to use (e.g. 44100).
*/
@Operator(group = "audio")
public final class EncodeWav extends PrimitiveOp implements Operand<TString> {
public final class EncodeWav extends RawOp implements Operand<TString> {

/**
* Factory method to create a class wrapping a new EncodeWav operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/audio/Mfcc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -39,7 +39,7 @@
* is a good resource to learn more.
*/
@Operator(group = "audio")
public final class Mfcc extends PrimitiveOp implements Operand<TFloat32> {
public final class Mfcc extends RawOp implements Operand<TFloat32> {

/**
* Optional attributes for {@link org.tensorflow.op.audio.Mfcc}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseAnd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -54,7 +54,7 @@
* @param <T> data type for {@code z()} output
*/
@Operator(group = "bitwise")
public final class BitwiseAnd<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class BitwiseAnd<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Factory method to create a class wrapping a new BitwiseAnd operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseOr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -54,7 +54,7 @@
* @param <T> data type for {@code z()} output
*/
@Operator(group = "bitwise")
public final class BitwiseOr<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class BitwiseOr<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Factory method to create a class wrapping a new BitwiseOr operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/BitwiseXor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -54,7 +54,7 @@
* @param <T> data type for {@code z()} output
*/
@Operator(group = "bitwise")
public final class BitwiseXor<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class BitwiseXor<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Factory method to create a class wrapping a new BitwiseXor operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/Invert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -75,7 +75,7 @@
* @param <T> data type for {@code y()} output
*/
@Operator(group = "bitwise")
public final class Invert<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class Invert<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Factory method to create a class wrapping a new Invert operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/LeftShift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -65,7 +65,7 @@
* @param <T> data type for {@code z()} output
*/
@Operator(group = "bitwise")
public final class LeftShift<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class LeftShift<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Factory method to create a class wrapping a new LeftShift operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/bitwise/RightShift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand Down Expand Up @@ -68,7 +68,7 @@
* @param <T> data type for {@code z()} output
*/
@Operator(group = "bitwise")
public final class RightShift<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class RightShift<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Factory method to create a class wrapping a new RightShift operation.
Expand Down
4 changes: 2 additions & 2 deletions ...e/tensorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KMC2ChainInitialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -36,7 +36,7 @@
* of the k-MC^2 algorithm and returns the index of one candidate point to be added
* as an additional cluster center.
*/
public final class KMC2ChainInitialization extends PrimitiveOp implements Operand<TInt64> {
public final class KMC2ChainInitialization extends RawOp implements Operand<TInt64> {

/**
* Factory method to create a class wrapping a new KMC2ChainInitialization operation.
Expand Down
4 changes: 2 additions & 2 deletions ...sorflow-core-api/src/gen/java/org/tensorflow/op/cluster/KmeansPlusPlusInitialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -36,7 +36,7 @@
* distance from the nearest row selected thus far till num_to_sample rows have
* been sampled.
*/
public final class KmeansPlusPlusInitialization extends PrimitiveOp implements Operand<TFloat32> {
public final class KmeansPlusPlusInitialization extends RawOp implements Operand<TFloat32> {

/**
* Factory method to create a class wrapping a new KmeansPlusPlusInitialization operation.
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/AllReduce.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -34,7 +34,7 @@
*
* @param <T> data type for {@code output()} output
*/
public final class AllReduce<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class AllReduce<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Optional attributes for {@link org.tensorflow.op.collective.AllReduce}
Expand Down
4 changes: 2 additions & 2 deletions ...low-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastRecv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -35,7 +35,7 @@
*
* @param <T> data type for {@code output()} output
*/
public final class BroadcastRecv<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class BroadcastRecv<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Optional attributes for {@link org.tensorflow.op.collective.BroadcastRecv}
Expand Down
4 changes: 2 additions & 2 deletions ...low-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/collective/BroadcastSend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -34,7 +34,7 @@
*
* @param <T> data type for {@code output()} output
*/
public final class BroadcastSend<T extends TNumber> extends PrimitiveOp implements Operand<T> {
public final class BroadcastSend<T extends TNumber> extends RawOp implements Operand<T> {

/**
* Optional attributes for {@link org.tensorflow.op.collective.BroadcastSend}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Abort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -33,7 +33,7 @@
* Returns nothing but an exception.
*/
@Operator
public final class Abort extends PrimitiveOp {
public final class Abort extends RawOp {

/**
* Optional attributes for {@link org.tensorflow.op.core.Abort}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/All.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -38,7 +38,7 @@
* retained with length 1.
*/
@Operator
public final class All extends PrimitiveOp implements Operand<TBool> {
public final class All extends RawOp implements Operand<TBool> {

/**
* Optional attributes for {@link org.tensorflow.op.core.All}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Any.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -38,7 +38,7 @@
* retained with length 1.
*/
@Operator
public final class Any extends PrimitiveOp implements Operand<TBool> {
public final class Any extends RawOp implements Operand<TBool> {

/**
* Optional attributes for {@link org.tensorflow.op.core.Any}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.op.Operands;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -34,7 +34,7 @@
* `summarize` determines how many entries of the tensors to print.
*/
@Operator
public final class AssertThat extends PrimitiveOp {
public final class AssertThat extends RawOp {

/**
* Optional attributes for {@link org.tensorflow.op.core.AssertThat}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/Assign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -36,7 +36,7 @@
* @param <T> data type for {@code outputRef()} output
*/
@Operator
public final class Assign<T extends TType> extends PrimitiveOp implements Operand<T> {
public final class Assign<T extends TType> extends RawOp implements Operand<T> {

/**
* Optional attributes for {@link org.tensorflow.op.core.Assign}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/op/core/AssignAdd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.tensorflow.Operation;
import org.tensorflow.OperationBuilder;
import org.tensorflow.Output;
import org.tensorflow.op.PrimitiveOp;
import org.tensorflow.op.RawOp;
import org.tensorflow.op.Scope;
import org.tensorflow.op.annotation.Endpoint;
import org.tensorflow.op.annotation.Operator;
Expand All @@ -36,7 +36,7 @@
* @param <T> data type for {@code outputRef()} output
*/
@Operator
public final class AssignAdd<T extends TType> extends PrimitiveOp implements Operand<T> {
public final class AssignAdd<T extends TType> extends RawOp implements Operand<T> {

/**
* Optional attributes for {@link org.tensorflow.op.core.AssignAdd}
Expand Down
Loading