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

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

View File

@@ -221,31 +221,35 @@ 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
#endif
#define EIGEN2_SUPPORT_STAGE STAGE99_NO_EIGEN2_SUPPORT
#endif
#ifdef EIGEN2_SUPPORT
#undef minor