21 files changed, 9 insertions, 9 deletions
diff --git a/staging_vespalib/CMakeLists.txt b/staging_vespalib/CMakeLists.txt
index 5184d98d1ce..652200e2d7b 100644
--- a/staging_vespalib/CMakeLists.txt
+++ b/staging_vespalib/CMakeLists.txt
@@ -16,7 +16,6 @@ vespa_define_module(
     src/tests/crc
     src/tests/databuffer
     src/tests/directio
-    src/tests/dotproduct
     src/tests/encoding/base64
     src/tests/fileheader
     src/tests/floatingpointtype
@@ -42,7 +41,6 @@ vespa_define_module(
     src/vespa/vespalib
     src/vespa/vespalib/data
     src/vespa/vespalib/encoding
-    src/vespa/vespalib/hwaccelrated
     src/vespa/vespalib/net
     src/vespa/vespalib/objects
     src/vespa/vespalib/stllike
diff --git a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
index 7bdcc9bbf64..640278a583b 100644
--- a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
+++ b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
@@ -8,7 +8,6 @@ vespa_add_library(staging_vespalib
     $<TARGET_OBJECTS:staging_vespalib_vespalib_stllike>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_net>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_trace>
-    $<TARGET_OBJECTS:staging_vespalib_vespalib_hwaccelrated>
     INSTALL lib64
     DEPENDS
 )
diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt
index b6d07ca2cf1..f286a79489b 100644
--- a/vespalib/CMakeLists.txt
+++ b/vespalib/CMakeLists.txt
@@ -22,6 +22,7 @@ vespa_define_module(
     src/tests/component
     src/tests/compress
     src/tests/delegatelist
+    src/tests/dotproduct
     src/tests/dual_merge_director
     src/tests/eval/compile_cache
     src/tests/eval/compiled_function
@@ -122,6 +123,7 @@ vespa_define_module(
     src/vespa/vespalib/eval/value_cache
     src/vespa/vespalib/eval/llvm
     src/vespa/vespalib/geo
+    src/vespa/vespalib/hwaccelrated
     src/vespa/vespalib/io
     src/vespa/vespalib/net
     src/vespa/vespalib/objects
diff --git a/staging_vespalib/src/tests/dotproduct/.gitignore b/vespalib/src/tests/dotproduct/.gitignore
index 5d9432fbd08..5d9432fbd08 100644
--- a/staging_vespalib/src/tests/dotproduct/.gitignore
+++ b/vespalib/src/tests/dotproduct/.gitignore
diff --git a/staging_vespalib/src/tests/dotproduct/CMakeLists.txt b/vespalib/src/tests/dotproduct/CMakeLists.txt
index 30a02632f1c..4887f74088c 100644
--- a/staging_vespalib/src/tests/dotproduct/CMakeLists.txt
+++ b/vespalib/src/tests/dotproduct/CMakeLists.txt
@@ -1,13 +1,13 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_dotproductbenchmark_app
+vespa_add_executable(vespalib_dotproductbenchmark_app
     SOURCES
     dotproductbenchmark.cpp
     DEPENDS
-    staging_vespalib
+    vespalib
 )
-vespa_add_test(NAME staging_vespalib_dotproductbenchmark_app_sparse-ordered COMMAND staging_vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK)
-vespa_add_test(NAME staging_vespalib_dotproductbenchmark_app_sparse-unordered COMMAND staging_vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK)
-vespa_add_test(NAME staging_vespalib_dotproductbenchmark_app_full COMMAND staging_vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK) 
+vespa_add_test(NAME vespalib_dotproductbenchmark_app_sparse-ordered COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK)
+vespa_add_test(NAME vespalib_dotproductbenchmark_app_sparse-unordered COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK)
+vespa_add_test(NAME vespalib_dotproductbenchmark_app_full COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK) 
 
 # benchmark: dotproductbenchmark
 # 	$(HIDE)$(LDL) time $(VALGRIND) ./dotproductbenchmark sparse-ordered   1000 1000 1000 1000
diff --git a/staging_vespalib/src/tests/dotproduct/dotproductbenchmark.cpp b/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp
index 9ef3d959f3b..9ef3d959f3b 100644
--- a/staging_vespalib/src/tests/dotproduct/dotproductbenchmark.cpp
+++ b/vespalib/src/tests/dotproduct/dotproductbenchmark.cpp
diff --git a/vespalib/src/vespa/vespalib/CMakeLists.txt b/vespalib/src/vespa/vespalib/CMakeLists.txt
index 08c42ba1a16..9b9c336ded9 100644
--- a/vespalib/src/vespa/vespalib/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/CMakeLists.txt
@@ -8,6 +8,7 @@ vespa_add_library(vespalib
     $<TARGET_OBJECTS:vespalib_vespalib_eval_test>
     $<TARGET_OBJECTS:vespalib_vespalib_eval_value_cache>
     $<TARGET_OBJECTS:vespalib_vespalib_geo>
+    $<TARGET_OBJECTS:vespalib_vespalib_hwaccelrated>
     $<TARGET_OBJECTS:vespalib_vespalib_io>
     $<TARGET_OBJECTS:vespalib_vespalib_net>
     $<TARGET_OBJECTS:vespalib_vespalib_objects>
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt b/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt
index 6362cdf6f87..dc76d0eb7a5 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(staging_vespalib_vespalib_hwaccelrated OBJECT
+vespa_add_library(vespalib_vespalib_hwaccelrated OBJECT
     SOURCES
     iaccelrated.cpp
     generic.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp
index ec5064bf647..ec5064bf647 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx.h b/vespalib/src/vespa/vespalib/hwaccelrated/avx.h
index 4b391c163ac..4b391c163ac 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx.h
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx.h
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp
index f87738e3a6c..f87738e3a6c 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx2.h b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h
index 56d3a8ac65e..56d3a8ac65e 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx2.h
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx2.h
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp
index 9f7a6dcda3e..9f7a6dcda3e 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx512.h b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h
index 5d7028c30ba..5d7028c30ba 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avx512.h
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avx512.h
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
index 87a043b3428..87a043b3428 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp
index f218e4172f9..f218e4172f9 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/generic.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/generic.h b/vespalib/src/vespa/vespalib/hwaccelrated/generic.h
index 0cb21b70ca3..0cb21b70ca3 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/generic.h
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/generic.h
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp
index aede024f5af..aede024f5af 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h
index b8c7794a386..b8c7794a386 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/iaccelrated.h
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp
index 11333d62f78..11333d62f78 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/hwaccelrated/sse2.h b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.h
index a7c39581997..a7c39581997 100644
--- a/staging_vespalib/src/vespa/vespalib/hwaccelrated/sse2.h
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/sse2.h