boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-20 03:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Test Macro's defined in Jamfiles

Browse Source 
Test header undef stupid compiler faults
 complex tests disabled when ICL fails to link


[SVN r24460]
This commit is contained in:
Michael Stevens
2004-08-13 14:07:54 +00:00
parent 2353f1a29d
commit da9e3a2ca3
17 changed files with 107 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Jamfile
View File

@@ -27,6 +27,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test2/test2.cpp
@@ -36,6 +37,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test3/test3.cpp
@@ -45,6 +47,9 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<define>USE_MAP_ARRAY <define>USE_STD_MAP
<define>USE_SPARSE_VECTOR <define>USE_COMPRESSED_VECTOR <define>USE_COORDINATE_VECTOR <define>USE_SPARSE_MATRIX <define>USE_COMPRESSED_MATRIX <define>USE_COORDINATE_MATRIX
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test4/test4.cpp
@@ -54,6 +59,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test5/test5.cpp
@@ -63,6 +69,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test6/test6.cpp
@@ -72,6 +79,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
# Test7 checks uBLAS operation with interval types.
@@ -84,6 +92,8 @@ test-suite numeric/uBLAS
# : # input files
# : # requirements
# <define>BOOST_UBLAS_USE_INTERVAL
# <define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
# <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
# ]
[ compile concepts.cpp
: # requirements

44
Jamfile.v2
View File

@@ -6,11 +6,21 @@
# Bring in rules for testing
import testing ;
# Macros determining features to tests:
# Value types: USE_FLOAT USE_DOUBLE USE_STD_COMPLEX
# Proxies: USE_RANGE USE_SLICE
# Storage types: USE_BOUNDED_ARRAY USE_UNBOUNDED_ARRAY
# Vector types: USE_STD_VECTOR USE_BOUNDED_VECTOR
# Matrix types: USE_MATRIX USE_BOUNDED_MATRIX USE_VECTOR_OF_VECTOR
# Adaptors: USE_ADAPTOR
#
# Sparse storage: USE_MAP_ARRAY USE_STD_MAP
# Sparse vectors: USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
# Sparse matrices: USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_SPARSE_VECTOR_OF_SPARSE_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
project
: requirements
# Useful for GCC-3.3 on some platforms (MacOS-X)
# <gcc><*><cxxflags>"-fabi-version=0"
;
test-suite numeric/uBLAS
@@ -21,31 +31,50 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test2/test2.cpp
test2/test21.cpp
test2/test22.cpp
test2/test23.cpp
: : :
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test3/test3.cpp
test3/test31.cpp
test3/test32.cpp
test3/test33.cpp
: : :
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<define>USE_MAP_ARRAY <define>USE_STD_MAP
<define>USE_SPARSE_VECTOR <define>USE_COMPRESSED_VECTOR <define>USE_COORDINATE_VECTOR <define>USE_SPARSE_MATRIX <define>USE_COMPRESSED_MATRIX <define>USE_COORDINATE_MATRIX
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test4/test4.cpp
test4/test41.cpp
test4/test42.cpp
test4/test43.cpp
: : :
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test5/test5.cpp
test5/test51.cpp
test5/test52.cpp
test5/test53.cpp
: : :
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test6/test6.cpp
test6/test61.cpp
test6/test62.cpp
test6/test63.cpp
: : :
<define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
# Test7 checks uBLAS operation with interval types.
# This causes too much compiler badness. Issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
@@ -53,11 +82,14 @@ test-suite numeric/uBLAS
# test7/test71.cpp
# test7/test72.cpp
# test7/test73.cpp
# : # args
# : # input files
# : # requirements
# <define>BOOST_UBLAS_USE_INTERVAL
# : : :
# <define>BOOST_UBLAS_USE_INTERVAL
# <define>USE_DOUBLE <define>USE_STD_COMPLEX <define>USE_RANGE <define>USE_SLICE <define>USE_UNBOUNDED_ARRAY
# <toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
# ]
[ compile concepts.cpp
: # requirements
<define>EXTERNAL
<toolset>intel-linux:<cxxflags>"-Xc"
]
;

4
test1/Jamfile
View File

@@ -22,10 +22,6 @@ exe test1
: $(SOURCES).cpp
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_SAFE
# <define>USE_BOUNDED_VECTOR
# <define>USE_BOUNDED_MATRIX
<define>USE_RANGE
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

30
test1/test1.hpp
View File

@@ -36,31 +36,19 @@ void initialize_matrix (M &m) {
}
void test_vector ();
void test_matrix_vector ();
void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// MSVC Version 6.0 & 7.0 have problems with std complex
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
#define USE_STD_COMPLEX
// Disable some tests for truly broken compilers
// MSVC Version 6.0 & 7.0 have problems compiling with std::complex
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
#undef USE_STD_COMPLEX
#endif
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY
// #define USE_STD_VECTOR
// #define USE_BOUNDED_VECTOR
#define USE_MATRIX
// #define USE_BOUNDED_MATRIX
// #define USE_VECTOR_OF_VECTOR
// Intel for Windows fails to link when a std::complex is returned!
#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL)
#undef USE_STD_COMPLEX
#endif
#endif

2
test1/test12.cpp
View File

@@ -298,5 +298,3 @@ void test_matrix_vector () {
#endif
#endif
}

1
test2/Jamfile
View File

@@ -22,7 +22,6 @@ exe test2
: $(SOURCES).cpp
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_SAFE
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

15
test2/test2.hpp
View File

@@ -81,11 +81,16 @@ struct test_blas_3 {
void operator () ();
};
#define USE_FLOAT
#define USE_DOUBLE
// MSVC Version 6.0 & 7.0 have problems with std complex
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
#define USE_STD_COMPLEX
// Disable some tests for truly broken compilers
// MSVC Version 6.0 & 7.0 have problems compiling with std::complex
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
#undef USE_STD_COMPLEX
#endif
// Intel for Windows fails to link when a std::complex is returned!
#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL)
#undef USE_STD_COMPLEX
#endif
#endif

4
test3/Jamfile
View File

@@ -22,9 +22,7 @@ exe test3
: $(SOURCES).cpp
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_SAFE
<define>USE_RANGE
<intel-linux><*><cxxflags>"-Xc"
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

38
test3/test3.hpp
View File

@@ -36,36 +36,22 @@ void initialize_matrix (M &m) {
}
void test_vector ();
void test_matrix_vector ();
void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
#define USE_STD_COMPLEX
// FIXME range and slice are failing
#undef USE_RANGE
#undef USE_SLICE
// Disable some tests for truly broken compilers
// MSVC Version 6.0 & 7.0 have problems compiling with std::complex
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
#undef USE_STD_COMPLEX
#endif
//FIXME range and slice are failing
//#define USE_RANGE
//#define USE_SLICE
#define USE_MAP_ARRAY
#define USE_STD_MAP
#define USE_SPARSE_VECTOR
#define USE_COMPRESSED_VECTOR
#define USE_COORDINATE_VECTOR
#define USE_SPARSE_MATRIX
// #define USE_SPARSE_VECTOR_OF_SPARSE_VECTOR
// #define USE_GENERALIZED_VECTOR_OF_VECTOR
#define USE_COMPRESSED_MATRIX
#define USE_COORDINATE_MATRIX
// Intel for Windows fails to link when a std::complex is returned!
#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL)
#undef USE_STD_COMPLEX
#endif
#endif

3
test4/Jamfile
View File

@@ -22,9 +22,6 @@ exe test4
: $(SOURCES).cpp
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_SAFE
<define>USE_RANGE
<define>USE_ADAPTOR
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

24
test4/test4.hpp
View File

@@ -44,25 +44,19 @@ void initialize_matrix (M &m) {
}
void test_vector ();
void test_matrix_vector ();
void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
#define USE_STD_COMPLEX
// Disable some tests for truly broken compilers
// MSVC Version 6.0 & 7.0 have problems compiling with std::complex
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
#undef USE_STD_COMPLEX
#endif
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY
// #define USE_STD_VECTOR
// define USE_ADAPTOR
// Intel for Windows fails to link when a std::complex is returned!
#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL)
#undef USE_STD_COMPLEX
#endif
#endif

3
test5/Jamfile
View File

@@ -22,9 +22,6 @@ exe test5
: $(SOURCES).cpp
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_SAFE
<define>USE_RANGE
<define>USE_ADAPTOR
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

24
test5/test5.hpp
View File

@@ -61,25 +61,19 @@ void initialize_matrix (M &m) {
void test_vector ();
void test_matrix_vector ();
void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
#define USE_STD_COMPLEX
// Disable some tests for truly broken compilers
// MSVC Version 6.0 & 7.0 have problems compiling with std::complex
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
#undef USE_STD_COMPLEX
#endif
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY
// #define USE_STD_VECTOR
// #define USE_ADAPTOR
// Intel for Windows fails to link when a std::complex is returned!
#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL)
#undef USE_STD_COMPLEX
#endif
#endif

3
test6/Jamfile
View File

@@ -22,9 +22,6 @@ exe test6
: $(SOURCES).cpp
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_SAFE
<define>USE_RANGE
<define>USE_ADAPTOR
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

23
test6/test6.hpp
View File

@@ -61,24 +61,19 @@ void initialize_matrix (M &m) {
void test_vector ();
void test_matrix_vector ();
void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
// #define USE_STD_COMPLEX
// #define USE_RANGE
// #define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY
// #define USE_STD_VECTOR
// #define USE_ADAPTOR
// Disable some tests for truly broken compilers
// MSVC Version 6.0 & 7.0 have problems compiling with std::complex
#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
#undef USE_STD_COMPLEX
#endif
// Intel for Windows fails to link when a std::complex is returned!
#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800) && defined(__ICL)
#undef USE_STD_COMPLEX
#endif
#endif

2
test7/Jamfile
View File

@@ -23,8 +23,6 @@ exe test7
: <include>$(BOOST_ROOT)
<sysinclude>$(BOOST_ROOT)
<define>BOOST_UBLAS_USE_INTERVAL
<define>BOOST_UBLAS_SAFE
<define>USE_RANGE
# <gcc><*><cxxflags>"-fabi-version=0"
<intel-linux><*><cxxflags>"-Xc"
;

15
test7/test7.hpp
View File

@@ -36,24 +36,9 @@ void initialize_matrix (M &m) {
}
void test_vector ();
void test_matrix_vector ();
void test_matrix ();
// #define USE_FLOAT
#define USE_DOUBLE
#define USE_STD_COMPLEX
#define USE_RANGE
#define USE_SLICE
// #define USE_BOUNDED_ARRAY
#define USE_UNBOUNDED_ARRAY
// #define USE_STD_VECTOR
#define USE_MATRIX
// #define USE_VECTOR_OF_VECTOR
#endif