Remove deprecated code not used by evaluators

6 files changed, 4 insertions, 53 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 075b8d3de..530e9e4e1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -139,11 +139,6 @@ endif(TEST_LIB)
 set_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT "Official")
 add_custom_target(BuildOfficial)
 
-option(EIGEN_TEST_NO_EVALUATORS "Disable evaluators in unit tests" OFF)
-if(EIGEN_TEST_NO_EVALUATORS)
-  add_definitions("-DEIGEN_TEST_NO_EVALUATORS=1")
-endif(EIGEN_TEST_NO_EVALUATORS)
-
 ei_add_test(meta)
 ei_add_test(sizeof)
 ei_add_test(dynalloc)
diff --git a/test/evaluators.cpp b/test/evaluators.cpp
index 2ca453b1c..f41968da8 100644
--- a/test/evaluators.cpp
+++ b/test/evaluators.cpp
@@ -1,16 +1,4 @@
 
-#ifndef EIGEN_ENABLE_EVALUATORS
-#define EIGEN_ENABLE_EVALUATORS
-#endif
-
-#ifdef EIGEN_TEST_EVALUATORS
-#undef EIGEN_TEST_EVALUATORS
-#endif
-
-#ifdef EIGEN_TEST_NO_EVALUATORS
-#undef EIGEN_TEST_NO_EVALUATORS
-#endif
-
 #include "main.h"
 
 namespace Eigen {
diff --git a/test/mixingtypes.cpp b/test/mixingtypes.cpp
index 976e21e37..048f7255a 100644
--- a/test/mixingtypes.cpp
+++ b/test/mixingtypes.cpp
@@ -53,12 +53,10 @@ template<int SizeAtCompileType> void mixingtypes(int size = SizeAtCompileType)
   mf+mf;
   VERIFY_RAISES_ASSERT(mf+md);
   VERIFY_RAISES_ASSERT(mf+mcf);
-#ifndef EIGEN_TEST_EVALUATORS
-  // they do not even compile when using evaluators
-  VERIFY_RAISES_ASSERT(vf=vd);
-  VERIFY_RAISES_ASSERT(vf+=vd);
-  VERIFY_RAISES_ASSERT(mcd=md);
-#endif
+  // the following do not even compile since the introduction of evaluators
+//   VERIFY_RAISES_ASSERT(vf=vd);
+//   VERIFY_RAISES_ASSERT(vf+=vd);
+//   VERIFY_RAISES_ASSERT(mcd=md);
   
   // check scalar products
   VERIFY_IS_APPROX(vcf * sf , vcf * complex<float>(sf));
diff --git a/test/nesting_ops.cpp b/test/nesting_ops.cpp
index 114dd5e41..6e772c70f 100644
--- a/test/nesting_ops.cpp
+++ b/test/nesting_ops.cpp
@@ -11,12 +11,7 @@
 
 template <typename MatrixType> void run_nesting_ops(const MatrixType& _m)
 {
-#ifndef EIGEN_TEST_EVALUATORS
-  // TODO, with evaluator, the following is not correct anymore:
-  typename MatrixType::Nested m(_m);
-#else
   typename internal::nested_eval<MatrixType,2>::type m(_m);
-#endif
 
   // Make really sure that we are in debug mode!
   VERIFY_RAISES_ASSERT(eigen_assert(false));
diff --git a/test/sparse_vector.cpp b/test/sparse_vector.cpp
index 6cd5a9a8c..5eea9edfd 100644
--- a/test/sparse_vector.cpp
+++ b/test/sparse_vector.cpp
@@ -71,10 +71,7 @@ template<typename Scalar,typename Index> void sparse_vector(int rows, int cols)
   VERIFY_IS_APPROX(v1.dot(v2), refV1.dot(refV2));
   VERIFY_IS_APPROX(v1.dot(refV2), refV1.dot(refV2));
 
-#ifdef EIGEN_TEST_EVALUATORS
-  // the following did not compiled without evaluators
   VERIFY_IS_APPROX(m1*v2, refM1*refV2);
-#endif
   VERIFY_IS_APPROX(v1.dot(m1*v2), refV1.dot(refM1*refV2));
   int i = internal::random<int>(0,rows-1);
   VERIFY_IS_APPROX(v1.dot(m1.col(i)), refV1.dot(refM1.col(i)));
diff --git a/test/vectorization_logic.cpp b/test/vectorization_logic.cpp
index 303eb6cf0..2f839cf51 100644
--- a/test/vectorization_logic.cpp
+++ b/test/vectorization_logic.cpp
@@ -45,22 +45,14 @@ std::string demangle_flags(int f)
 template<typename Dst, typename Src>
 bool test_assign(const Dst&, const Src&, int traversal, int unrolling)
 {
-#ifdef EIGEN_TEST_EVALUATORS
   typedef internal::copy_using_evaluator_traits<internal::evaluator<Dst>,internal::evaluator<Src>, internal::assign_op<typename Dst::Scalar> > traits;
-#else
-  typedef internal::assign_traits<Dst,Src> traits;
-#endif
   bool res = traits::Traversal==traversal && traits::Unrolling==unrolling;
   if(!res)
   {
     std::cerr << "Src: " << demangle_flags(Src::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Src>::Flags) << std::endl;
-#endif
     std::cerr << "Dst: " << demangle_flags(Dst::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Dst>::Flags) << std::endl;
-#endif
     traits::debug();
     std::cerr << " Expected Traversal == " << demangle_traversal(traversal)
               << " got " << demangle_traversal(traits::Traversal) << "\n";
@@ -73,22 +65,14 @@ bool test_assign(const Dst&, const Src&, int traversal, int unrolling)
 template<typename Dst, typename Src>
 bool test_assign(int traversal, int unrolling)
 {
-#ifdef EIGEN_TEST_EVALUATORS
   typedef internal::copy_using_evaluator_traits<internal::evaluator<Dst>,internal::evaluator<Src>, internal::assign_op<typename Dst::Scalar> > traits;
-#else
-  typedef internal::assign_traits<Dst,Src> traits;
-#endif
   bool res = traits::Traversal==traversal && traits::Unrolling==unrolling;
   if(!res)
   {
     std::cerr << "Src: " << demangle_flags(Src::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Src>::Flags) << std::endl;
-#endif
     std::cerr << "Dst: " << demangle_flags(Dst::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << "     " << demangle_flags(internal::evaluator<Dst>::Flags) << std::endl;
-#endif
     traits::debug();
     std::cerr << " Expected Traversal == " << demangle_traversal(traversal)
               << " got " << demangle_traversal(traits::Traversal) << "\n";
@@ -101,19 +85,13 @@ bool test_assign(int traversal, int unrolling)
 template<typename Xpr>
 bool test_redux(const Xpr&, int traversal, int unrolling)
 {
-#ifdef EIGEN_TEST_EVALUATORS
   typedef internal::redux_traits<internal::scalar_sum_op<typename Xpr::Scalar>,internal::redux_evaluator<Xpr> > traits;
-#else
-  typedef internal::redux_traits<internal::scalar_sum_op<typename Xpr::Scalar>,Xpr> traits;
-#endif
   
   bool res = traits::Traversal==traversal && traits::Unrolling==unrolling;
   if(!res)
   {
     std::cerr << demangle_flags(Xpr::Flags) << std::endl;
-#ifdef EIGEN_TEST_EVALUATORS
     std::cerr << demangle_flags(internal::evaluator<Xpr>::Flags) << std::endl;
-#endif
     traits::debug();
     
     std::cerr << " Expected Traversal == " << demangle_traversal(traversal)