diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-09-10 10:43:32 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-09-10 10:43:32 +0200 |
commit | 79ddd9f94394e03e6893839de7310be0563f8577 (patch) | |
tree | 2db3a5c5d59531e1e2f00f381e777f3e01a87ed3 /model-evaluation | |
parent | 79fbe75a324084d7e871e4aa7b82500e7ccd35b3 (diff) |
Use correct model
Diffstat (limited to 'model-evaluation')
-rw-r--r-- | model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java | 6 | ||||
-rw-r--r-- | model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read | bin | 86 -> 86 bytes | |||
-rw-r--r-- | model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read | bin | 62733 -> 62733 bytes |
3 files changed, 6 insertions, 0 deletions
diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java index 716965784e3..f236bbd4467 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java @@ -14,6 +14,8 @@ import static org.junit.Assert.assertEquals; */ public class MlModelsImportingTest { + private static final double delta = 0.00000000001; + @Test public void testImportingModels() { ModelTester tester = new ModelTester("src/test/resources/config/models/"); @@ -28,6 +30,7 @@ public class MlModelsImportingTest { xgboost); FunctionEvaluator evaluator = xgboost.evaluatorOf(); assertEquals("f109, f29, f56, f60", evaluator.context().names().stream().sorted().collect(Collectors.joining(", "))); + assertEquals(-8.17695, evaluator.evaluate().sum().asDouble(), delta); } { @@ -40,6 +43,7 @@ public class MlModelsImportingTest { onnxMnistSoftmax.evaluatorOf("default.add").context().get("constant(mnist_softmax_Variable)").type().toString()); FunctionEvaluator evaluator = onnxMnistSoftmax.evaluatorOf(); // Verify exactly one output available assertEquals("Placeholder, constant(mnist_softmax_Variable), constant(mnist_softmax_Variable_1)", evaluator.context().names().stream().sorted().collect(Collectors.joining(", "))); + assertEquals(-1.6372650861740112E-6, evaluator.evaluate().sum().asDouble(), delta); } { @@ -49,6 +53,7 @@ public class MlModelsImportingTest { tfMnistSoftmax); FunctionEvaluator evaluator = tfMnistSoftmax.evaluatorOf(); // Verify exactly one output available assertEquals("Placeholder, constant(mnist_softmax_saved_layer_Variable_1_read), constant(mnist_softmax_saved_layer_Variable_read)", evaluator.context().names().stream().sorted().collect(Collectors.joining(", "))); + assertEquals(-1.6372650861740112E-6, evaluator.evaluate().sum().asDouble(), delta); } { @@ -62,6 +67,7 @@ public class MlModelsImportingTest { tfMnist); FunctionEvaluator evaluator = tfMnist.evaluatorOf("serving_default"); // TODO: Macro is offered as an alternative output currently, so need to specify argument assertEquals("constant(mnist_saved_dnn_hidden1_bias_read), constant(mnist_saved_dnn_hidden1_weights_read), constant(mnist_saved_dnn_hidden2_bias_read), constant(mnist_saved_dnn_hidden2_weights_read), constant(mnist_saved_dnn_outputs_bias_read), constant(mnist_saved_dnn_outputs_weights_read), input, rankingExpression(imported_ml_macro_mnist_saved_dnn_hidden1_add)", evaluator.context().names().stream().sorted().collect(Collectors.joining(", "))); + assertEquals(-0.714629131972222, evaluator.evaluate().sum().asDouble(), delta); // TODO: Verify in TF native } } diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read Binary files differindex 5cc9575b971..4fa0eadb0d3 100644 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read +++ b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read Binary files differindex 70a6fd42c91..e768328bff5 100644 --- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read +++ b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read |