From ae244206247cd81df268311a3ddd0a37ce5ae871 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 15 Dec 2022 11:44:31 +0000 Subject: compare with Tensor not string --- .../vespa/models/handler/ModelsEvaluationHandlerTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'model-evaluation') diff --git a/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java b/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java index c52bf66626a..c0e5dd9ccda 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java @@ -14,7 +14,6 @@ import com.yahoo.vespa.config.search.core.OnnxModelsConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.config.search.core.RankingExpressionsConfig; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import java.util.HashMap; @@ -262,7 +261,6 @@ public class ModelsEvaluationHandlerTest { "tensor(a[2],b[2],c{},d[2]):{a:[[[1.0, 2.0], [3.0, 4.0]], [[5.0, 6.0], [7.0, 8.0]]], b:[[[1.0, 2.0], [3.0, 4.0]], [[5.0, 6.0], [7.0, 8.0]]]}"); } - @Ignore @Test public void testMnistSavedEvaluateSpecificFunction() { assumeTrue(OnnxEvaluator.isRuntimeAvailable()); @@ -270,7 +268,17 @@ public class ModelsEvaluationHandlerTest { properties.put("input", inputTensor()); properties.put("format.tensors", "long"); String url = "http://localhost/model-evaluation/v1/mnist_saved/serving_default.y/eval"; - String expected = "{\"cells\":[{\"address\":{\"d0\":\"0\",\"d1\":\"0\"},\"value\":-0.6319251673007533},{\"address\":{\"d0\":\"0\",\"d1\":\"1\"},\"value\":-7.577770600619843E-4},{\"address\":{\"d0\":\"0\",\"d1\":\"2\"},\"value\":-0.010707969042025622},{\"address\":{\"d0\":\"0\",\"d1\":\"3\"},\"value\":-0.6344759233540788},{\"address\":{\"d0\":\"0\",\"d1\":\"4\"},\"value\":-0.17529455385847528},{\"address\":{\"d0\":\"0\",\"d1\":\"5\"},\"value\":0.7490809723192187},{\"address\":{\"d0\":\"0\",\"d1\":\"6\"},\"value\":-0.022790284182901716},{\"address\":{\"d0\":\"0\",\"d1\":\"7\"},\"value\":0.26799240657608936},{\"address\":{\"d0\":\"0\",\"d1\":\"8\"},\"value\":-0.3152438845465862},{\"address\":{\"d0\":\"0\",\"d1\":\"9\"},\"value\":0.05949304847735276}]}"; + Tensor expected = Tensor.from("tensor(d0[1],d1[10]):{"+ + "{d0:0,d1:0}:-0.6319251673007533,"+ + "{d0:0,d1:1}:-0.0007577770600619843,"+ + "{d0:0,d1:2}:-0.010707969042025622,"+ + "{d0:0,d1:3}:-0.6344759233540788,"+ + "{d0:0,d1:4}:-0.17529455385847528,"+ + "{d0:0,d1:5}:0.7490809723192187,"+ + "{d0:0,d1:6}:-0.022790284182901716,"+ + "{d0:0,d1:7}:0.26799240657608936,"+ + "{d0:0,d1:8}:-0.3152438845465862,"+ + "{d0:0,d1:9}:0.05949304847735276}"); handler.assertResponse(url, properties, 200, expected); } -- cgit v1.2.3