Skip to content
Snippets Groups Projects
Commit 0994eb03 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

NVCC Bug: Very likely tnl-benchmark-spmv code is correct but nvcc 10.1 does not accept it.

parent b99bbe77
No related branches found
No related tags found
1 merge request!89To/matrices adaptive csr
...@@ -173,8 +173,8 @@ benchmarkSpMVLegacy( Benchmark& benchmark, ...@@ -173,8 +173,8 @@ benchmarkSpMVLegacy( Benchmark& benchmark,
const String& inputFileName, const String& inputFileName,
bool verboseMR ) bool verboseMR )
{ {
using HostMatrix = Matrix< Real, Devices::Host, int >; using HostMatrix = Matrix< Real, TNL::Devices::Host, int >;
using CudaMatrix = Matrix< Real, Devices::Cuda, int >; using CudaMatrix = Matrix< Real, TNL::Devices::Cuda, int >;
using HostVector = Containers::Vector< Real, Devices::Host, int >; using HostVector = Containers::Vector< Real, Devices::Host, int >;
using CudaVector = Containers::Vector< Real, Devices::Cuda, int >; using CudaVector = Containers::Vector< Real, Devices::Cuda, int >;
...@@ -322,8 +322,8 @@ benchmarkSpmvSynthetic( Benchmark& benchmark, ...@@ -322,8 +322,8 @@ benchmarkSpmvSynthetic( Benchmark& benchmark,
///// /////
// Benchmarking TNL formats // Benchmarking TNL formats
/*benchmarkSpMV< Real, SparseMatrix_CSR_Scalar >( benchmark, hostOutVector, inputFileName, verboseMR ); benchmarkSpMVLegacy< Real, SparseMatrix_CSR_Scalar >( benchmark, hostOutVector, inputFileName, verboseMR );
benchmarkSpMV< Real, SparseMatrix_CSR_Vector >( benchmark, hostOutVector, inputFileName, verboseMR ); /*benchmarkSpMV< Real, SparseMatrix_CSR_Vector >( benchmark, hostOutVector, inputFileName, verboseMR );
benchmarkSpMV< Real, SparseMatrix_CSR_Hybrid >( benchmark, hostOutVector, inputFileName, verboseMR ); benchmarkSpMV< Real, SparseMatrix_CSR_Hybrid >( benchmark, hostOutVector, inputFileName, verboseMR );
benchmarkSpMV< Real, SparseMatrix_CSR_Adaptive >( benchmark, hostOutVector, inputFileName, verboseMR ); benchmarkSpMV< Real, SparseMatrix_CSR_Adaptive >( benchmark, hostOutVector, inputFileName, verboseMR );
benchmarkSpMV< Real, SparseMatrix_Ellpack >( benchmark, hostOutVector, inputFileName, verboseMR ); benchmarkSpMV< Real, SparseMatrix_Ellpack >( benchmark, hostOutVector, inputFileName, verboseMR );
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
#include <TNL/Devices/Cuda.h> #include <TNL/Devices/Cuda.h>
#include <TNL/Config/parseCommandLine.h> #include <TNL/Config/parseCommandLine.h>
#include <Benchmarks/BLAS/array-operations.h>
#include <Benchmarks/BLAS/vector-operations.h>
#include "spmv-legacy.h" #include "spmv-legacy.h"
#include <TNL/Matrices/MatrixReader.h> #include <TNL/Matrices/MatrixReader.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment