Move tensor attribute source to separate directory.

20 files changed, 29 insertions, 23 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index 7702ac10b48..c8cce9fb2a0 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -34,7 +34,7 @@ LOG_SETUP("attribute_test");
 #include <vespa/vespalib/tensor/types.h>
 #include <vespa/vespalib/tensor/default_tensor.h>
 #include <vespa/vespalib/tensor/tensor_factory.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 
 
 namespace vespa { namespace config { namespace search {}}}
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index e3f1e1db16d..5aa138121f9 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -23,7 +23,7 @@ LOG_SETUP("docsummary_test");
 #include <vespa/searchlib/transactionlog/nosyncproxy.h>
 #include <vespa/vespalib/tensor/tensor_factory.h>
 #include <vespa/vespalib/tensor/default_tensor.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 
 using namespace document;
 using namespace search;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp b/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp
index 07c7381ca4a..2c9450d0f81 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp
@@ -9,7 +9,7 @@ LOG_SETUP(".proton.attribute.document_field_retriever");
 #include <vespa/document/fieldvalue/weightedsetfieldvalue.h>
 #include <vespa/document/fieldvalue/tensorfieldvalue.h>
 #include <vespa/searchcommon/attribute/attributecontent.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 #include <vespa/vespalib/tensor/tensor.h>
 
 using search::DocumentIdT;
diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
index cb4284f80dd..2da20094b6b 100644
--- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
@@ -16,7 +16,7 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/searchlib/common/base.h>
 #include <vespa/searchlib/attribute/attribute.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 #include "attrupdate.h"
 
 #include <vespa/searchlib/attribute/attributevector.hpp>
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index df3e40ebd6d..b105a03bf8d 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -46,6 +46,7 @@ vespa_define_module(
     src/vespa/searchlib/queryeval
     src/vespa/searchlib/queryeval/test
     src/vespa/searchlib/queryeval/wand
+    src/vespa/searchlib/tensor
     src/vespa/searchlib/test
     src/vespa/searchlib/test/diskindex
     src/vespa/searchlib/test/fakedata
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
index cdb9f3366a4..6d75712fabe 100644
--- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
+++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
@@ -3,7 +3,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP("tensorattribute_test");
 #include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 #include <vespa/searchlib/attribute/attributeguard.h>
 #include <vespa/vespalib/tensor/tensor_factory.h>
 #include <vespa/vespalib/tensor/default_tensor.h>
diff --git a/searchlib/src/tests/features/tensor/tensor_test.cpp b/searchlib/src/tests/features/tensor/tensor_test.cpp
index 6b3b09bcec1..9e8b85fcbaf 100644
--- a/searchlib/src/tests/features/tensor/tensor_test.cpp
+++ b/searchlib/src/tests/features/tensor/tensor_test.cpp
@@ -5,8 +5,7 @@
 
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/attributevector.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 #include <vespa/searchlib/features/setup.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/fef/test/as_tensor.h>
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt
index bf3cabb460b..a79cbe6a802 100644
--- a/searchlib/src/vespa/searchlib/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/CMakeLists.txt
@@ -26,6 +26,7 @@ vespa_add_library(searchlib
     $<TARGET_OBJECTS:searchlib_queryeval_wand>
     $<TARGET_OBJECTS:searchlib_sconfig>
     $<TARGET_OBJECTS:searchlib_searchlib_index>
+    $<TARGET_OBJECTS:searchlib_tensor>
     $<TARGET_OBJECTS:searchlib_transactionlog>
     $<TARGET_OBJECTS:searchlib_util>
 
diff --git a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
index b949943a42b..4983103045b 100644
--- a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
@@ -81,8 +81,5 @@ vespa_add_library(searchlib_attribute OBJECT
     sourceselector.cpp
     stringattribute.cpp
     stringbase.cpp
-    tensorattribute.cpp
-    tensorattributesaver.cpp
-    tensorstore.cpp
     DEPENDS
 )
diff --git a/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp b/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp
index e33b402d050..c78aea2d817 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsinglestd.cpp
@@ -11,7 +11,7 @@ LOG_SETUP(".createsinglestd");
 #include <vespa/searchlib/attribute/attributevector.hpp>
 #include <vespa/searchlib/attribute/singlenumericattribute.hpp>
 #include <vespa/searchlib/attribute/singlestringattribute.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/features/attributefeature.cpp b/searchlib/src/vespa/searchlib/features/attributefeature.cpp
index e0290b1a73e..c90178b0f12 100644
--- a/searchlib/src/vespa/searchlib/features/attributefeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/attributefeature.cpp
@@ -9,7 +9,7 @@ LOG_SETUP(".features.attributefeature");
 
 #include <vespa/searchcommon/common/undefinedvalues.h>
 #include <vespa/searchcommon/attribute/attributecontent.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 #include <vespa/searchlib/features/constant_tensor_executor.h>
 #include <vespa/searchlib/features/tensor_from_tensor_attribute_executor.h>
 #include <vespa/searchlib/fef/fieldinfo.h>
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_tensor_attribute_executor.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_tensor_attribute_executor.cpp
index 36cf0cc3068..2d5a4d954fd 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_tensor_attribute_executor.cpp
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_tensor_attribute_executor.cpp
@@ -2,7 +2,7 @@
 
 #include <vespa/fastos/fastos.h>
 #include "tensor_from_tensor_attribute_executor.h"
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 
 namespace search {
 namespace features {
diff --git a/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt b/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt
new file mode 100644
index 00000000000..27cb30e7700
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(searchlib_tensor OBJECT
+    SOURCES
+    tensor_attribute.cpp
+    tensor_attribute_saver.cpp
+    tensor_store.cpp
+    DEPENDS
+)
diff --git a/searchlib/src/vespa/searchlib/attribute/tensorattribute.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
index 2a8d2202ad0..6eb799df9d2 100644
--- a/searchlib/src/vespa/searchlib/attribute/tensorattribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp
@@ -1,10 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include "tensorattribute.h"
+#include "tensor_attribute.h"
 #include <vespa/vespalib/tensor/default_tensor.h>
 #include <vespa/vespalib/tensor/tensor.h>
-#include "tensorattributesaver.h"
+#include "tensor_attribute_saver.h"
 
 using vespalib::eval::ValueType;
 using vespalib::tensor::Tensor;
diff --git a/searchlib/src/vespa/searchlib/attribute/tensorattribute.h b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h
index ec7f41bca18..4f2c3dd2904 100644
--- a/searchlib/src/vespa/searchlib/attribute/tensorattribute.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "not_implemented_attribute.h"
-#include "tensorstore.h"
+#include <vespa/searchlib/attribute/not_implemented_attribute.h>
+#include "tensor_store.h"
 #include <vespa/searchlib/common/rcuvector.h>
 #include <vespa/vespalib/tensor/tensor_mapper.h>
 
diff --git a/searchlib/src/vespa/searchlib/attribute/tensorattributesaver.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_saver.cpp
index 6c27689a0c9..69fcdf8c089 100644
--- a/searchlib/src/vespa/searchlib/attribute/tensorattributesaver.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_saver.cpp
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include "tensorattributesaver.h"
+#include "tensor_attribute_saver.h"
 #include <vespa/searchlib/util/bufferwriter.h>
 
 using vespalib::GenerationHandler;
diff --git a/searchlib/src/vespa/searchlib/attribute/tensorattributesaver.h b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_saver.h
index e988e1b05ec..89df3b8a8a2 100644
--- a/searchlib/src/vespa/searchlib/attribute/tensorattributesaver.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_saver.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include "attributesaver.h"
-#include "iattributesavetarget.h"
-#include "tensorattribute.h"
+#include <vespa/searchlib/attribute/attributesaver.h>
+#include <vespa/searchlib/attribute/iattributesavetarget.h>
+#include "tensor_attribute.h"
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/tensorstore.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_store.cpp
index 83b870cfaeb..8b59d63aec0 100644
--- a/searchlib/src/vespa/searchlib/attribute/tensorstore.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.cpp
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include "tensorstore.h"
+#include "tensor_store.h"
 #include <vespa/vespalib/tensor/tensor.h>
 #include <vespa/vespalib/tensor/serialization/typed_binary_format.h>
 #include <vespa/vespalib/objects/nbostream.h>
diff --git a/searchlib/src/vespa/searchlib/attribute/tensorstore.h b/searchlib/src/vespa/searchlib/tensor/tensor_store.h
index 669362ea57f..669362ea57f 100644
--- a/searchlib/src/vespa/searchlib/attribute/tensorstore.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.h
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
index 4eef9e6a9c6..9412439f086 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
@@ -5,7 +5,7 @@
 #include <vespa/searchlib/attribute/stringbase.h>
 #include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/attribute/floatbase.h>
-#include <vespa/searchlib/attribute/tensorattribute.h>
+#include <vespa/searchlib/tensor/tensor_attribute.h>
 #include <vespa/searchsummary/docsummary/docsumwriter.h>
 #include <vespa/searchsummary/docsummary/attributedfw.h>
 #include <vespa/vespalib/tensor/tensor.h>