Revert "Revert "Use OS provided xxhash.""

3 files changed, 16 insertions, 2 deletions

diff --git a/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt b/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
index 4cd682d8953..73d21ef7b8f 100644
--- a/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
@@ -5,6 +5,7 @@ vespa_add_library(eval_tensor_sparse OBJECT
     sparse_tensor_address_combiner.cpp
     sparse_tensor_address_padder.cpp
     sparse_tensor_address_reducer.cpp
+    sparse_tensor_address_ref.cpp
     sparse_tensor_match.cpp
     sparse_tensor_builder.cpp
     sparse_tensor_unsorted_address_builder.cpp
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp
new file mode 100644
index 00000000000..ba40e37488e
--- /dev/null
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp
@@ -0,0 +1,14 @@
+// Copyright 2019 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "sparse_tensor_address_ref.h"
+#include <xxhash.h>
+
+namespace vespalib::tensor {
+
+uint32_t
+SparseTensorAddressRef::calcHash() const {
+    return XXH32(_start, _size, 0);
+}
+
+}
+
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h
index 8533aa29829..743a46d63e1 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <vespa/vespalib/util/stash.h>
-#include <vespa/vespalib/xxhash/xxhash.h>
 #include <cstring>
 
 namespace vespalib::tensor {
@@ -41,7 +40,7 @@ public:
 
     uint32_t hash() const { return _hash; }
 
-    uint32_t calcHash() const { return XXH32(_start, _size, 0); }
+    uint32_t calcHash() const;
 
     bool operator<(const SparseTensorAddressRef &rhs) const {
         size_t minSize = std::min(_size, rhs._size);