minor cleanup

10 files changed, 14 insertions, 5 deletions

diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt
index 7022569e6a3..98bec17e678 100644
--- a/eval/CMakeLists.txt
+++ b/eval/CMakeLists.txt
@@ -81,6 +81,7 @@ vespa_define_module(
     src/vespa/eval/eval/value_cache
     src/vespa/eval/gp
     src/vespa/eval/instruction
+    src/vespa/eval/onnx
     src/vespa/eval/streamed
     src/vespa/eval/tensor
     src/vespa/eval/tensor/dense
diff --git a/eval/src/tests/eval/fast_sparse_map/fast_sparse_map_test.cpp b/eval/src/tests/eval/fast_sparse_map/fast_sparse_map_test.cpp
index 3d98ec67aa8..18517b34f57 100644
--- a/eval/src/tests/eval/fast_sparse_map/fast_sparse_map_test.cpp
+++ b/eval/src/tests/eval/fast_sparse_map/fast_sparse_map_test.cpp
@@ -117,7 +117,7 @@ TEST(FastSparseMapTest, fast_sparse_map_works_with_no_labels) {
 }
 
 TEST(FastSparseMapTest, size_of_internal_types) {
-    fprintf(stderr, "fast sparse map hash node size: %zu\n", sizeof(hash_node<FastSparseMap::MapType::value_type>));
+    EXPECT_EQ(sizeof(hash_node<FastSparseMap::MapType::value_type>), 16);
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp b/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp
index 0f125717d47..7e204f1ea06 100644
--- a/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp
+++ b/eval/src/tests/tensor/onnx_wrapper/onnx_wrapper_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/eval/eval/tensor_spec.h>
-#include <vespa/eval/tensor/dense/onnx_wrapper.h>
+#include <vespa/eval/onnx/onnx_wrapper.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt
index 9a3c2f817d8..d59deb3b4d9 100644
--- a/eval/src/vespa/eval/CMakeLists.txt
+++ b/eval/src/vespa/eval/CMakeLists.txt
@@ -2,11 +2,12 @@
 vespa_add_library(vespaeval
     SOURCES
     $<TARGET_OBJECTS:eval_eval>
-    $<TARGET_OBJECTS:eval_instruction>
     $<TARGET_OBJECTS:eval_eval_llvm>
     $<TARGET_OBJECTS:eval_eval_test>
     $<TARGET_OBJECTS:eval_eval_value_cache>
     $<TARGET_OBJECTS:eval_gp>
+    $<TARGET_OBJECTS:eval_instruction>
+    $<TARGET_OBJECTS:eval_onnx>
     $<TARGET_OBJECTS:eval_streamed>
     $<TARGET_OBJECTS:eval_tensor>
     $<TARGET_OBJECTS:eval_tensor_dense>
diff --git a/eval/src/vespa/eval/tensor/serialization/format.txt b/eval/src/vespa/eval/eval/binary_format.txt
index 1a454b0ccf8..4d74c21005a 100644
--- a/eval/src/vespa/eval/tensor/serialization/format.txt
+++ b/eval/src/vespa/eval/eval/binary_format.txt
@@ -12,6 +12,8 @@ with a specific type gives rise to 3 new formats:
 sparse_with_cell_type[5], dense_with_cell_type[6] and
 mixed_with_cell_type[7].
 
+(the C++ binary format implementation is located in 'value_codec.cpp')
+
 //-----------------------------------------------------------------------------
 
 1_4_int: type (1/5:sparse, 2/6:dense, 3/7:mixed)
diff --git a/eval/src/vespa/eval/eval/tensor_spec.cpp b/eval/src/vespa/eval/eval/tensor_spec.cpp
index 2ffbbb7ac66..beafba97ca1 100644
--- a/eval/src/vespa/eval/eval/tensor_spec.cpp
+++ b/eval/src/vespa/eval/eval/tensor_spec.cpp
@@ -130,7 +130,7 @@ TensorSpec::add(Address address, double value) {
         // to simplify reference implementations, allow
         // adding the same address several times to a Spec, but
         // only with the same value every time:
-        assert(iter->second.value == value);
+        assert(iter->second == Value(value));
     }
     return *this;
 }
diff --git a/eval/src/vespa/eval/onnx/CMakeLists.txt b/eval/src/vespa/eval/onnx/CMakeLists.txt
new file mode 100644
index 00000000000..9b18557c036
--- /dev/null
+++ b/eval/src/vespa/eval/onnx/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+vespa_add_library(eval_onnx OBJECT
+    SOURCES
+    onnx_wrapper.cpp
+)
diff --git a/eval/src/vespa/eval/tensor/dense/onnx_wrapper.cpp b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp
index 521d2382666..521d2382666 100644
--- a/eval/src/vespa/eval/tensor/dense/onnx_wrapper.cpp
+++ b/eval/src/vespa/eval/onnx/onnx_wrapper.cpp
diff --git a/eval/src/vespa/eval/tensor/dense/onnx_wrapper.h b/eval/src/vespa/eval/onnx/onnx_wrapper.h
index f42b926d17e..f42b926d17e 100644
--- a/eval/src/vespa/eval/tensor/dense/onnx_wrapper.h
+++ b/eval/src/vespa/eval/onnx/onnx_wrapper.h
diff --git a/eval/src/vespa/eval/tensor/dense/CMakeLists.txt b/eval/src/vespa/eval/tensor/dense/CMakeLists.txt
index 1431ae53f66..8e506890b20 100644
--- a/eval/src/vespa/eval/tensor/dense/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/dense/CMakeLists.txt
@@ -11,6 +11,5 @@ vespa_add_library(eval_tensor_dense OBJECT
     dense_single_reduce_function.cpp
     dense_tensor_create_function.cpp
     mutable_dense_tensor_view.cpp
-    onnx_wrapper.cpp
     vector_from_doubles_function.cpp
 )