Commit c1072c2b authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Renaming CSRKernelHybrid to CSRHybridKernel.

parent 4496b4cb

src/TNL/Algorithms/Segments/CSR.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ using CSRVector = CSR< Device, Index, CSRVectorKernel< Index, Device >, IndexAll 
template< typename Device,

          typename Index,

          typename IndexAllocator = typename Allocators::Default< Device >::template Allocator< Index > >

using CSRHybrid = CSR< Device, Index, CSRKernelHybrid< Index, Device >, IndexAllocator >;

using CSRHybrid = CSR< Device, Index, CSRHybridKernel< Index, Device >, IndexAllocator >;



template< typename Device,

          typename Index,

src/TNL/Algorithms/Segments/CSRKernelHybrid.h→src/TNL/Algorithms/Segments/CSRHybridKernel.h

+5 −5
Original line number Diff line number Diff line 
/***************************************************************************

                          CSRKernelHybrid.h -  description

                          CSRHybridKernel.h -  description

                             -------------------

    begin                : Jan 23, 2021 -> Joe Biden inauguration

    copyright            : (C) 2021 by Tomas Oberhuber
@@ -22,12 +22,12 @@ namespace TNL { 


template< typename Index,

          typename Device >

struct CSRKernelHybrid

struct CSRHybridKernel

{

   using IndexType = Index;

   using DeviceType = Device;

   using ViewType = CSRKernelHybrid< Index, Device >;

   using ConstViewType = CSRKernelHybrid< Index, Device >;

   using ViewType = CSRHybridKernel< Index, Device >;

   using ConstViewType = CSRHybridKernel< Index, Device >;



   template< typename Offsets >

   void init( const Offsets& offsets );
@@ -63,4 +63,4 @@ struct CSRKernelHybrid 
   }  // namespace Algorithms

} // namespace TNL



#include <TNL/Algorithms/Segments/CSRKernelHybrid.hpp>
 
#include <TNL/Algorithms/Segments/CSRHybridKernel.hpp>

src/TNL/Algorithms/Segments/CSRKernelHybrid.hpp→src/TNL/Algorithms/Segments/CSRHybridKernel.hpp

+8 −8
Original line number Diff line number Diff line 
/***************************************************************************

                          CSRKernelHybrid.hpp -  description

                          CSRHybridKernel.hpp -  description

                             -------------------

    begin                : Jan 23, 2021 -> Joe Biden inauguration

    copyright            : (C) 2021 by Tomas Oberhuber
@@ -15,7 +15,7 @@ 
#include <TNL/Containers/VectorView.h>

#include <TNL/Algorithms/ParallelFor.h>

#include <TNL/Algorithms/Segments/details/LambdaAdapter.h>

#include <TNL/Algorithms/Segments/CSRKernelHybrid.h>

#include <TNL/Algorithms/Segments/CSRHybridKernel.h>



namespace TNL {

   namespace Algorithms {
@@ -86,7 +86,7 @@ template< typename Index, 
          typename Device >

    template< typename Offsets >

void

CSRKernelHybrid< Index, Device >::

CSRHybridKernel< Index, Device >::

init( const Offsets& offsets )

{

    const Index segmentsCount = offsets.getSize() - 1;
@@ -99,7 +99,7 @@ init( const Offsets& offsets ) 
template< typename Index,

          typename Device >

void

CSRKernelHybrid< Index, Device >::

CSRHybridKernel< Index, Device >::

reset()

{

    this->threadsPerSegment = 0;
@@ -108,7 +108,7 @@ reset() 
template< typename Index,

          typename Device >

auto

CSRKernelHybrid< Index, Device >::

CSRHybridKernel< Index, Device >::

getView() -> ViewType

{

    return *this;
@@ -117,7 +117,7 @@ getView() -> ViewType 
template< typename Index,

          typename Device >

TNL::String

CSRKernelHybrid< Index, Device >::

CSRHybridKernel< Index, Device >::

getKernelType()

{

    return "Hybrid";
@@ -126,7 +126,7 @@ getKernelType() 
template< typename Index,

          typename Device >

auto

CSRKernelHybrid< Index, Device >::

CSRHybridKernel< Index, Device >::

getConstView() const -> ConstViewType

{

    return *this;
@@ -142,7 +142,7 @@ template< typename Index, 
              typename Real,

              typename... Args >

void

CSRKernelHybrid< Index, Device >::

CSRHybridKernel< Index, Device >::

segmentsReduction( const OffsetsView& offsets,

                         Index first,

                         Index last,

src/TNL/Algorithms/Segments/CSRView.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <TNL/Algorithms/Segments/SegmentView.h>

#include <TNL/Algorithms/Segments/CSRScalarKernel.h>

#include <TNL/Algorithms/Segments/CSRVectorKernel.h>

#include <TNL/Algorithms/Segments/CSRKernelHybrid.h>

#include <TNL/Algorithms/Segments/CSRHybridKernel.h>

#include <TNL/Algorithms/Segments/CSRKernelAdaptive.h>



namespace TNL {
@@ -142,7 +142,7 @@ using CSRViewVector = CSRView< Device, Index, CSRVectorKernel< Index, Device > > 


template< typename Device,

          typename Index >

using CSRViewHybrid = CSRView< Device, Index, CSRKernelHybrid< Index, Device > >;

using CSRViewHybrid = CSRView< Device, Index, CSRHybridKernel< Index, Device > >;



template< typename Device,

          typename Index >