diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2016-10-18 10:19:03 +0200 |
|---|---|---|
| committer | Cedric Nugteren <web@cedricnugteren.nl> | 2016-10-18 10:19:03 +0200 |
| commit | d0b8ca9fbaba8f29b31fa2c64f82bf150db0f1d0 (patch) | |
| tree | b17c1024d50905fbef202b2e9890e1c5daaac229 /test/correctness/testblas.hpp | |
| parent | 53deed298facc005f71e9ec2a96d5c4e90d826af (diff) | |
Fixed compilation issues of the testers for Visual Studio 2013: mostly conversions of class constants to static
Diffstat (limited to 'test/correctness/testblas.hpp')
| -rw-r--r-- | test/correctness/testblas.hpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/correctness/testblas.hpp b/test/correctness/testblas.hpp index 4b773801..da572e01 100644 --- a/test/correctness/testblas.hpp +++ b/test/correctness/testblas.hpp @@ -51,26 +51,26 @@ class TestBlas: public Tester<T,U> { using Tester<T,U>::GetSizesString; // Test settings for the regular test. Append to these lists in case more tests are required. - const std::vector<size_t> kVectorDims = { 7, 93, 4096 }; - const std::vector<size_t> kIncrements = { 1, 2, 7 }; - const std::vector<size_t> kMatrixDims = { 7, 64 }; - const std::vector<size_t> kMatrixVectorDims = { 61, 512 }; - const std::vector<size_t> kBandSizes = { 4, 19 }; - const std::vector<size_t> kOffsets = GetOffsets(); - const std::vector<U> kAlphaValues = GetExampleScalars<U>(full_test_); - const std::vector<U> kBetaValues = GetExampleScalars<U>(full_test_); + static const std::vector<size_t> kVectorDims; + static const std::vector<size_t> kIncrements; + static const std::vector<size_t> kMatrixDims; + static const std::vector<size_t> kMatrixVectorDims; + static const std::vector<size_t> kBandSizes; + const std::vector<size_t> kOffsets; + const std::vector<U> kAlphaValues; + const std::vector<U> kBetaValues; // Test settings for the invalid tests - const std::vector<size_t> kInvalidIncrements = { 0, 1 }; - const size_t kBufferSize = 64; - const std::vector<size_t> kMatSizes = {0, kBufferSize*kBufferSize-1, kBufferSize*kBufferSize}; - const std::vector<size_t> kVecSizes = {0, kBufferSize - 1, kBufferSize}; + static const std::vector<size_t> kInvalidIncrements; + static const size_t kBufferSize; + static const std::vector<size_t> kMatSizes; + static const std::vector<size_t> kVecSizes; // The layout/transpose/triangle options to test with - const std::vector<Layout> kLayouts = {Layout::kRowMajor, Layout::kColMajor}; - const std::vector<Triangle> kTriangles = {Triangle::kUpper, Triangle::kLower}; - const std::vector<Side> kSides = {Side::kLeft, Side::kRight}; - const std::vector<Diagonal> kDiagonals = {Diagonal::kUnit, Diagonal::kNonUnit}; + static const std::vector<Layout> kLayouts; + static const std::vector<Triangle> kTriangles; + static const std::vector<Side> kSides; + static const std::vector<Diagonal> kDiagonals; static const std::vector<Transpose> kTransposes; // Data-type dependent, see .cc-file // Shorthand for the routine-specific functions passed to the tester |