diff options
| author | Lester Solbakken <lesters@oath.com> | 2018-02-02 11:16:33 +0100 |
|---|---|---|
| committer | Lester Solbakken <lesters@oath.com> | 2018-02-02 11:16:33 +0100 |
| commit | a55b45e2bb1442b94480b585ab2b973c15d4be36 (patch) | |
| tree | d8efd7092895096be3a043654bc7885b82180eba /searchlib/src/test | |
| parent | 93f30cd3912913ffbdc292d32415474466e39bd2 (diff) | |
Replace / in Tensorflow constants and placeholders to _
Diffstat (limited to 'searchlib/src/test')
2 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/DropoutImportTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/DropoutImportTestCase.java index 445ccf231a7..3b25bfe1b1e 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/DropoutImportTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/DropoutImportTestCase.java @@ -20,8 +20,8 @@ public class DropoutImportTestCase { // Check (provided) macros assertEquals(1, model.get().macros().size()); - assertTrue(model.get().macros().containsKey("training/input")); - assertEquals("constant(\"training/input\")", model.get().macros().get("training/input").getRoot().toString()); + assertTrue(model.get().macros().containsKey("training_input")); + assertEquals("constant(\"training_input\")", model.get().macros().get("training_input").getRoot().toString()); // Check required macros assertEquals(1, model.get().requiredMacros().size()); @@ -37,7 +37,7 @@ public class DropoutImportTestCase { RankingExpression output = signature.outputExpression("y"); assertNotNull(output); assertEquals("outputs/BiasAdd", output.getName()); - assertEquals("join(rename(reduce(join(X, rename(constant(\"outputs/kernel\"), (d0, d1), (d1, d3)), f(a,b)(a * b)), sum, d1), d3, d1), rename(constant(\"outputs/bias\"), d0, d1), f(a,b)(a + b))", + assertEquals("join(rename(reduce(join(X, rename(constant(\"outputs_kernel\"), (d0, d1), (d1, d3)), f(a,b)(a * b)), sum, d1), d3, d1), rename(constant(\"outputs_bias\"), d0, d1), f(a,b)(a + b))", output.getRoot().toString()); model.assertEqualResult("X", output.getName()); } diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TestableTensorFlowModel.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TestableTensorFlowModel.java index 127b63c66c9..2c621fd2e92 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TestableTensorFlowModel.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/TestableTensorFlowModel.java @@ -52,7 +52,7 @@ public class TestableTensorFlowModel { runner.feed(inputName, placeholder); List<org.tensorflow.Tensor<?>> results = runner.fetch(operationName).run(); assertEquals(1, results.size()); - return new TensorConverter().toVespaTensor(results.get(0)); + return TensorConverter.toVespaTensor(results.get(0)); } private Context contextFrom(TensorFlowModel result) { |