review follow-up:

* compare sizeof() of onnxruntime and vespa BFloat16
* check memcmp() of onnxruntime and vespa BFloat16
* simplify; remove unneccessary include and linking

2 files changed, 5 insertions, 8 deletions

diff --git a/vespalib/src/tests/util/bfloat16/CMakeLists.txt b/vespalib/src/tests/util/bfloat16/CMakeLists.txt
index 1916c7bb365..39a42e6f148 100644
--- a/vespalib/src/tests/util/bfloat16/CMakeLists.txt
+++ b/vespalib/src/tests/util/bfloat16/CMakeLists.txt
@@ -5,7 +5,5 @@ vespa_add_executable(vespalib_bfloat16_test_app TEST
     DEPENDS
     vespalib
     GTest::GTest
-    EXTERNAL_DEPENDS
-    onnxruntime
 )
 vespa_add_test(NAME vespalib_bfloat16_test_app COMMAND vespalib_bfloat16_test_app)
diff --git a/vespalib/src/tests/util/bfloat16/bfloat16_test.cpp b/vespalib/src/tests/util/bfloat16/bfloat16_test.cpp
index a9d2ab0b8d4..d8bb93d7972 100644
--- a/vespalib/src/tests/util/bfloat16/bfloat16_test.cpp
+++ b/vespalib/src/tests/util/bfloat16/bfloat16_test.cpp
@@ -5,9 +5,8 @@
 #include <vespa/vespalib/gtest/gtest.h>
 #include <stdio.h>
 #include <cmath>
+#include <cstring>
 #include <vector>
-#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
-#include <onnxruntime/onnxruntime_cxx_api.h>
 
 using namespace vespalib;
 
@@ -197,15 +196,14 @@ struct BFloat16 {
     }
     return result;
   }
-
-  operator float() const {
-    return ToFloat();
-  }
 };
 
 }  // namespace onnxruntime
 
 TEST(OnnxBFloat16Test, has_same_encoding) {
+    EXPECT_EQ(sizeof(vespalib::BFloat16), sizeof(onnxruntime::BFloat16));
+    EXPECT_EQ(sizeof(vespalib::BFloat16), sizeof(uint16_t));
+    EXPECT_EQ(sizeof(onnxruntime::BFloat16), sizeof(uint16_t));
     vespalib::BFloat16 our_value;
     uint32_t ok_count = 0;
     uint32_t nan_count = 0;
@@ -220,6 +218,7 @@ TEST(OnnxBFloat16Test, has_same_encoding) {
             continue;
         }
         EXPECT_EQ(their_value.val, bits);
+        EXPECT_EQ(memcmp(&our_value, &their_value, sizeof(our_value)), 0);
         if (their_value.val != bits) {
             printf("bad bits %04x -> %04x (onnx)\n", bits, their_value.val);
             continue;