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

Merge branch 'TO/matrices' into 'develop' 

To/matrices

See merge request !72
parents d5b936f9 033549c4

src/Benchmarks/BLAS/CMakeLists.txt

+4 −2
Original line number Diff line number Diff line 
if( BUILD_CUDA )

   #find_library( CUDADEVRT NAMES cudadevrt )

   cuda_add_executable( tnl-benchmark-blas tnl-benchmark-blas.cu )

   cuda_add_cublas_to_target( tnl-benchmark-blas )

    #target_link_libraries( tnl-benchmark-blas ${CUDADEVRT} )#${CUDA_TOOLKIT_ROOT_DIR}/lib64/libcudadevrt.a )

else()

    add_executable( tnl-benchmark-blas tnl-benchmark-blas.cpp )

endif()

src/Benchmarks/BLAS/spmv.h

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


#include <TNL/Pointers/DevicePointer.h>

#include <TNL/Matrices/Legacy/CSR.h>

#include <TNL/Matrices/Legacy/Ellpack.h>

#include <TNL/Matrices/Legacy/SlicedEllpack.h>

#include <TNL/Matrices/Legacy/ChunkedEllpack.h>

#include <Benchmarks/SpMV/ReferenceFormats/Legacy/Ellpack.h>

#include <Benchmarks/SpMV/ReferenceFormats/Legacy/SlicedEllpack.h>

#include <Benchmarks/SpMV/ReferenceFormats/Legacy/ChunkedEllpack.h>



namespace TNL {

namespace Benchmarks {

src/Benchmarks/SpMV/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
if( BUILD_CUDA )

    CUDA_ADD_EXECUTABLE( tnl-benchmark-spmv tnl-benchmark-spmv.cu )

    TARGET_LINK_LIBRARIES( tnl-benchmark-spmv ${CUDA_cusparse_LIBRARY} )

    TARGET_LINK_LIBRARIES( tnl-benchmark-spmv ${CUDA_cusparse_LIBRARY} ${CUDA_cudadevrt_LIBRARY} )

else()

    ADD_EXECUTABLE( tnl-benchmark-spmv tnl-benchmark-spmv.cpp )

endif()

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

deleted100644 → 0
+0 −14
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

deleted100644 → 0
+0 −12
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"