Commit 46ee01f3 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber Committed by Tomáš Oberhuber
Browse files

Fixes of SegmentsViewType and SegmentViewType.

parent 335dd0fc

src/TNL/Containers/Segments/Ellpack.h

+1 −1
Original line number Diff line number Diff line
@@ -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 >;

src/TNL/Containers/Segments/EllpackView.h

+1 −1
Original line number Diff line number Diff line
@@ -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 >;

src/TNL/Containers/Segments/SlicedEllpack.h

+1 −1
Original line number Diff line number Diff line
@@ -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 >;

src/TNL/Containers/Segments/SlicedEllpackView.h

+1 −1
Original line number Diff line number Diff line
@@ -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 >;

src/TNL/Matrices/SparseMatrix.h

+1 −0
Original line number Diff line number Diff line
@@ -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;