From 46652a2924fb637c36ad730ec5a75a09e42c417c Mon Sep 17 00:00:00 2001 From: Lukas Cejka <lukas.ostatek@gmail.com> Date: Tue, 4 Dec 2018 22:43:10 +0100 Subject: [PATCH] Commented out unnecessary tests for testing of CUDA function getNonZeroRowLength. --- src/UnitTests/Matrices/SparseMatrixTest.h | 188 +++++++++++----------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/src/UnitTests/Matrices/SparseMatrixTest.h b/src/UnitTests/Matrices/SparseMatrixTest.h index 5985c8f643..b436d38724 100644 --- a/src/UnitTests/Matrices/SparseMatrixTest.h +++ b/src/UnitTests/Matrices/SparseMatrixTest.h @@ -329,31 +329,31 @@ protected: // types for which MatrixTest is instantiated using ChEllpackMatrixTypes = ::testing::Types < - TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Host, short >, - TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Host, short >, - TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Host, short >, - TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, short >, - TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Host, int >, - TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Host, int >, - TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Host, int >, - TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, int >, - TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Host, long >, - TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Host, long >, - TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Host, long >, - TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, long >, +// TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Host, short >, +// TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Host, short >, +// TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Host, short >, +// TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, short >, +// TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Host, int >, +// TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Host, int >, +// TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Host, int >, +// TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, int >, +// TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Host, long >, +// TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Host, long >, +// TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Host, long >, +// TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Host, long >, #ifdef HAVE_CUDA - TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Cuda, short >, - TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Cuda, short >, - TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Cuda, short >, - TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, short >, - TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Cuda, int >, - TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Cuda, int >, - TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Cuda, int >, - TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, int >, - TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Cuda, long >, - TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Cuda, long >, - TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Cuda, long >, - TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, long > +// TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Cuda, short >, +// TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Cuda, short >, +// TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Cuda, short >, +// TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, short >, +// TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Cuda, int >, +// TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Cuda, int >, +// TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Cuda, int >, +// TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, int >, +// TNL::Matrices::ChunkedEllpack< int, TNL::Devices::Cuda, long >, +// TNL::Matrices::ChunkedEllpack< long, TNL::Devices::Cuda, long >, +// TNL::Matrices::ChunkedEllpack< float, TNL::Devices::Cuda, long >, +// TNL::Matrices::ChunkedEllpack< double, TNL::Devices::Cuda, long > #endif >; @@ -440,30 +440,30 @@ protected: // types for which MatrixTest is instantiated using CSRMatrixTypes = ::testing::Types < - TNL::Matrices::CSR< int, TNL::Devices::Host, short >, - TNL::Matrices::CSR< long, TNL::Devices::Host, short >, - TNL::Matrices::CSR< float, TNL::Devices::Host, short >, - TNL::Matrices::CSR< double, TNL::Devices::Host, short >, - TNL::Matrices::CSR< int, TNL::Devices::Host, int >, - TNL::Matrices::CSR< long, TNL::Devices::Host, int >, - TNL::Matrices::CSR< float, TNL::Devices::Host, int >, - TNL::Matrices::CSR< double, TNL::Devices::Host, int >, - TNL::Matrices::CSR< int, TNL::Devices::Host, long >, - TNL::Matrices::CSR< long, TNL::Devices::Host, long >, - TNL::Matrices::CSR< float, TNL::Devices::Host, long >, +// TNL::Matrices::CSR< int, TNL::Devices::Host, short >, +// TNL::Matrices::CSR< long, TNL::Devices::Host, short >, +// TNL::Matrices::CSR< float, TNL::Devices::Host, short >, +// TNL::Matrices::CSR< double, TNL::Devices::Host, short >, +// TNL::Matrices::CSR< int, TNL::Devices::Host, int >, +// TNL::Matrices::CSR< long, TNL::Devices::Host, int >, +// TNL::Matrices::CSR< float, TNL::Devices::Host, int >, +// TNL::Matrices::CSR< double, TNL::Devices::Host, int >, +// TNL::Matrices::CSR< int, TNL::Devices::Host, long >, +// TNL::Matrices::CSR< long, TNL::Devices::Host, long >, +// TNL::Matrices::CSR< float, TNL::Devices::Host, long >, TNL::Matrices::CSR< double, TNL::Devices::Host, long >, #ifdef HAVE_CUDA - TNL::Matrices::CSR< int, TNL::Devices::Cuda, short >, - TNL::Matrices::CSR< long, TNL::Devices::Cuda, short >, - TNL::Matrices::CSR< float, TNL::Devices::Cuda, short >, - TNL::Matrices::CSR< double, TNL::Devices::Cuda, short >, - TNL::Matrices::CSR< int, TNL::Devices::Cuda, int >, - TNL::Matrices::CSR< long, TNL::Devices::Cuda, int >, - TNL::Matrices::CSR< float, TNL::Devices::Cuda, int >, - TNL::Matrices::CSR< double, TNL::Devices::Cuda, int >, - TNL::Matrices::CSR< int, TNL::Devices::Cuda, long >, - TNL::Matrices::CSR< long, TNL::Devices::Cuda, long >, - TNL::Matrices::CSR< float, TNL::Devices::Cuda, long >, +// TNL::Matrices::CSR< int, TNL::Devices::Cuda, short >, +// TNL::Matrices::CSR< long, TNL::Devices::Cuda, short >, +// TNL::Matrices::CSR< float, TNL::Devices::Cuda, short >, +// TNL::Matrices::CSR< double, TNL::Devices::Cuda, short >, +// TNL::Matrices::CSR< int, TNL::Devices::Cuda, int >, +// TNL::Matrices::CSR< long, TNL::Devices::Cuda, int >, +// TNL::Matrices::CSR< float, TNL::Devices::Cuda, int >, +// TNL::Matrices::CSR< double, TNL::Devices::Cuda, int >, +// TNL::Matrices::CSR< int, TNL::Devices::Cuda, long >, +// TNL::Matrices::CSR< long, TNL::Devices::Cuda, long >, +// TNL::Matrices::CSR< float, TNL::Devices::Cuda, long >, TNL::Matrices::CSR< double, TNL::Devices::Cuda, long > #endif >; @@ -551,31 +551,31 @@ protected: // types for which MatrixTest is instantiated using EllpackMatrixTypes = ::testing::Types < - TNL::Matrices::Ellpack< int, TNL::Devices::Host, short >, - TNL::Matrices::Ellpack< long, TNL::Devices::Host, short >, - TNL::Matrices::Ellpack< float, TNL::Devices::Host, short >, - TNL::Matrices::Ellpack< double, TNL::Devices::Host, short >, - TNL::Matrices::Ellpack< int, TNL::Devices::Host, int >, - TNL::Matrices::Ellpack< long, TNL::Devices::Host, int >, - TNL::Matrices::Ellpack< float, TNL::Devices::Host, int >, - TNL::Matrices::Ellpack< double, TNL::Devices::Host, int >, - TNL::Matrices::Ellpack< int, TNL::Devices::Host, long >, - TNL::Matrices::Ellpack< long, TNL::Devices::Host, long >, - TNL::Matrices::Ellpack< float, TNL::Devices::Host, long >, - TNL::Matrices::Ellpack< double, TNL::Devices::Host, long >, +// TNL::Matrices::Ellpack< int, TNL::Devices::Host, short >, +// TNL::Matrices::Ellpack< long, TNL::Devices::Host, short >, +// TNL::Matrices::Ellpack< float, TNL::Devices::Host, short >, +// TNL::Matrices::Ellpack< double, TNL::Devices::Host, short >, +// TNL::Matrices::Ellpack< int, TNL::Devices::Host, int >, +// TNL::Matrices::Ellpack< long, TNL::Devices::Host, int >, +// TNL::Matrices::Ellpack< float, TNL::Devices::Host, int >, +// TNL::Matrices::Ellpack< double, TNL::Devices::Host, int >, +// TNL::Matrices::Ellpack< int, TNL::Devices::Host, long >, +// TNL::Matrices::Ellpack< long, TNL::Devices::Host, long >, +// TNL::Matrices::Ellpack< float, TNL::Devices::Host, long >, +// TNL::Matrices::Ellpack< double, TNL::Devices::Host, long >, #ifdef HAVE_CUDA - TNL::Matrices::Ellpack< int, TNL::Devices::Cuda, short >, - TNL::Matrices::Ellpack< long, TNL::Devices::Cuda, short >, - TNL::Matrices::Ellpack< float, TNL::Devices::Cuda, short >, - TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, short >, - TNL::Matrices::Ellpack< int, TNL::Devices::Cuda, int >, - TNL::Matrices::Ellpack< long, TNL::Devices::Cuda, int >, - TNL::Matrices::Ellpack< float, TNL::Devices::Cuda, int >, - TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, int >, - TNL::Matrices::Ellpack< int, TNL::Devices::Cuda, long >, - TNL::Matrices::Ellpack< long, TNL::Devices::Cuda, long >, - TNL::Matrices::Ellpack< float, TNL::Devices::Cuda, long >, - TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, long > +// TNL::Matrices::Ellpack< int, TNL::Devices::Cuda, short >, +// TNL::Matrices::Ellpack< long, TNL::Devices::Cuda, short >, +// TNL::Matrices::Ellpack< float, TNL::Devices::Cuda, short >, +// TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, short >, +// TNL::Matrices::Ellpack< int, TNL::Devices::Cuda, int >, +// TNL::Matrices::Ellpack< long, TNL::Devices::Cuda, int >, +// TNL::Matrices::Ellpack< float, TNL::Devices::Cuda, int >, +// TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, int >, +// TNL::Matrices::Ellpack< int, TNL::Devices::Cuda, long >, +// TNL::Matrices::Ellpack< long, TNL::Devices::Cuda, long >, +// TNL::Matrices::Ellpack< float, TNL::Devices::Cuda, long >, +// TNL::Matrices::Ellpack< double, TNL::Devices::Cuda, long > #endif >; @@ -662,31 +662,31 @@ protected: // types for which MatrixTest is instantiated using SlicedEllpackMatrixTypes = ::testing::Types < - TNL::Matrices::SlicedEllpack< int, TNL::Devices::Host, short >, - TNL::Matrices::SlicedEllpack< long, TNL::Devices::Host, short >, - TNL::Matrices::SlicedEllpack< float, TNL::Devices::Host, short >, - TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, short >, - TNL::Matrices::SlicedEllpack< int, TNL::Devices::Host, int >, - TNL::Matrices::SlicedEllpack< long, TNL::Devices::Host, int >, - TNL::Matrices::SlicedEllpack< float, TNL::Devices::Host, int >, - TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, int >, - TNL::Matrices::SlicedEllpack< int, TNL::Devices::Host, long >, - TNL::Matrices::SlicedEllpack< long, TNL::Devices::Host, long >, - TNL::Matrices::SlicedEllpack< float, TNL::Devices::Host, long >, - TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, long >, +// TNL::Matrices::SlicedEllpack< int, TNL::Devices::Host, short >, +// TNL::Matrices::SlicedEllpack< long, TNL::Devices::Host, short >, +// TNL::Matrices::SlicedEllpack< float, TNL::Devices::Host, short >, +// TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, short >, +// TNL::Matrices::SlicedEllpack< int, TNL::Devices::Host, int >, +// TNL::Matrices::SlicedEllpack< long, TNL::Devices::Host, int >, +// TNL::Matrices::SlicedEllpack< float, TNL::Devices::Host, int >, +// TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, int >, +// TNL::Matrices::SlicedEllpack< int, TNL::Devices::Host, long >, +// TNL::Matrices::SlicedEllpack< long, TNL::Devices::Host, long >, +// TNL::Matrices::SlicedEllpack< float, TNL::Devices::Host, long >, +// TNL::Matrices::SlicedEllpack< double, TNL::Devices::Host, long >, #ifdef HAVE_CUDA - TNL::Matrices::SlicedEllpack< int, TNL::Devices::Cuda, short >, - TNL::Matrices::SlicedEllpack< long, TNL::Devices::Cuda, short >, - TNL::Matrices::SlicedEllpack< float, TNL::Devices::Cuda, short >, - TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, short >, - TNL::Matrices::SlicedEllpack< int, TNL::Devices::Cuda, int >, - TNL::Matrices::SlicedEllpack< long, TNL::Devices::Cuda, int >, - TNL::Matrices::SlicedEllpack< float, TNL::Devices::Cuda, int >, - TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, int >, - TNL::Matrices::SlicedEllpack< int, TNL::Devices::Cuda, long >, - TNL::Matrices::SlicedEllpack< long, TNL::Devices::Cuda, long >, - TNL::Matrices::SlicedEllpack< float, TNL::Devices::Cuda, long >, - TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, long > +// TNL::Matrices::SlicedEllpack< int, TNL::Devices::Cuda, short >, +// TNL::Matrices::SlicedEllpack< long, TNL::Devices::Cuda, short >, +// TNL::Matrices::SlicedEllpack< float, TNL::Devices::Cuda, short >, +// TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, short >, +// TNL::Matrices::SlicedEllpack< int, TNL::Devices::Cuda, int >, +// TNL::Matrices::SlicedEllpack< long, TNL::Devices::Cuda, int >, +// TNL::Matrices::SlicedEllpack< float, TNL::Devices::Cuda, int >, +// TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, int >, +// TNL::Matrices::SlicedEllpack< int, TNL::Devices::Cuda, long >, +// TNL::Matrices::SlicedEllpack< long, TNL::Devices::Cuda, long >, +// TNL::Matrices::SlicedEllpack< float, TNL::Devices::Cuda, long >, +// TNL::Matrices::SlicedEllpack< double, TNL::Devices::Cuda, long > #endif >; -- GitLab