eigen2support: disable sparse tests, and do not require to define YES_I_KNOW_NOT_STABLE

This commit is contained in:
Benoit Jacob 2011-01-31 08:44:49 -05:00
parent 374deaed5f
commit 7032ec80ae
3 changed files with 12 additions and 6 deletions

View File

@ -11,6 +11,10 @@
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>
#ifdef EIGEN2_SUPPORT
#define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET
#endif
#ifndef EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET #ifndef EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET
#error The sparse module API is not stable yet. To use it anyway, please define the EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET preprocessor token. #error The sparse module API is not stable yet. To use it anyway, please define the EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET preprocessor token.
#endif #endif

View File

@ -46,12 +46,13 @@ ei_add_test(eigen2_newstdvector)
if(QT4_FOUND) if(QT4_FOUND)
ei_add_test(eigen2_qtvector " " "${QT_QTCORE_LIBRARY}") ei_add_test(eigen2_qtvector " " "${QT_QTCORE_LIBRARY}")
endif(QT4_FOUND) endif(QT4_FOUND)
if(NOT EIGEN_DEFAULT_TO_ROW_MAJOR) # no support for eigen2 sparse module
ei_add_test(eigen2_sparse_vector) # if(NOT EIGEN_DEFAULT_TO_ROW_MAJOR)
ei_add_test(eigen2_sparse_basic) # ei_add_test(eigen2_sparse_vector)
ei_add_test(eigen2_sparse_solvers " " "${SPARSE_LIBS}") # ei_add_test(eigen2_sparse_basic)
ei_add_test(eigen2_sparse_product) # ei_add_test(eigen2_sparse_solvers " " "${SPARSE_LIBS}")
endif() # ei_add_test(eigen2_sparse_product)
# endif()
ei_add_test(eigen2_swap) ei_add_test(eigen2_swap)
ei_add_test(eigen2_visitor) ei_add_test(eigen2_visitor)
ei_add_test(eigen2_bug_132) ei_add_test(eigen2_bug_132)

View File

@ -110,6 +110,7 @@ namespace Eigen
#else // EIGEN_DEBUG_ASSERTS #else // EIGEN_DEBUG_ASSERTS
#undef eigen_assert
#define eigen_assert(a) \ #define eigen_assert(a) \
if( (!(a)) && (!no_more_assert) ) \ if( (!(a)) && (!no_more_assert) ) \
{ \ { \