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

Merge branch 'matrices-revision' into 'develop' 

Matrices revision

See merge request !45
parents 3271efbb b36b0fe5

src/Benchmarks/SpMV/OldSpMV/tnl-benchmark-old-spmv.cpp

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/***************************************************************************

                          tnl-benchmark-spmv.cpp  -  description

                             -------------------

    begin                : Jun 5, 2014

    copyright            : (C) 2014 by Tomas Oberhuber

    email                : tomas.oberhuber@fjfi.cvut.cz

 ***************************************************************************/



/* See Copyright Notice in tnl/Copyright */





#include "tnl-benchmark-old-spmv.h"

src/Benchmarks/SpMV/OldSpMV/tnl-benchmark-old-spmv.cu

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/***************************************************************************

                          tnl-benchmark-spmv.cu  -  description

                             -------------------

    begin                : Jun 5, 2014

    copyright            : (C) 2014 by Tomas Oberhuber

    email                : tomas.oberhuber@fjfi.cvut.cz

 ***************************************************************************/



/* See Copyright Notice in tnl/Copyright */





#include "tnl-benchmark-old-spmv.h"

src/Benchmarks/SpMV/OldSpMV/tnl-benchmark-old-spmv.h

0 → 100644
+925 −0

File added.

Preview size limit exceeded, changes collapsed.

src/Benchmarks/SpMV/tnlCusparseCSRMatrix.h→src/Benchmarks/SpMV/OldSpMV/tnlCusparseCSRMatrix.h

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


/* See Copyright Notice in tnl/Copyright */



#ifdef NOT_USED_ANYMORE



#include <TNL/Assert.h>

#include <TNL/Devices/Cuda.h>

#ifdef HAVE_CUDA
@@ -157,3 +159,4 @@ class CusparseCSR< float > : public CusparseCSRBase< float > 


} // namespace TNL



#endif
 
 No newline at end of file

src/Benchmarks/SpMV/cusparseCSRMatrix.h

0 → 100644
+158 −0
Original line number Diff line number Diff line 
/***************************************************************************

                          tnlCusparseCSR.h  -  description

                             -------------------

    begin                : Jul 3, 2014

    copyright            : (C) 2014 by Tomas Oberhuber

    email                : tomas.oberhuber@fjfi.cvut.cz

 ***************************************************************************/



/* See Copyright Notice in tnl/Copyright */



#include <TNL/Assert.h>

#include <TNL/Devices/Cuda.h>

#ifdef HAVE_CUDA

#include <cusparse.h>

#endif



namespace TNL {



template< typename Real >

class CusparseCSRBase

{

   public:

      typedef Real RealType;

      typedef Devices::Cuda DeviceType;

      typedef Matrices::CSR< RealType, Devices::Cuda, int > MatrixType;



      CusparseCSRBase()

      : matrix( 0 )

      {

      };



#ifdef HAVE_CUDA

      void init( const MatrixType& matrix,

                 cusparseHandle_t* cusparseHandle )

      {

         this->matrix = &matrix;

         this->cusparseHandle = cusparseHandle;

         cusparseCreateMatDescr( & this->matrixDescriptor );

      };

#endif



      int getRows() const

      {

         return matrix->getRows();

      }



      int getColumns() const

      {

         return matrix->getColumns();

      }



      int getNumberOfMatrixElements() const

      {

         return matrix->getNumberOfMatrixElements();

      }





      template< typename InVector,

                typename OutVector >

      void vectorProduct( const InVector& inVector,

                          OutVector& outVector ) const

      {

         TNL_ASSERT_TRUE( matrix, "matrix was not initialized" );

#ifdef HAVE_CUDA

         cusparseDcsrmv( *( this->cusparseHandle ),

                         CUSPARSE_OPERATION_NON_TRANSPOSE,

                         this->matrix->getRows(),

                         this->matrix->getColumns(),

                         this->matrix->values.getSize(),

                         1.0,

                         this->matrixDescriptor,

                         this->matrix->values.getData(),

                         this->matrix->rowPointers.getData(),

                         this->matrix->columnIndexes.getData(),

                         inVector.getData(),

                         1.0,

                         outVector.getData() );

#endif

      }



   protected:



      const MatrixType* matrix;

#ifdef HAVE_CUDA

      cusparseHandle_t* cusparseHandle;



      cusparseMatDescr_t matrixDescriptor;

#endif

};





template< typename Real >

class CusparseCSR

{};



template<>

class CusparseCSR< double > : public CusparseCSRBase< double >

{

   public:



      template< typename InVector,

                typename OutVector >

      void vectorProduct( const InVector& inVector,

                          OutVector& outVector ) const

      {

         TNL_ASSERT_TRUE( matrix, "matrix was not initialized" );

#ifdef HAVE_CUDA  

	 double d = 1.0;       

         double* alpha = &d;

         cusparseDcsrmv( *( this->cusparseHandle ),

                         CUSPARSE_OPERATION_NON_TRANSPOSE,

                         this->matrix->getRows(),

                         this->matrix->getColumns(),

                         this->matrix->getValues().getSize(),

                         alpha,

                         this->matrixDescriptor,

                         this->matrix->getValues().getData(),

                         this->matrix->getRowPointers().getData(),

                         this->matrix->getColumnIndexes().getData(),

                         inVector.getData(),

                         alpha,

                         outVector.getData() );

#endif         

      }

};



template<>

class CusparseCSR< float > : public CusparseCSRBase< float >

{

   public:



      template< typename InVector,

                typename OutVector >

      void vectorProduct( const InVector& inVector,

                          OutVector& outVector ) const

      {

         TNL_ASSERT_TRUE( matrix, "matrix was not initialized" );

#ifdef HAVE_CUDA         

         float d = 1.0;       

         float* alpha = &d;

         cusparseScsrmv( *( this->cusparseHandle ),

                         CUSPARSE_OPERATION_NON_TRANSPOSE,

                         this->matrix->getRows(),

                         this->matrix->getColumns(),

                         this->matrix->getValues().getSize(),

                         alpha,

                         this->matrixDescriptor,

                         this->matrix->getValues().getData(),

                         this->matrix->getRowPointers().getData(),

                         this->matrix->getColumnIndexes().getData(),

                         inVector.getData(),

                         alpha,

                         outVector.getData() );

#endif         

      }

};



} // namespace TNL
 
 No newline at end of file