Commit a19246ae authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Implementing the Ellpack format in CUDA.

parent 82875d54

src/implementation/matrices/tnlEllpackMatrix_impl.h

+3 −2
Original line number Diff line number Diff line
@@ -190,12 +190,13 @@ bool tnlEllpackMatrix< Real, Device, Index > :: addElementFast( const IndexType 
                                                                const RealType& value,

                                                                const RealType& thisElementMultiplicator )

{

   tnlAssert( row >= 0 && row < this->rows &&

   // TODO: return this back when CUDA kernels support cerr

   /*tnlAssert( row >= 0 && row < this->rows &&

              column >= 0 && column <= this->rows,

              cerr << " row = " << row

                   << " column = " << column

                   << " this->rows = " << this->rows

                   << " this->columns = " << this-> columns );

                   << " this->columns = " << this-> columns );*/

   IndexType i( row * this->rowLengths );

   const IndexType rowEnd( i + this->rowLengths );

   while( i < rowEnd && this->columnIndexes[ i ] < column ) i++;

tests/unit-tests/matrices/tnlSparseMatrixTester.h

+4 −4
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ template< typename Matrix > 
class tnlSparseMatrixTester : public CppUnit :: TestCase

{

   public:

   typedef tnlMatrix MatrixType;

   typedef Matrix MatrixType;

   typedef typename Matrix::RealType RealType;

   typedef typename Matrix::DeviceType DeviceType;

   typedef typename Matrix::IndexType IndexType;

   typedef tnlVector< RealType, Device, IndexType > VectorType;

   typedef tnlVector< IndexType, Device, IndexType > IndexVector;

   typedef tnlSparseMatrixTester< RealType, Device, IndexType > TesterType;

   typedef tnlVector< RealType, DeviceType, IndexType > VectorType;

   typedef tnlVector< IndexType, DeviceType, IndexType > IndexVector;

   typedef tnlSparseMatrixTester< MatrixType > TesterType;

   typedef typename CppUnit::TestCaller< TesterType > TestCallerType;



   tnlSparseMatrixTester(){};