summaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorHaavard <havardpe@yahoo-inc.com>2017-01-23 14:54:48 +0000
committerHaavard <havardpe@yahoo-inc.com>2017-01-23 14:54:48 +0000
commit06dfdc3b8387755f43b00f32bf772b62ba5e681d (patch)
tree9a377fa78dbbf8145750a1309e744a0b6d929be8 /eval
parentec2a4866b81fb53a5ca449f6074bdcfcf81310dc (diff)
vespalib -> eval in cmake files
Diffstat (limited to 'eval')
-rw-r--r--eval/src/apps/eval_expr/.gitignore3
-rw-r--r--eval/src/apps/eval_expr/CMakeLists.txt2
-rw-r--r--eval/src/tests/eval/compile_cache/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/compiled_function/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/function/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/function_speed/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/gbdt/.gitignore4
-rw-r--r--eval/src/tests/eval/gbdt/CMakeLists.txt8
-rw-r--r--eval/src/tests/eval/interpreted_function/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/node_types/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/simple_tensor/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/tensor_function/CMakeLists.txt4
-rw-r--r--eval/src/tests/eval/value_cache/CMakeLists.txt8
-rw-r--r--eval/src/tests/eval/value_type/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/tensor_address/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/tensor_conformance/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/tensor_mapper/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/tensor_performance/CMakeLists.txt6
-rw-r--r--eval/src/tests/tensor/tensor_serialization/CMakeLists.txt4
-rw-r--r--eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt4
-rw-r--r--eval/src/vespa/eval/CMakeLists.txt1
26 files changed, 52 insertions, 56 deletions
diff --git a/eval/src/apps/eval_expr/.gitignore b/eval/src/apps/eval_expr/.gitignore
index 04661a7889c..265b57bcb5b 100644
--- a/eval/src/apps/eval_expr/.gitignore
+++ b/eval/src/apps/eval_expr/.gitignore
@@ -1,4 +1,3 @@
/.depend
/Makefile
-/eval_expr
-vespalib_eval_expr_app
+/eval_eval_expr_app
diff --git a/eval/src/apps/eval_expr/CMakeLists.txt b/eval/src/apps/eval_expr/CMakeLists.txt
index 8ceee029ec3..477287ceca7 100644
--- a/eval/src/apps/eval_expr/CMakeLists.txt
+++ b/eval/src/apps/eval_expr/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_executable(vespalib_eval_expr_app
+vespa_add_executable(eval_eval_expr_app
SOURCES
eval_expr.cpp
INSTALL bin
diff --git a/eval/src/tests/eval/compile_cache/CMakeLists.txt b/eval/src/tests/eval/compile_cache/CMakeLists.txt
index 1bfcdb808e4..459c25d0a44 100644
--- a/eval/src/tests/eval/compile_cache/CMakeLists.txt
+++ b/eval/src/tests/eval/compile_cache/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_compile_cache_test_app TEST
+vespa_add_executable(eval_compile_cache_test_app TEST
SOURCES
compile_cache_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_compile_cache_test_app COMMAND vespalib_compile_cache_test_app)
+vespa_add_test(NAME eval_compile_cache_test_app COMMAND eval_compile_cache_test_app)
diff --git a/eval/src/tests/eval/compiled_function/CMakeLists.txt b/eval/src/tests/eval/compiled_function/CMakeLists.txt
index 7443fcf7d8c..29d4e0440a2 100644
--- a/eval/src/tests/eval/compiled_function/CMakeLists.txt
+++ b/eval/src/tests/eval/compiled_function/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_compiled_function_test_app TEST
+vespa_add_executable(eval_compiled_function_test_app TEST
SOURCES
compiled_function_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_compiled_function_test_app COMMAND vespalib_compiled_function_test_app)
+vespa_add_test(NAME eval_compiled_function_test_app COMMAND eval_compiled_function_test_app)
diff --git a/eval/src/tests/eval/function/CMakeLists.txt b/eval/src/tests/eval/function/CMakeLists.txt
index d9c5c2b03e9..b4d47090028 100644
--- a/eval/src/tests/eval/function/CMakeLists.txt
+++ b/eval/src/tests/eval/function/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_function_test_app TEST
+vespa_add_executable(eval_function_test_app TEST
SOURCES
function_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_function_test_app COMMAND vespalib_function_test_app)
+vespa_add_test(NAME eval_function_test_app COMMAND eval_function_test_app)
diff --git a/eval/src/tests/eval/function_speed/CMakeLists.txt b/eval/src/tests/eval/function_speed/CMakeLists.txt
index b69bd2f622d..69778bafefd 100644
--- a/eval/src/tests/eval/function_speed/CMakeLists.txt
+++ b/eval/src/tests/eval/function_speed/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_function_speed_test_app TEST
+vespa_add_executable(eval_function_speed_test_app TEST
SOURCES
function_speed_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_function_speed_test_app NO_VALGRIND COMMAND vespalib_function_speed_test_app)
+vespa_add_test(NAME eval_function_speed_test_app NO_VALGRIND COMMAND eval_function_speed_test_app)
diff --git a/eval/src/tests/eval/gbdt/.gitignore b/eval/src/tests/eval/gbdt/.gitignore
index f2a7b65c2aa..d0ee762745c 100644
--- a/eval/src/tests/eval/gbdt/.gitignore
+++ b/eval/src/tests/eval/gbdt/.gitignore
@@ -1,3 +1 @@
-/gbdt_benchmark
-vespalib_gbdt_test_app
-vespalib_gbdt_benchmark_app
+/eval_gbdt_benchmark_app
diff --git a/eval/src/tests/eval/gbdt/CMakeLists.txt b/eval/src/tests/eval/gbdt/CMakeLists.txt
index 6c9be3b1a77..744b7451c33 100644
--- a/eval/src/tests/eval/gbdt/CMakeLists.txt
+++ b/eval/src/tests/eval/gbdt/CMakeLists.txt
@@ -1,15 +1,15 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_gbdt_test_app TEST
+vespa_add_executable(eval_gbdt_test_app TEST
SOURCES
gbdt_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_gbdt_test_app COMMAND vespalib_gbdt_test_app)
-vespa_add_executable(vespalib_gbdt_benchmark_app
+vespa_add_test(NAME eval_gbdt_test_app COMMAND eval_gbdt_test_app)
+vespa_add_executable(eval_gbdt_benchmark_app
SOURCES
gbdt_benchmark.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_gbdt_benchmark_app COMMAND vespalib_gbdt_benchmark_app BENCHMARK)
+vespa_add_test(NAME eval_gbdt_benchmark_app COMMAND eval_gbdt_benchmark_app BENCHMARK)
diff --git a/eval/src/tests/eval/interpreted_function/CMakeLists.txt b/eval/src/tests/eval/interpreted_function/CMakeLists.txt
index 363331408d3..ab09743b9d4 100644
--- a/eval/src/tests/eval/interpreted_function/CMakeLists.txt
+++ b/eval/src/tests/eval/interpreted_function/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_interpreted_function_test_app TEST
+vespa_add_executable(eval_interpreted_function_test_app TEST
SOURCES
interpreted_function_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_interpreted_function_test_app COMMAND vespalib_interpreted_function_test_app)
+vespa_add_test(NAME eval_interpreted_function_test_app COMMAND eval_interpreted_function_test_app)
diff --git a/eval/src/tests/eval/node_types/CMakeLists.txt b/eval/src/tests/eval/node_types/CMakeLists.txt
index 6dc7f1ec87e..343f3b28a90 100644
--- a/eval/src/tests/eval/node_types/CMakeLists.txt
+++ b/eval/src/tests/eval/node_types/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_node_types_test_app TEST
+vespa_add_executable(eval_node_types_test_app TEST
SOURCES
node_types_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_node_types_test_app COMMAND vespalib_node_types_test_app)
+vespa_add_test(NAME eval_node_types_test_app COMMAND eval_node_types_test_app)
diff --git a/eval/src/tests/eval/simple_tensor/CMakeLists.txt b/eval/src/tests/eval/simple_tensor/CMakeLists.txt
index 76c411799f1..02da07c15ac 100644
--- a/eval/src/tests/eval/simple_tensor/CMakeLists.txt
+++ b/eval/src/tests/eval/simple_tensor/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_simple_tensor_test_app TEST
+vespa_add_executable(eval_simple_tensor_test_app TEST
SOURCES
simple_tensor_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_simple_tensor_test_app COMMAND vespalib_simple_tensor_test_app)
+vespa_add_test(NAME eval_simple_tensor_test_app COMMAND eval_simple_tensor_test_app)
diff --git a/eval/src/tests/eval/tensor_function/CMakeLists.txt b/eval/src/tests/eval/tensor_function/CMakeLists.txt
index cef0ae4ca9b..a5ab651d45f 100644
--- a/eval/src/tests/eval/tensor_function/CMakeLists.txt
+++ b/eval/src/tests/eval/tensor_function/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_eval_tensor_function_test_app TEST
+vespa_add_executable(eval_eval_tensor_function_test_app TEST
SOURCES
tensor_function_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_eval_tensor_function_test_app COMMAND vespalib_eval_tensor_function_test_app)
+vespa_add_test(NAME eval_eval_tensor_function_test_app COMMAND eval_eval_tensor_function_test_app)
diff --git a/eval/src/tests/eval/value_cache/CMakeLists.txt b/eval/src/tests/eval/value_cache/CMakeLists.txt
index 67f7443dd6f..ad9f7aa1a36 100644
--- a/eval/src/tests/eval/value_cache/CMakeLists.txt
+++ b/eval/src/tests/eval/value_cache/CMakeLists.txt
@@ -1,15 +1,15 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_value_cache_test_app TEST
+vespa_add_executable(eval_value_cache_test_app TEST
SOURCES
value_cache_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_value_cache_test_app COMMAND vespalib_value_cache_test_app)
-vespa_add_executable(vespalib_tensor_loader_test_app TEST
+vespa_add_test(NAME eval_value_cache_test_app COMMAND eval_value_cache_test_app)
+vespa_add_executable(eval_tensor_loader_test_app TEST
SOURCES
tensor_loader_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_tensor_loader_test_app COMMAND vespalib_tensor_loader_test_app)
+vespa_add_test(NAME eval_tensor_loader_test_app COMMAND eval_tensor_loader_test_app)
diff --git a/eval/src/tests/eval/value_type/CMakeLists.txt b/eval/src/tests/eval/value_type/CMakeLists.txt
index 3afe7608955..13ae644fb23 100644
--- a/eval/src/tests/eval/value_type/CMakeLists.txt
+++ b/eval/src/tests/eval/value_type/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_value_type_test_app TEST
+vespa_add_executable(eval_value_type_test_app TEST
SOURCES
value_type_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_value_type_test_app NO_VALGRIND COMMAND vespalib_value_type_test_app)
+vespa_add_test(NAME eval_value_type_test_app NO_VALGRIND COMMAND eval_value_type_test_app)
diff --git a/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt b/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
index 9b81004ee13..d042bdbe3c5 100644
--- a/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_dense_dot_product_function_test_app TEST
+vespa_add_executable(eval_dense_dot_product_function_test_app TEST
SOURCES
dense_dot_product_function_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_dense_dot_product_function_test_app COMMAND vespalib_dense_dot_product_function_test_app)
+vespa_add_test(NAME eval_dense_dot_product_function_test_app COMMAND eval_dense_dot_product_function_test_app)
diff --git a/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt b/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
index 6435466bc93..70f23d109bb 100644
--- a/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_dense_tensor_address_combiner_test_app TEST
+vespa_add_executable(eval_dense_tensor_address_combiner_test_app TEST
SOURCES
dense_tensor_address_combiner_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_dense_tensor_address_combiner_test_app COMMAND vespalib_dense_tensor_address_combiner_test_app)
+vespa_add_test(NAME eval_dense_tensor_address_combiner_test_app COMMAND eval_dense_tensor_address_combiner_test_app)
diff --git a/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt b/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
index 0abfd884411..85a512c380d 100644
--- a/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_dense_tensor_builder_test_app TEST
+vespa_add_executable(eval_dense_tensor_builder_test_app TEST
SOURCES
dense_tensor_builder_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_dense_tensor_builder_test_app COMMAND vespalib_dense_tensor_builder_test_app)
+vespa_add_test(NAME eval_dense_tensor_builder_test_app COMMAND eval_dense_tensor_builder_test_app)
diff --git a/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt b/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
index a3b57bcf5c9..2db9088a219 100644
--- a/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_dense_tensor_function_compiler_test_app TEST
+vespa_add_executable(eval_dense_tensor_function_compiler_test_app TEST
SOURCES
dense_tensor_function_compiler_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_dense_tensor_function_compiler_test_app COMMAND vespalib_dense_tensor_function_compiler_test_app)
+vespa_add_test(NAME eval_dense_tensor_function_compiler_test_app COMMAND eval_dense_tensor_function_compiler_test_app)
diff --git a/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt b/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
index b866610e749..6ae45e57108 100644
--- a/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
+++ b/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_sparse_tensor_builder_test_app TEST
+vespa_add_executable(eval_sparse_tensor_builder_test_app TEST
SOURCES
sparse_tensor_builder_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_sparse_tensor_builder_test_app COMMAND vespalib_sparse_tensor_builder_test_app)
+vespa_add_test(NAME eval_sparse_tensor_builder_test_app COMMAND eval_sparse_tensor_builder_test_app)
diff --git a/eval/src/tests/tensor/tensor_address/CMakeLists.txt b/eval/src/tests/tensor/tensor_address/CMakeLists.txt
index ed13b0b6eb0..f8dc392c310 100644
--- a/eval/src/tests/tensor/tensor_address/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_address/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_tensor_address_test_app TEST
+vespa_add_executable(eval_tensor_address_test_app TEST
SOURCES
tensor_address_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_tensor_address_test_app COMMAND vespalib_tensor_address_test_app)
+vespa_add_test(NAME eval_tensor_address_test_app COMMAND eval_tensor_address_test_app)
diff --git a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
index 40fb4bff19f..b6369da08d9 100644
--- a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_tensor_tensor_conformance_test_app TEST
+vespa_add_executable(eval_tensor_tensor_conformance_test_app TEST
SOURCES
tensor_conformance_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_tensor_tensor_conformance_test_app COMMAND vespalib_tensor_tensor_conformance_test_app)
+vespa_add_test(NAME eval_tensor_tensor_conformance_test_app COMMAND eval_tensor_tensor_conformance_test_app)
diff --git a/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt b/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
index e9cd3e9fe9d..3772e449054 100644
--- a/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_tensor_mapper_test_app TEST
+vespa_add_executable(eval_tensor_mapper_test_app TEST
SOURCES
tensor_mapper_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_tensor_mapper_test_app COMMAND vespalib_tensor_mapper_test_app)
+vespa_add_test(NAME eval_tensor_mapper_test_app COMMAND eval_tensor_mapper_test_app)
diff --git a/eval/src/tests/tensor/tensor_performance/CMakeLists.txt b/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
index cb98b72022d..58c93afe9ee 100644
--- a/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
@@ -1,12 +1,12 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_tensor_performance_test_app TEST
+vespa_add_executable(eval_tensor_performance_test_app TEST
SOURCES
tensor_performance_test.cpp
DEPENDS
eval
)
vespa_add_test(
- NAME vespalib_tensor_performance_test_app
- COMMAND vespalib_tensor_performance_test_app
+ NAME eval_tensor_performance_test_app
+ COMMAND eval_tensor_performance_test_app
ENVIRONMENT "TEST_SUBSET=SMOKETEST"
)
diff --git a/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt b/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
index d1098d2f2de..32a89e0af9f 100644
--- a/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_tensor_serialization_test_app TEST
+vespa_add_executable(eval_tensor_serialization_test_app TEST
SOURCES
tensor_serialization_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_tensor_serialization_test_app COMMAND vespalib_tensor_serialization_test_app)
+vespa_add_test(NAME eval_tensor_serialization_test_app COMMAND eval_tensor_serialization_test_app)
diff --git a/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt b/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
index a5cc1f0eaee..b1479f588da 100644
--- a/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
@@ -1,8 +1,8 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_tensor_slime_serialization_test_app TEST
+vespa_add_executable(eval_tensor_slime_serialization_test_app TEST
SOURCES
tensor_slime_serialization_test.cpp
DEPENDS
eval
)
-vespa_add_test(NAME vespalib_tensor_slime_serialization_test_app COMMAND vespalib_tensor_slime_serialization_test_app)
+vespa_add_test(NAME eval_tensor_slime_serialization_test_app COMMAND eval_tensor_slime_serialization_test_app)
diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt
index adaeab701ad..08f226de040 100644
--- a/eval/src/vespa/eval/CMakeLists.txt
+++ b/eval/src/vespa/eval/CMakeLists.txt
@@ -11,6 +11,5 @@ vespa_add_library(eval
$<TARGET_OBJECTS:eval_tensor_serialization>
INSTALL lib64
DEPENDS
- vespalib
LLVM-3.4
)