GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-30 00:32:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename build stages to multiples of 10; old stage 2 becomes stage 15, while stage 20 generates errors (instead of warnings) on conflicting API.

Browse Source
This commit is contained in:
Benoit Jacob 2011-01-23 18:22:18 -05:00
parent cc1f70abc3
commit 8df5bca979
6 changed files with 87 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Eigen/Core
View File

@ -221,30 +221,34 @@ inline static const char *SimdInstructionSetsInUse(void) {
#endif
}
#define STAGE1_FULL_EIGEN2_API 1
#define STAGE2_RESOLVE_API_CONFLICTS 2
#define STAGE3_FULL_EIGEN3_API 3
#define STAGE4_FULL_EIGEN3_STRICTNESS 4
#define STAGE9_NO_EIGEN2_SUPPORT 9
#define STAGE10_FULL_EIGEN2_API 10
#define STAGE15_RESOLVE_API_CONFLICTS_WARN 15
#define STAGE20_RESOLVE_API_CONFLICTS 20
#define STAGE30_FULL_EIGEN3_API 30
#define STAGE40_FULL_EIGEN3_STRICTNESS 40
#define STAGE99_NO_EIGEN2_SUPPORT 99
#ifdef EIGEN2_SUPPORT_STAGE1_FULL_EIGEN2_API
#ifdef EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API
#define EIGEN2_SUPPORT
#define EIGEN2_SUPPORT_STAGE STAGE1_FULL_EIGEN2_API
#elif defined EIGEN2_SUPPORT_STAGE2_RESOLVE_API_CONFLICTS
#define EIGEN2_SUPPORT_STAGE STAGE10_FULL_EIGEN2_API
#elif defined EIGEN2_SUPPORT_STAGE15_RESOLVE_API_CONFLICTS_WARN
#define EIGEN2_SUPPORT
#define EIGEN2_SUPPORT_STAGE STAGE2_RESOLVE_API_CONFLICTS
#elif defined EIGEN2_SUPPORT_STAGE3_FULL_EIGEN3_API
#define EIGEN2_SUPPORT_STAGE STAGE15_RESOLVE_API_CONFLICTS_WARN
#elif defined EIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS
#define EIGEN2_SUPPORT
#define EIGEN2_SUPPORT_STAGE STAGE3_FULL_EIGEN3_API
#elif defined EIGEN2_SUPPORT_STAGE4_FULL_EIGEN3_STRICTNESS
#define EIGEN2_SUPPORT_STAGE STAGE20_RESOLVE_API_CONFLICTS
#elif defined EIGEN2_SUPPORT_STAGE30_FULL_EIGEN3_API
#define EIGEN2_SUPPORT
#define EIGEN2_SUPPORT_STAGE STAGE4_FULL_EIGEN3_STRICTNESS
#define EIGEN2_SUPPORT_STAGE STAGE30_FULL_EIGEN3_API
#elif defined EIGEN2_SUPPORT_STAGE40_FULL_EIGEN3_STRICTNESS
#define EIGEN2_SUPPORT
#define EIGEN2_SUPPORT_STAGE STAGE40_FULL_EIGEN3_STRICTNESS
#elif defined EIGEN2_SUPPORT
// default to stage 3, that's what it's always meant
#define EIGEN2_SUPPORT_STAGE3_FULL_EIGEN3_API
#define EIGEN2_SUPPORT_STAGE STAGE3_FULL_EIGEN3_API
#define EIGEN2_SUPPORT_STAGE30_FULL_EIGEN3_API
#define EIGEN2_SUPPORT_STAGE STAGE30_FULL_EIGEN3_API
#else
#define EIGEN2_SUPPORT_STAGE STAGE9_NO_EIGEN2_SUPPORT
#define EIGEN2_SUPPORT_STAGE STAGE99_NO_EIGEN2_SUPPORT
#endif
#ifdef EIGEN2_SUPPORT

8
Eigen/src/Core/Dot.h
View File

@ -81,19 +81,19 @@ MatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const
eigen_assert(size() == other.size());
#if EIGEN2_SUPPORT_STAGE >= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API
return internal::dot_nocheck<Derived,OtherDerived>::run(*this, other);
#else
return internal::dot_nocheck<OtherDerived,Derived>::run(other,*this);
#endif
}
#if EIGEN2_SUPPORT_STAGE <= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE <= STAGE30_FULL_EIGEN3_API
/** \returns the dot product of *this with other, with the Eigen2 convention that the dot product is linear in the first variable
* (conjugating the second variable). Of course this only makes a difference in the complex case.
*
* This method is only available in EIGEN2_SUPPORT mode. With EIGEN2_SUPPORT_STAGE1_FULL_EIGEN2_API and
* EIGEN2_SUPPORT_STAGE2_RESOLVE_API_CONFLICTS, the dot() method itself uses it. With EIGEN2_SUPPORT_STAGE3_FULL_EIGEN3_API,
* This method is only available in EIGEN2_SUPPORT mode. With EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API and
* EIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS, the dot() method itself uses it. With EIGEN2_SUPPORT_STAGE30_FULL_EIGEN3_API,
* the dot() method no longer uses it, but it's still available.
*
* \only_for_vectors

2
Eigen/src/Core/Map.h
View File

@ -124,7 +124,7 @@ template<typename PlainObjectType, int MapOptions, typename StrideType> class Ma
EIGEN_DENSE_PUBLIC_INTERFACE(Map)
typedef typename Base::PointerType PointerType;
#if EIGEN2_SUPPORT_STAGE <= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE <= STAGE30_FULL_EIGEN3_API
typedef const Scalar* PointerArgType;
inline PointerType cast_to_pointer_type(PointerArgType ptr) { return const_cast<PointerType>(ptr); }
#else

18
Eigen/src/Core/MatrixBase.h
View File

@ -200,15 +200,17 @@ template<typename Derived> class MatrixBase
const DiagonalProduct<Derived, DiagonalDerived, OnTheRight>
operator*(const DiagonalBase<DiagonalDerived> &diagonal) const;
template<typename OtherDerived>
#if EIGEN2_SUPPORT_STAGE == STAGE2_RESOLVE_API_CONFLICTS
EIGEN_DEPRECATED
#endif
Scalar dot(const MatrixBase<OtherDerived>& other) const;
#if EIGEN2_SUPPORT_STAGE <= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE != STAGE20_RESOLVE_API_CONFLICTS
template<typename OtherDerived>
#if EIGEN2_SUPPORT_STAGE >= STAGE3_FULL_EIGEN3_API
#if EIGEN2_SUPPORT_STAGE == STAGE15_RESOLVE_API_CONFLICTS_WARN
EIGEN_DEPRECATED
#endif
Scalar dot(const MatrixBase<OtherDerived>& other) const;
#endif
#if EIGEN2_SUPPORT_STAGE != STAGE99_NO_EIGEN2_SUPPORT
template<typename OtherDerived>
#if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API
EIGEN_DEPRECATED
#endif
Scalar eigen2_dot(const MatrixBase<OtherDerived>& other) const;

53
Eigen/src/Eigen2Support/Meta.h
View File

@ -29,11 +29,58 @@ template<typename T>
struct ei_traits : internal::traits<T>
{};
template<typename T, typename U>
struct ei_is_same_type
struct ei_meta_true { enum { ret = 1 }; };
struct ei_meta_false { enum { ret = 0 }; };
template<bool Condition, typename Then, typename Else>
struct ei_meta_if { typedef Then ret; };
template<typename Then, typename Else>
struct ei_meta_if <false, Then, Else> { typedef Else ret; };
template<typename T, typename U> struct ei_is_same_type { enum { ret = 0 }; };
template<typename T> struct ei_is_same_type<T,T> { enum { ret = 1 }; };
template<typename T> struct ei_unref { typedef T type; };
template<typename T> struct ei_unref<T&> { typedef T type; };
template<typename T> struct ei_unpointer { typedef T type; };
template<typename T> struct ei_unpointer<T*> { typedef T type; };
template<typename T> struct ei_unpointer<T*const> { typedef T type; };
template<typename T> struct ei_unconst { typedef T type; };
template<typename T> struct ei_unconst<const T> { typedef T type; };
template<typename T> struct ei_unconst<T const &> { typedef T & type; };
template<typename T> struct ei_unconst<T const *> { typedef T * type; };
template<typename T> struct ei_cleantype { typedef T type; };
template<typename T> struct ei_cleantype<const T> { typedef typename ei_cleantype<T>::type type; };
template<typename T> struct ei_cleantype<const T&> { typedef typename ei_cleantype<T>::type type; };
template<typename T> struct ei_cleantype<T&> { typedef typename ei_cleantype<T>::type type; };
template<typename T> struct ei_cleantype<const T*> { typedef typename ei_cleantype<T>::type type; };
template<typename T> struct ei_cleantype<T*> { typedef typename ei_cleantype<T>::type type; };
/** \internal In short, it computes int(sqrt(\a Y)) with \a Y an integer.
* Usage example: \code ei_meta_sqrt<1023>::ret \endcode
*/
template<int Y,
int InfX = 0,
int SupX = ((Y==1) ? 1 : Y/2),
bool Done = ((SupX-InfX)<=1 ? true : ((SupX*SupX <= Y) && ((SupX+1)*(SupX+1) > Y))) >
// use ?: instead of || just to shut up a stupid gcc 4.3 warning
class ei_meta_sqrt
{
enum { ret = internal::is_same<T, U>::value };
enum {
MidX = (InfX+SupX)/2,
TakeInf = MidX*MidX > Y ? 1 : 0,
NewInf = int(TakeInf) ? InfX : int(MidX),
NewSup = int(TakeInf) ? int(MidX) : SupX
};
public:
enum { ret = ei_meta_sqrt<Y,NewInf,NewSup>::ret };
};
template<int Y, int InfX, int SupX>
class ei_meta_sqrt<Y, InfX, SupX, true> { public: enum { ret = (SupX*SupX <= Y) ? SupX : InfX }; };
#endif // EIGEN2_META_H

2
test/eigen2/CMakeLists.txt
View File

@ -2,7 +2,7 @@ add_custom_target(buildtests_eigen2)
add_custom_target(check_eigen2 COMMAND "ctest")
add_dependencies(check_eigen2 buildtests_eigen2)
add_definitions("-DEIGEN2_SUPPORT_STAGE1_FULL_EIGEN2_API")
add_definitions("-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API")
# Macro to add a test
#