Skip to content

Commit 971e6b1

Browse files
committed
Rebase fix
Signed-off-by: Ryan Nett <[email protected]>
1 parent 8a9eb58 commit 971e6b1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,10 @@ public final class Ops {
357357

358358
public final SparseOps sparse;
359359

360-
public final TpuOps tpu;
361-
362360
public final BitwiseOps bitwise;
363361

362+
public final TpuOps tpu;
363+
364364
public final MathOps math;
365365

366366
public final AudioOps audio;
@@ -388,8 +388,8 @@ private Ops(Scope scope) {
388388
random = new RandomOps(this);
389389
strings = new StringsOps(this);
390390
sparse = new SparseOps(this);
391-
tpu = new TpuOps(this);
392391
bitwise = new BitwiseOps(this);
392+
tpu = new TpuOps(this);
393393
math = new MathOps(this);
394394
audio = new AudioOps(this);
395395
signal = new SignalOps(this);

tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,13 @@ public void pythonTfFunction() {
210210
args.clear();
211211

212212
// variable unwrapping happens in Session, which is used by ConcreteFunction.call
213-
ConcreteFunction getVariable = bundle.function("get_variable");
213+
SessionFunction getVariable = bundle.function("get_variable");
214214
try (TFloat32 dummy = TFloat32.scalarOf(1.0f)) {
215-
args.put("dummy",dummy);
215+
args.put("dummy", dummy);
216216
// TF functions always require an input, so we supply a dummy one here
217217
// This test actually checks that resource variables can be loaded correctly.
218218
try (TFloat32 v = (TFloat32) getVariable.call(args)
219-
.get(getVariable.signature().outputNames().iterator().next())) {
219+
.get(getVariable.signature().outputNames().iterator().next())) {
220220
assertEquals(2f, v.getFloat());
221221
}
222222
}

0 commit comments

Comments
 (0)