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

Allow command line TESTSET

Browse Source 
Enable BOUNDED_VECTOR which picks up a VC7.1 problem


[SVN r24790]
This commit is contained in:
Michael Stevens
2004-08-27 16:12:23 +00:00
parent b1f2f1d73a
commit 40ed084a8b
3 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Jamfile
View File

@@ -27,21 +27,21 @@ import testing ;
# Adaptors: USE_ADAPTOR
UBLAS_TESTSET ?=
<define>USE_DOUBLE <define>USE_STD_COMPLEX
<define>USE_RANGE <define>USE_SLICE
<define>USE_UNBOUNDED_ARRAY <define>USE_MATRIX ;
USE_DOUBLE USE_STD_COMPLEX
USE_RANGE USE_SLICE
USE_UNBOUNDED_ARRAY USE_BOUNDED_VECTOR USE_MATRIX ;
# 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
UBLAS_TESTSET_SPARSE ?=
<define>USE_DOUBLE <define>USE_STD_COMPLEX
# <define>USE_RANGE <define>USE_SLICE Too complex for regression testing
<define>USE_UNBOUNDED_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 ;
USE_DOUBLE USE_STD_COMPLEX
# USE_RANGE USE_SLICE Too complex for regression testing
USE_UNBOUNDED_ARRAY
USE_STD_MAP
USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ;
test-suite numeric/uBLAS
@@ -52,7 +52,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test2/test2.cpp
@@ -62,7 +62,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test3/test3.cpp
@@ -72,7 +72,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET_SPARSE)
<define>$(UBLAS_TESTSET_SPARSE)
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test4/test4.cpp
@@ -82,7 +82,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test5/test5.cpp
@@ -92,7 +92,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test6/test6.cpp
@@ -102,7 +102,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
# Test7 checks uBLAS operation with interval types.
@@ -115,7 +115,7 @@ test-suite numeric/uBLAS
# : # input files
# : # requirements
# <define>BOOST_UBLAS_USE_INTERVAL
# $(UBLAS_TESTSET)
# <define>$(UBLAS_TESTSET)
# <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
# ]
[ compile concepts.cpp

34
Jamfile.v2
View File

@@ -14,22 +14,24 @@ import testing ;
# Matrix types: USE_MATRIX USE_BOUNDED_MATRIX USE_VECTOR_OF_VECTOR
# Adaptors: USE_ADAPTOR
UBLAS_TESTSET = [ modules.peek : UBLAS_TESTSET ] ;
UBLAS_TESTSET ?=
<define>USE_DOUBLE <define>USE_STD_COMPLEX
<define>USE_RANGE <define>USE_SLICE
<define>USE_UNBOUNDED_ARRAY <define>USE_MATRIX ;
USE_DOUBLE USE_STD_COMPLEX
USE_RANGE USE_SLICE
USE_UNBOUNDED_ARRAY USE_BOUNDED_VECTOR USE_MATRIX ;
# 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
UBLAS_TESTSET_SPARSE = [ modules.peek : UBLAS_TESTSET_SPARSE ] ;
UBLAS_TESTSET_SPARSE ?=
<define>USE_DOUBLE <define>USE_STD_COMPLEX
# <define>USE_RANGE <define>USE_SLICE # Too complex for regression testing
<define>USE_UNBOUNDED_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 ;
USE_DOUBLE USE_STD_COMPLEX
# USE_RANGE USE_SLICE # Too complex for regression testing
USE_UNBOUNDED_ARRAY
USE_STD_MAP
USE_SPARSE_VECTOR USE_COMPRESSED_VECTOR USE_COORDINATE_VECTOR
USE_SPARSE_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX ;
# Settings propogated to individual project targets, but not test-suite
@@ -46,7 +48,7 @@ test-suite numeric/uBLAS
: # args
: # input files
: # requirements
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test2/test2.cpp
@@ -54,7 +56,7 @@ test-suite numeric/uBLAS
test2/test22.cpp
test2/test23.cpp
: : :
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test3/test3.cpp
@@ -62,7 +64,7 @@ test-suite numeric/uBLAS
test3/test32.cpp
test3/test33.cpp
: : :
$(UBLAS_TESTSET_SPARSE)
<define>$(UBLAS_TESTSET_SPARSE)
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test4/test4.cpp
@@ -70,7 +72,7 @@ test-suite numeric/uBLAS
test4/test42.cpp
test4/test43.cpp
: : :
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test5/test5.cpp
@@ -78,7 +80,7 @@ test-suite numeric/uBLAS
test5/test52.cpp
test5/test53.cpp
: : :
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
[ run test6/test6.cpp
@@ -86,7 +88,7 @@ test-suite numeric/uBLAS
test6/test62.cpp
test6/test63.cpp
: : :
$(UBLAS_TESTSET)
<define>$(UBLAS_TESTSET)
<toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
]
# Test7 checks uBLAS operation with interval types.
@@ -97,7 +99,7 @@ test-suite numeric/uBLAS
# test7/test73.cpp
# : : :
# <define>BOOST_UBLAS_USE_INTERVAL
# $(UBLAS_TESTSET)
# <define>$(UBLAS_TESTSET)
# <toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
# ]
[ compile concepts.cpp

2
include/boost/numeric/ublas/config.hpp
View File

@@ -87,6 +87,8 @@
// Version 7.1
#if BOOST_MSVC == 1310
//#define BOOST_UBLAS_NO_DERIVED_HELPERS
// One of these workarounds is needed for MSVC 7.1 AFAIK
// (thanks to John Maddock and Martin Lauer).
// The second workaround looks like BOOST_UBLAS_QUALIFIED_TYPENAME.