From ecb992970eb8f5e028d03f6316516bd08cd0e0c0 Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Thu, 26 Nov 2020 18:35:12 -0800 Subject: [PATCH 1/2] Change eager mode control inputs from exception to no-op, reflecting eager semantics. Signed-off-by: Ryan Nett --- .../src/main/java/org/tensorflow/EagerOperationBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..ad11e63c7c8 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 @@ -90,8 +90,8 @@ public EagerOperationBuilder addInputList(Output[] inputs) { @Override public OperationBuilder addControlInput(Operation control) { - throw new UnsupportedOperationException( - "Control inputs are not supported in an eager execution environment"); + // No-op. Any operations passed to this method will already be evaluated (b/c eager evaluation). + return this; } @Override From 68927c270a0bc74b45c550412a7f7a17a9e735d6 Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Thu, 26 Nov 2020 18:51:44 -0800 Subject: [PATCH 2/2] fix test to reflect not throwing exception Signed-off-by: Ryan Nett --- .../java/org/tensorflow/EagerOperationBuilderTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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..b6a5a50a7a4 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 @@ -61,12 +61,7 @@ public void addInputs() { .addInput(tf.constant(true).asOutput()) .addInputList(new Output[] {tf.constant(-1).asOutput()}) .build(); - try { - opBuilder(session, "Const", "var").addControlInput(asrt); - fail(); - } catch (UnsupportedOperationException e) { - // expected - } + opBuilder(session, "Const", "var").addControlInput(asrt); } }