Commit 0a0ef1b0 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Added namespace prefix to the uses of DevicePointer

parent e94ca0fe

src/TNL/Containers/Multimaps/MultimapPermutationApplier.h

+3 −3
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ void permuteMultimapKeys( Multimap& multimap, const PermutationVector& perm ) 
      destValues = srcValues;

   };



   DevicePointer< Multimap > multimapPointer( multimap );

   DevicePointer< Multimap > multimapCopyPointer( multimapCopy );

   Pointers::DevicePointer< Multimap > multimapPointer( multimap );

   Pointers::DevicePointer< Multimap > multimapCopyPointer( multimapCopy );



   ParallelFor< DeviceType >::exec( (IndexType) 0, multimap.getKeysRange(),

                                    kernel,
@@ -76,7 +76,7 @@ void permuteMultimapValues( Multimap& multimap, const PermutationVector& iperm ) 
         values[ v ] = iperm[ values[ v ] ];

   };



   DevicePointer< Multimap > multimapPointer( multimap );

   Pointers::DevicePointer< Multimap > multimapPointer( multimap );

   ParallelFor< DeviceType >::exec( (IndexType) 0, multimap.getKeysRange(),

                                    kernel,

                                    &multimapPointer.template modifyData< DeviceType >(),

src/TNL/CudaStreamPool.h

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

                          UniquePointer.h  -  description

                          CudaStreamPool.h  -  description

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

    begin                : Oct 14, 2016

    copyright            : (C) 2016 by Tomas Oberhuber et al.

src/TNL/Functions/MeshFunction_impl.h

+6 −6
Original line number Diff line number Diff line
@@ -417,8 +417,8 @@ MeshFunction< Mesh, MeshEntityDimension, Real >& 
MeshFunction< Mesh, MeshEntityDimension, Real >::

operator = ( const Function& f )

{

   DevicePointer< ThisType > thisDevicePtr( *this );

   DevicePointer< typename std::add_const< Function >::type > fDevicePtr( f );

   Pointers::DevicePointer< ThisType > thisDevicePtr( *this );

   Pointers::DevicePointer< typename std::add_const< Function >::type > fDevicePtr( f );

   MeshFunctionEvaluator< ThisType, Function >::evaluate( thisDevicePtr, fDevicePtr );

   return *this;

}
@@ -431,8 +431,8 @@ MeshFunction< Mesh, MeshEntityDimension, Real >& 
MeshFunction< Mesh, MeshEntityDimension, Real >::

operator += ( const Function& f )

{

   DevicePointer< ThisType > thisDevicePtr( *this );

   DevicePointer< typename std::add_const< Function >::type > fDevicePtr( f );

   Pointers::DevicePointer< ThisType > thisDevicePtr( *this );

   Pointers::DevicePointer< typename std::add_const< Function >::type > fDevicePtr( f );

   MeshFunctionEvaluator< ThisType, Function >::evaluate( thisDevicePtr, fDevicePtr, 1.0, 1.0 );

   return *this;

}
@@ -445,8 +445,8 @@ MeshFunction< Mesh, MeshEntityDimension, Real >& 
MeshFunction< Mesh, MeshEntityDimension, Real >::

operator -= ( const Function& f )

{

   DevicePointer< ThisType > thisDevicePtr( *this );

   DevicePointer< typename std::add_const< Function >::type > fDevicePtr( f );

   Pointers::DevicePointer< ThisType > thisDevicePtr( *this );

   Pointers::DevicePointer< typename std::add_const< Function >::type > fDevicePtr( f );

   MeshFunctionEvaluator< ThisType, Function >::evaluate( thisDevicePtr, fDevicePtr, 1.0, -1.0 );

   return *this;

}

src/TNL/Matrices/Sparse_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -246,8 +246,8 @@ copySparseMatrix( Matrix1& A, const Matrix2& B ) 
      typename Matrix1::CompressedRowLengthsVector rowLengths;

      rowLengths.setSize( rows );



      DevicePointer< Matrix1 > Apointer( A );

      const DevicePointer< const Matrix2 > Bpointer( B );

      Pointers::DevicePointer< Matrix1 > Apointer( A );

      const Pointers::DevicePointer< const Matrix2 > Bpointer( B );



      // set row lengths

      Devices::Cuda::synchronizeDevice();

src/TNL/Meshes/MeshDetails/EntityStorageRebinder.h

+4 −4
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ public: 
         const IndexType entitiesCount = mesh.template getEntitiesCount< DimensionTag::value >();

         auto& superentitiesStorage = mesh.template getSuperentityStorageNetwork< DimensionTag::value, SuperdimensionTag::value >();

         using Multimap = typename std::remove_reference< decltype(superentitiesStorage) >::type;

         DevicePointer< Mesh > meshPointer( mesh );

         DevicePointer< Multimap > superentitiesStoragePointer( superentitiesStorage );

         Pointers::DevicePointer< Mesh > meshPointer( mesh );

         Pointers::DevicePointer< Multimap > superentitiesStoragePointer( superentitiesStorage );



         auto kernel = [] __cuda_callable__

            ( IndexType i,
@@ -97,8 +97,8 @@ public: 
         const IndexType entitiesCount = mesh.template getEntitiesCount< SuperdimensionTag::value >();

         auto& subentitiesStorage = mesh.template getSubentityStorageNetwork< SuperdimensionTag::value, DimensionTag::value >();

         using Multimap = typename std::remove_reference< decltype(subentitiesStorage) >::type;

         DevicePointer< Mesh > meshPointer( mesh );

         DevicePointer< Multimap > subentitiesStoragePointer( subentitiesStorage );

         Pointers::DevicePointer< Mesh > meshPointer( mesh );

         Pointers::DevicePointer< Multimap > subentitiesStoragePointer( subentitiesStorage );



         auto kernel = [] __cuda_callable__

            ( IndexType i,