From 26c33ed6c33f686f8299610d60218695f37080a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Fri, 26 Jul 2019 20:35:06 +0100
Subject: [PATCH] Cleaned up typedefs in CSR matrix
---
src/TNL/Matrices/CSR.h | 7 +------
src/TNL/Matrices/Matrix.h | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/TNL/Matrices/CSR.h b/src/TNL/Matrices/CSR.h
index 70eae6f4b3..64e202a677 100644
--- a/src/TNL/Matrices/CSR.h
+++ b/src/TNL/Matrices/CSR.h
@@ -47,18 +47,13 @@ public:
using RealType = Real;
using DeviceType = Device;
using IndexType = Index;
- typedef typename Sparse< RealType, DeviceType, IndexType >:: CompressedRowLengthsVector CompressedRowLengthsVector;
+ typedef typename Sparse< RealType, DeviceType, IndexType >::CompressedRowLengthsVector CompressedRowLengthsVector;
typedef typename Sparse< RealType, DeviceType, IndexType >::ConstCompressedRowLengthsVectorView ConstCompressedRowLengthsVectorView;
typedef CSR< Real, Devices::Host, Index > HostType;
typedef CSR< Real, Devices::Cuda, Index > CudaType;
typedef Sparse< Real, Device, Index > BaseType;
- //typedef typename BaseType::MatrixRow MatrixRow;
-
using MatrixRow = typename BaseType::MatrixRow;
using ConstMatrixRow = typename BaseType::ConstMatrixRow;
- //using typename BaseType::ConstMatrixRow;
- //typedef SparseRow< const RealType, const IndexType > ConstMatrixRow;
-
enum SPMVCudaKernel { scalar, vector, hybrid };
diff --git a/src/TNL/Matrices/Matrix.h b/src/TNL/Matrices/Matrix.h
index e8677b8532..eb29f62c76 100644
--- a/src/TNL/Matrices/Matrix.h
+++ b/src/TNL/Matrices/Matrix.h
@@ -32,7 +32,7 @@ public:
typedef Index IndexType;
typedef Containers::Vector< IndexType, DeviceType, IndexType > CompressedRowLengthsVector;
typedef Containers::VectorView< IndexType, DeviceType, IndexType > CompressedRowLengthsVectorView;
- typedef Containers::VectorView< const IndexType, DeviceType, IndexType > ConstCompressedRowLengthsVectorView;
+ typedef typename CompressedRowLengthsVectorView::ConstViewType ConstCompressedRowLengthsVectorView;
typedef Containers::Vector< RealType, DeviceType, IndexType > ValuesVector;
Matrix();
--
GitLab