rename now-generic optimizer

11 files changed, 19 insertions, 19 deletions

diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt
index 7aad02bb67a..08a0a76b85c 100644
--- a/eval/CMakeLists.txt
+++ b/eval/CMakeLists.txt
@@ -54,7 +54,7 @@ vespa_define_module(
     src/tests/instruction/index_lookup_table
     src/tests/instruction/join_with_number
     src/tests/instruction/dense_add_dimension_optimizer
-    src/tests/instruction/dense_fast_rename_optimizer
+    src/tests/instruction/fast_rename_optimizer
     src/tests/instruction/dense_inplace_join_function
     src/tests/instruction/dense_pow_as_map_optimizer
     src/tests/instruction/dense_remove_dimension_optimizer
diff --git a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
index a58e3b789f7..0d585742841 100644
--- a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
+++ b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
@@ -7,7 +7,7 @@
 #include <vespa/eval/instruction/just_replace_type_function.h>
 #include <vespa/eval/instruction/dense_cell_range_function.h>
 #include <vespa/eval/instruction/dense_lambda_peek_function.h>
-#include <vespa/eval/instruction/dense_fast_rename_optimizer.h>
+#include <vespa/eval/instruction/fast_rename_optimizer.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/tensor_nodes.h>
diff --git a/eval/src/tests/instruction/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp b/eval/src/tests/instruction/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp
index cb3b69eabef..c8de9961ae8 100644
--- a/eval/src/tests/instruction/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp
+++ b/eval/src/tests/instruction/dense_add_dimension_optimizer/dense_add_dimension_optimizer_test.cpp
@@ -4,7 +4,7 @@
 #include <vespa/eval/eval/fast_value.h>
 #include <vespa/eval/eval/tensor_function.h>
 #include <vespa/eval/instruction/just_replace_type_function.h>
-#include <vespa/eval/instruction/dense_fast_rename_optimizer.h>
+#include <vespa/eval/instruction/fast_rename_optimizer.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/test/eval_fixture.h>
 
diff --git a/eval/src/tests/instruction/dense_fast_rename_optimizer/CMakeLists.txt b/eval/src/tests/instruction/dense_fast_rename_optimizer/CMakeLists.txt
deleted file mode 100644
index 32cf6c45d1e..00000000000
--- a/eval/src/tests/instruction/dense_fast_rename_optimizer/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(eval_dense_fast_rename_optimizer_test_app TEST
-    SOURCES
-    dense_fast_rename_optimizer_test.cpp
-    DEPENDS
-    vespaeval
-)
-vespa_add_test(NAME eval_dense_fast_rename_optimizer_test_app COMMAND eval_dense_fast_rename_optimizer_test_app)
diff --git a/eval/src/tests/instruction/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp b/eval/src/tests/instruction/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp
index de8341ee8b2..03863f5bfaf 100644
--- a/eval/src/tests/instruction/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp
+++ b/eval/src/tests/instruction/dense_remove_dimension_optimizer/dense_remove_dimension_optimizer_test.cpp
@@ -3,7 +3,7 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/eval/eval/tensor_function.h>
 #include <vespa/eval/instruction/just_replace_type_function.h>
-#include <vespa/eval/instruction/dense_fast_rename_optimizer.h>
+#include <vespa/eval/instruction/fast_rename_optimizer.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/test/eval_fixture.h>
 
diff --git a/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt b/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt
new file mode 100644
index 00000000000..a69f26f6a85
--- /dev/null
+++ b/eval/src/tests/instruction/fast_rename_optimizer/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(eval_fast_rename_optimizer_test_app TEST
+    SOURCES
+    fast_rename_optimizer_test.cpp
+    DEPENDS
+    vespaeval
+)
+vespa_add_test(NAME eval_fast_rename_optimizer_test_app COMMAND eval_fast_rename_optimizer_test_app)
diff --git a/eval/src/tests/instruction/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp b/eval/src/tests/instruction/fast_rename_optimizer/fast_rename_optimizer_test.cpp
index 29912112935..5680c5811f7 100644
--- a/eval/src/tests/instruction/dense_fast_rename_optimizer/dense_fast_rename_optimizer_test.cpp
+++ b/eval/src/tests/instruction/fast_rename_optimizer/fast_rename_optimizer_test.cpp
@@ -3,7 +3,7 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/eval/eval/tensor_function.h>
 #include <vespa/eval/instruction/just_replace_type_function.h>
-#include <vespa/eval/instruction/dense_fast_rename_optimizer.h>
+#include <vespa/eval/instruction/fast_rename_optimizer.h>
 #include <vespa/eval/eval/test/tensor_model.hpp>
 #include <vespa/eval/eval/test/eval_fixture.h>
 
diff --git a/eval/src/vespa/eval/eval/optimize_tensor_function.cpp b/eval/src/vespa/eval/eval/optimize_tensor_function.cpp
index cbd4192a84f..e74ea4915e9 100644
--- a/eval/src/vespa/eval/eval/optimize_tensor_function.cpp
+++ b/eval/src/vespa/eval/eval/optimize_tensor_function.cpp
@@ -8,7 +8,7 @@
 #include <vespa/eval/instruction/dense_xw_product_function.h>
 #include <vespa/eval/instruction/dense_matmul_function.h>
 #include <vespa/eval/instruction/dense_multi_matmul_function.h>
-#include <vespa/eval/instruction/dense_fast_rename_optimizer.h>
+#include <vespa/eval/instruction/fast_rename_optimizer.h>
 #include <vespa/eval/instruction/dense_add_dimension_optimizer.h>
 #include <vespa/eval/instruction/dense_single_reduce_function.h>
 #include <vespa/eval/instruction/dense_remove_dimension_optimizer.h>
@@ -64,7 +64,7 @@ const TensorFunction &optimize_for_factory(const ValueBuilderFactory &factory, c
             child.set(DenseTensorCreateFunction::optimize(child.get(), stash));
             child.set(DenseTensorPeekFunction::optimize(child.get(), stash));
             child.set(DenseLambdaPeekOptimizer::optimize(child.get(), stash));
-            child.set(DenseFastRenameOptimizer::optimize(child.get(), stash));
+            child.set(FastRenameOptimizer::optimize(child.get(), stash));
             child.set(DensePowAsMapOptimizer::optimize(child.get(), stash));
             child.set(DenseSimpleMapFunction::optimize(child.get(), stash));
             child.set(DenseSimpleJoinFunction::optimize(child.get(), stash));
diff --git a/eval/src/vespa/eval/instruction/CMakeLists.txt b/eval/src/vespa/eval/instruction/CMakeLists.txt
index b46f7de9c17..66c536e29d4 100644
--- a/eval/src/vespa/eval/instruction/CMakeLists.txt
+++ b/eval/src/vespa/eval/instruction/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_library(eval_instruction OBJECT
     dense_add_dimension_optimizer.cpp
     dense_cell_range_function.cpp
     dense_dot_product_function.cpp
-    dense_fast_rename_optimizer.cpp
     dense_lambda_peek_function.cpp
     dense_lambda_peek_optimizer.cpp
     dense_matmul_function.cpp
@@ -19,6 +18,7 @@ vespa_add_library(eval_instruction OBJECT
     dense_tensor_create_function.cpp
     dense_tensor_peek_function.cpp
     dense_xw_product_function.cpp
+    fast_rename_optimizer.cpp
     generic_concat.cpp
     generic_create.cpp
     generic_join.cpp
diff --git a/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.cpp b/eval/src/vespa/eval/instruction/fast_rename_optimizer.cpp
index 64974641c7f..1d7a18bf4a0 100644
--- a/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.cpp
+++ b/eval/src/vespa/eval/instruction/fast_rename_optimizer.cpp
@@ -1,6 +1,6 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "dense_fast_rename_optimizer.h"
+#include "fast_rename_optimizer.h"
 #include "just_replace_type_function.h"
 #include <vespa/eval/eval/value.h>
 
@@ -61,7 +61,7 @@ bool is_stable_rename(const ValueType &from_type, const ValueType &to_type,
 } // namespace vespalib::eval::<unnamed>
 
 const TensorFunction &
-DenseFastRenameOptimizer::optimize(const TensorFunction &expr, Stash &stash)
+FastRenameOptimizer::optimize(const TensorFunction &expr, Stash &stash)
 {
     if (auto rename = as<Rename>(expr)) {
         const ValueType &from_type = rename->child().result_type();
diff --git a/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.h b/eval/src/vespa/eval/instruction/fast_rename_optimizer.h
index 2882cdf6f30..0a6ba3b81ef 100644
--- a/eval/src/vespa/eval/instruction/dense_fast_rename_optimizer.h
+++ b/eval/src/vespa/eval/instruction/fast_rename_optimizer.h
@@ -11,7 +11,7 @@ namespace vespalib::eval {
  * dense tensor.
  * TODO: extend to mixed tensors.
  **/
-struct DenseFastRenameOptimizer {
+struct FastRenameOptimizer {
     static const TensorFunction &optimize(const TensorFunction &expr, Stash &stash);
 };