From 0994eb03a43cf8fa1684a3aa09cc306d3945df7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Mon, 1 Feb 2021 18:44:54 +0100
Subject: [PATCH] NVCC Bug: Very likely tnl-benchmark-spmv code is correct but
nvcc 10.1 does not accept it.
---
src/Benchmarks/SpMV/spmv-legacy.h | 8 ++++----
src/Benchmarks/SpMV/tnl-benchmark-spmv.h | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/Benchmarks/SpMV/spmv-legacy.h b/src/Benchmarks/SpMV/spmv-legacy.h
index 191b313628..690bbed7e8 100644
--- a/src/Benchmarks/SpMV/spmv-legacy.h
+++ b/src/Benchmarks/SpMV/spmv-legacy.h
@@ -173,8 +173,8 @@ benchmarkSpMVLegacy( Benchmark& benchmark,
const String& inputFileName,
bool verboseMR )
{
- using HostMatrix = Matrix< Real, Devices::Host, int >;
- using CudaMatrix = Matrix< Real, Devices::Cuda, int >;
+ using HostMatrix = Matrix< Real, TNL::Devices::Host, int >;
+ using CudaMatrix = Matrix< Real, TNL::Devices::Cuda, int >;
using HostVector = Containers::Vector< Real, Devices::Host, int >;
using CudaVector = Containers::Vector< Real, Devices::Cuda, int >;
@@ -322,8 +322,8 @@ benchmarkSpmvSynthetic( Benchmark& benchmark,
/////
// Benchmarking TNL formats
- /*benchmarkSpMV< Real, SparseMatrix_CSR_Scalar >( benchmark, hostOutVector, inputFileName, verboseMR );
- benchmarkSpMV< Real, SparseMatrix_CSR_Vector >( 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_Hybrid >( benchmark, hostOutVector, inputFileName, verboseMR );
benchmarkSpMV< Real, SparseMatrix_CSR_Adaptive >( benchmark, hostOutVector, inputFileName, verboseMR );
benchmarkSpMV< Real, SparseMatrix_Ellpack >( benchmark, hostOutVector, inputFileName, verboseMR );
diff --git a/src/Benchmarks/SpMV/tnl-benchmark-spmv.h b/src/Benchmarks/SpMV/tnl-benchmark-spmv.h
index 82d0e083c6..d4ec93934d 100644
--- a/src/Benchmarks/SpMV/tnl-benchmark-spmv.h
+++ b/src/Benchmarks/SpMV/tnl-benchmark-spmv.h
@@ -18,8 +18,6 @@
#include <TNL/Devices/Cuda.h>
#include <TNL/Config/parseCommandLine.h>
-#include <Benchmarks/BLAS/array-operations.h>
-#include <Benchmarks/BLAS/vector-operations.h>
#include "spmv-legacy.h"
#include <TNL/Matrices/MatrixReader.h>
--
GitLab