From fa362ab6fca270c3aa3c4d1a5d4475365ce2c0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20=C4=8Cejka?= Date: Fri, 25 Feb 2022 18:26:16 +0100 Subject: [PATCH 1/3] Added getFormat for DenseMatrix. --- src/TNL/Matrices/MatrixInfo.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/TNL/Matrices/MatrixInfo.h b/src/TNL/Matrices/MatrixInfo.h index 9afc76f69..d93426df9 100644 --- a/src/TNL/Matrices/MatrixInfo.h +++ b/src/TNL/Matrices/MatrixInfo.h @@ -50,6 +50,9 @@ template< typename Real, struct MatrixInfo< DenseMatrix< Real, Device, Index, Organization, RealAllocator > > : public MatrixInfo< typename DenseMatrix< Real, Device, Index, Organization, RealAllocator >::ViewType > { + static String getDensity() { return String( "dense" ); }; + + static String getFormat() { return "Dense"; }; }; template< typename Real, -- GitLab From 2aa75f557f8084f69c449976690cb3094a829e49 Mon Sep 17 00:00:00 2001 From: Tomas Oberhuber Date: Sat, 26 Feb 2022 20:26:40 +0100 Subject: [PATCH 2/3] Fixing matrix info for dense matrices. --- src/TNL/Matrices/MatrixInfo.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/TNL/Matrices/MatrixInfo.h b/src/TNL/Matrices/MatrixInfo.h index d93426df9..832b2d32d 100644 --- a/src/TNL/Matrices/MatrixInfo.h +++ b/src/TNL/Matrices/MatrixInfo.h @@ -40,6 +40,8 @@ template< typename Real, struct MatrixInfo< DenseMatrixView< Real, Device, Index, Organization > > { static String getDensity() { return String( "dense" ); }; + + static String getFormat() { return "Dense"; }; }; template< typename Real, @@ -50,9 +52,6 @@ template< typename Real, struct MatrixInfo< DenseMatrix< Real, Device, Index, Organization, RealAllocator > > : public MatrixInfo< typename DenseMatrix< Real, Device, Index, Organization, RealAllocator >::ViewType > { - static String getDensity() { return String( "dense" ); }; - - static String getFormat() { return "Dense"; }; }; template< typename Real, -- GitLab From 1ac1fd29e6a53dd2238172dc14a41b96068771d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= Date: Mon, 28 Feb 2022 08:50:19 +0100 Subject: [PATCH 3/3] Fixed unused variable in spmv benchmark. --- src/Benchmarks/SpMV/spmv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Benchmarks/SpMV/spmv.h b/src/Benchmarks/SpMV/spmv.h index af7dc03d4..c24f32971 100644 --- a/src/Benchmarks/SpMV/spmv.h +++ b/src/Benchmarks/SpMV/spmv.h @@ -663,7 +663,7 @@ dispatchSymmetric( BenchmarkType& benchmark, { using SymmetricInputMatrix = TNL::Matrices::SparseMatrix< Real, TNL::Devices::Host, int, TNL::Matrices::SymmetricMatrix >; using InputMatrix = TNL::Matrices::SparseMatrix< Real, TNL::Devices::Host, int >; - bool allCpuTests = parameters.getParameter< bool >( "with-all-cpu-tests" ); + //bool allCpuTests = parameters.getParameter< bool >( "with-all-cpu-tests" ); bool withEllpack = parameters.getParameter< bool >( "with-ellpack-formats" ); SymmetricInputMatrix symmetricHostMatrix; try -- GitLab