diff options
| author | Lester Solbakken <lesters@oath.com> | 2018-06-01 14:32:46 +0200 |
|---|---|---|
| committer | Lester Solbakken <lesters@oath.com> | 2018-06-01 14:32:46 +0200 |
| commit | d3bdbedb5aeba5c36e932b77bca57b582971ad21 (patch) | |
| tree | 4af4d92db1e7eace4c664a76331587fba2361edb /searchlib | |
| parent | 63cb2d0346f1ed7eeab9902d92da80dac3d6af60 (diff) | |
Fix dropout import test case
Diffstat (limited to 'searchlib')
3 files changed, 3 insertions, 3 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/importer/tensorflow/GraphImporter.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/importer/tensorflow/GraphImporter.java index e9b19490eee..4249e2285b1 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/importer/tensorflow/GraphImporter.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/ml/importer/tensorflow/GraphImporter.java @@ -163,8 +163,8 @@ public class GraphImporter { } if (operation.isConstant()) { - org.tensorflow.Tensor<?> tensor = readVariable(nodeName, bundle); - operation.setConstantValueFunction(type -> new TensorValue(TensorConverter.toVespaTensor(tensor, type))); + operation.setConstantValueFunction( + type -> new TensorValue(TensorConverter.toVespaTensor(readVariable(nodeName, bundle), type))); } return operation; diff --git a/searchlib/src/test/files/integration/tensorflow/dropout/dropout b/searchlib/src/test/files/integration/tensorflow/dropout/dropout Binary files differdeleted file mode 100644 index 7a8b003fa48..00000000000 --- a/searchlib/src/test/files/integration/tensorflow/dropout/dropout +++ /dev/null diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java index 97ed3523b68..00d3517f90d 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/integration/ml/DropoutImportTestCase.java @@ -32,7 +32,7 @@ public class DropoutImportTestCase { RankingExpression output = signature.outputExpression("y"); assertNotNull(output); assertEquals("outputs/Maximum", output.getName()); - assertEquals("join(join(tf_macro_test_outputs_BiasAdd, reduce(constant(test_outputs_Const), sum, d1), f(a,b)(a * b)), tf_macro_test_outputs_BiasAdd, f(a,b)(max(a,b)))", + assertEquals("join(join(imported_ml_macro__outputs_BiasAdd, reduce(constant(test_outputs_Const), sum, d1), f(a,b)(a * b)), imported_ml_macro__outputs_BiasAdd, f(a,b)(max(a,b)))", output.getRoot().toString()); model.assertEqualResult("X", output.getName()); } |