From 46ee01f39ef067724c2fb6c79e7662295f0570af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Tue, 25 Feb 2020 22:04:13 +0100
Subject: [PATCH] Fixes of SegmentsViewType and SegmentViewType.
---
src/TNL/Containers/Segments/Ellpack.h | 2 +-
src/TNL/Containers/Segments/EllpackView.h | 2 +-
src/TNL/Containers/Segments/SlicedEllpack.h | 2 +-
src/TNL/Containers/Segments/SlicedEllpackView.h | 2 +-
src/TNL/Matrices/SparseMatrix.h | 1 +
src/TNL/Matrices/SparseMatrixView.h | 5 ++---
src/TNL/Matrices/SparseMatrixView.hpp | 1 +
7 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/TNL/Containers/Segments/Ellpack.h b/src/TNL/Containers/Segments/Ellpack.h
index c197c7010c..6edacb1cff 100644
--- a/src/TNL/Containers/Segments/Ellpack.h
+++ b/src/TNL/Containers/Segments/Ellpack.h
@@ -34,7 +34,7 @@ class Ellpack
using OffsetsHolder = Containers::Vector< IndexType, DeviceType, IndexType >;
using SegmentsSizes = OffsetsHolder;
template< typename Device_, typename Index_ >
- using ViewTemplate = EllpackView< Device_, Index_ >;
+ using ViewTemplate = EllpackView< Device_, Index_, RowMajorOrder, Alignment >;
using ViewType = EllpackView< Device, Index, RowMajorOrder, Alignment >;
//using ConstViewType = EllpackView< Device, std::add_const_t< Index >, RowMajorOrder, Alignment >;
using SegmentViewType = SegmentView< IndexType, RowMajorOrder >;
diff --git a/src/TNL/Containers/Segments/EllpackView.h b/src/TNL/Containers/Segments/EllpackView.h
index 3870f08028..dcbc56d1ba 100644
--- a/src/TNL/Containers/Segments/EllpackView.h
+++ b/src/TNL/Containers/Segments/EllpackView.h
@@ -35,7 +35,7 @@ class EllpackView
using OffsetsHolder = Containers::Vector< IndexType, DeviceType, IndexType >;
using SegmentsSizes = OffsetsHolder;
template< typename Device_, typename Index_ >
- using ViewTemplate = EllpackView< Device_, Index_ >;
+ using ViewTemplate = EllpackView< Device_, Index_, RowMajorOrder, Alignment >;
using ViewType = EllpackView;
using ConstViewType = EllpackView< Device, std::add_const_t< Index > >;
using SegmentViewType = SegmentView< IndexType, RowMajorOrder >;
diff --git a/src/TNL/Containers/Segments/SlicedEllpack.h b/src/TNL/Containers/Segments/SlicedEllpack.h
index 5953cde360..e1cdfa1d4d 100644
--- a/src/TNL/Containers/Segments/SlicedEllpack.h
+++ b/src/TNL/Containers/Segments/SlicedEllpack.h
@@ -35,7 +35,7 @@ class SlicedEllpack
static constexpr bool getRowMajorOrder() { return RowMajorOrder; }
using ViewType = SlicedEllpackView< Device, Index, RowMajorOrder, SliceSize >;
template< typename Device_, typename Index_ >
- using ViewTemplate = SlicedEllpackView< Device_, Index_ >;
+ using ViewTemplate = SlicedEllpackView< Device_, Index_, RowMajorOrder, SliceSize >;
using ConstViewType = SlicedEllpackView< Device, std::add_const_t< Index >, RowMajorOrder, SliceSize >;
using SegmentViewType = SegmentView< IndexType, RowMajorOrder >;
diff --git a/src/TNL/Containers/Segments/SlicedEllpackView.h b/src/TNL/Containers/Segments/SlicedEllpackView.h
index 2b310a805a..23001553c6 100644
--- a/src/TNL/Containers/Segments/SlicedEllpackView.h
+++ b/src/TNL/Containers/Segments/SlicedEllpackView.h
@@ -33,7 +33,7 @@ class SlicedEllpackView
static constexpr int getSliceSize() { return SliceSize; }
static constexpr bool getRowMajorOrder() { return RowMajorOrder; }
template< typename Device_, typename Index_ >
- using ViewTemplate = SlicedEllpackView< Device_, Index_ >;
+ using ViewTemplate = SlicedEllpackView< Device_, Index_, RowMajorOrder, SliceSize >;
using ViewType = SlicedEllpackView;
using ConstViewType = SlicedEllpackView< Device, std::add_const_t< Index > >;
using SegmentViewType = SegmentView< IndexType, RowMajorOrder >;
diff --git a/src/TNL/Matrices/SparseMatrix.h b/src/TNL/Matrices/SparseMatrix.h
index 81422eef3b..e31d9d6baf 100644
--- a/src/TNL/Matrices/SparseMatrix.h
+++ b/src/TNL/Matrices/SparseMatrix.h
@@ -40,6 +40,7 @@ class SparseMatrix : public Matrix< Real, Device, Index, RealAllocator >
using SegmentsType = Segments< Device, Index, IndexAllocator >;
template< typename Device_, typename Index_ >
using SegmentsViewTemplate = typename SegmentsType::template ViewTemplate< Device_, Index >;
+ using SegmentsViewType = typename SegmentsType::ViewType;
using SegmentViewType = typename SegmentsType::SegmentViewType;
using DeviceType = Device;
using IndexType = Index;
diff --git a/src/TNL/Matrices/SparseMatrixView.h b/src/TNL/Matrices/SparseMatrixView.h
index a611b54670..4fa65b70a0 100644
--- a/src/TNL/Matrices/SparseMatrixView.h
+++ b/src/TNL/Matrices/SparseMatrixView.h
@@ -51,7 +51,6 @@ class SparseMatrixView : public MatrixView< Real, Device, Index >
typedef Containers::VectorView< IndexType, DeviceType, IndexType > CompressedRowLengthsVectorView;
typedef typename CompressedRowLengthsVectorView::ConstViewType ConstCompressedRowLengthsVectorView;
-
__cuda_callable__
SparseMatrixView();
@@ -103,8 +102,8 @@ class SparseMatrixView : public MatrixView< Real, Device, Index >
const RealType& value,
const RealType& thisElementMultiplicator = 1.0 );
- RealType getElement( const IndexType row,
- const IndexType column ) const;
+ RealType getElement( IndexType row,
+ IndexType column ) const;
template< typename Vector >
__cuda_callable__
diff --git a/src/TNL/Matrices/SparseMatrixView.hpp b/src/TNL/Matrices/SparseMatrixView.hpp
index cb6afd8e45..4e52448068 100644
--- a/src/TNL/Matrices/SparseMatrixView.hpp
+++ b/src/TNL/Matrices/SparseMatrixView.hpp
@@ -209,6 +209,7 @@ SparseMatrixView< Real, Device, Index, MatrixType, SegmentsView >::
getRow( const IndexType& rowIdx ) -> RowView
{
TNL_ASSERT_LT( rowIdx, this->getRows(), "Row index is larger than number of matrix rows." );
+ typename RowView::SegmentViewType t = this->segments.getSegmentView( rowIdx );
return RowView( this->segments.getSegmentView( rowIdx ), this->values.getView(), this->columnIndexes.getView() );
}
--
GitLab