Commit 7a406d54 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Removed getArrayElementReference from ArrayOperations because it does not make sense for CUDA

parent 64e88639

src/TNL/Containers/Algorithms/ArrayOperations.h

+0 −22
Original line number Diff line number Diff line
@@ -41,13 +41,6 @@ class ArrayOperations< Devices::Host > 
      template< typename Element >

      static Element getMemoryElement( Element* data );



      template< typename Element, typename Index >

      static Element& getArrayElementReference( Element* data, const Index i );



      template< typename Element, typename Index >

      static const Element& getArrayElementReference( const Element* data, const Index i );





      template< typename Element, typename Index >

      static bool setMemory( Element* data,

                             const Element& value,
@@ -78,7 +71,6 @@ class ArrayOperations< Devices::Host > 
      static bool containsOnlyValue( const Element* data,

                                     const Index size,

                                     const Element& value );



};



template<>
@@ -102,14 +94,6 @@ class ArrayOperations< Devices::Cuda > 
      __cuda_callable__

      static Element getMemoryElement( const Element* data );





      // TODO: does not make sense for CUDA - remove? <- could make sense with CUDA Unified Memory

      template< typename Element, typename Index >

      static Element& getArrayElementReference( Element* data, const Index i );



      template< typename Element, typename Index >

      static const Element& getArrayElementReference( const Element* data, const Index i );



      template< typename Element, typename Index >

      static bool setMemory( Element* data,

                             const Element& value,
@@ -202,12 +186,6 @@ class ArrayOperations< Devices::MIC > 
      template< typename Element >

      static Element getMemoryElement( const Element* data );



      template< typename Element, typename Index >

      static Element& getArrayElementReference( Element* data, const Index i );



      template< typename Element, typename Index >

      static const Element& getArrayElementReference( const Element* data, const Index i );



      template< typename Element, typename Index >

      static bool setMemory( Element* data,

                             const Element& value,

src/TNL/Containers/Algorithms/ArrayOperationsCuda_impl.h

+0 −66
Original line number Diff line number Diff line
@@ -88,24 +88,6 @@ getMemoryElement( const Element* data ) 
#endif   

}



template< typename Element, typename Index >

Element&

ArrayOperations< Devices::Cuda >::

getArrayElementReference( Element* data, const Index i )

{

   TNL_ASSERT_TRUE( data, "Attempted to access data through a nullptr." );

   return data[ i ];

}



template< typename Element, typename Index >

const

Element& ArrayOperations< Devices::Cuda >::

getArrayElementReference( const Element* data, const Index i )

{

   TNL_ASSERT_TRUE( data, "Attempted to access data through a nullptr." );

   return data[ i ];

}





#ifdef HAVE_CUDA

template< typename Element, typename Index >
@@ -484,54 +466,6 @@ extern template double ArrayOperations< Devices::Cuda >::getMemoryElement< 
extern template long double ArrayOperations< Devices::Cuda >::getMemoryElement< long double >( const long double* data );

#endif



extern template char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        int >( char* data, const int i );

extern template int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         int >( int* data, const int i );

extern template long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    int >( long int* data, const int i );

#ifdef INSTANTIATE_FLOAT

extern template float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       int >( float* data, const int i );

#endif

extern template double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      int >( double* data, const int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, int >( long double* data, const int i );

#endif



#ifdef INSTANTIATE_LONG_INT

extern template char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        long int >( char* data, const long int i );

extern template int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         long int >( int* data, const long int i );

extern template long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    long int >( long int* data, const long int i );

#ifdef INSTANTIATE_FLOAT

extern template float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       long int >( float* data, const long int i );

#endif

extern template double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      long int >( double* data, const long int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, long int >( long double* data, const long int i );

#endif

#endif



extern template const char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        int >( const char* data, const int i );

extern template const int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         int >( const int* data, const int i );

extern template const long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    int >( const long int* data, const int i );

#ifdef INSTANTIATE_FLOAT

extern template const float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       int >( const float* data, const int i );

#endif

extern template const double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      int >( const double* data, const int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template const long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, int >( const long double* data, const int i );

#endif



#ifdef INSTANTIATE_LONG_INT

extern template const char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        long int >( const char* data, const long int i );

extern template const int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         long int >( const int* data, const long int i );

extern template const long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    long int >( const long int* data, const long int i );

#ifdef INSTANTIATE_FLOAT

extern template const float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       long int >( const float* data, const long int i );

#endif

extern template const double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      long int >( const double* data, const long int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template const long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, long int >( const long double* data, const long int i );

#endif

#endif



extern template bool ArrayOperations< Devices::Cuda >::copyMemory< char,               char, int >( char* destination, const char* source, const int size );

extern template bool ArrayOperations< Devices::Cuda >::copyMemory< int,                 int, int >( int* destination, const int* source, const int size );

extern template bool ArrayOperations< Devices::Cuda >::copyMemory< long int,       long int, int >( long int* destination, const long int* source, const int size );

src/TNL/Containers/Algorithms/ArrayOperationsHost_impl.h

+0 −66
Original line number Diff line number Diff line
@@ -61,24 +61,6 @@ getMemoryElement( Element* data ) 
   return *data;

};



template< typename Element, typename Index >

Element&

ArrayOperations< Devices::Host >::

getArrayElementReference( Element* data,

                          const Index i )

{

   return data[ i ];

};



template< typename Element, typename Index >

const Element&

ArrayOperations< Devices::Host >::

getArrayElementReference( const Element* data,

                          const Index i )

{

   return data[ i ];

};



template< typename Element, typename Index >

bool

ArrayOperations< Devices::Host >::
@@ -242,54 +224,6 @@ extern template double ArrayOperations< Devices::Host >::getMemoryElement< 
extern template long double ArrayOperations< Devices::Host >::getMemoryElement< long double >( long double* data );

#endif



extern template char&        ArrayOperations< Devices::Host >::getArrayElementReference< char,        int >( char* data, const int i );

extern template int&         ArrayOperations< Devices::Host >::getArrayElementReference< int,         int >( int* data, const int i );

extern template long int&    ArrayOperations< Devices::Host >::getArrayElementReference< long int,    int >( long int* data, const int i );

#ifdef INSTANTIATE_FLOAT

extern template float&       ArrayOperations< Devices::Host >::getArrayElementReference< float,       int >( float* data, const int i );

#endif

extern template double&      ArrayOperations< Devices::Host >::getArrayElementReference< double,      int >( double* data, const int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template long double& ArrayOperations< Devices::Host >::getArrayElementReference< long double, int >( long double* data, const int i );

#endif



#ifdef INSTANTIATE_LONG_INT

extern template char&        ArrayOperations< Devices::Host >::getArrayElementReference< char,        long int >( char* data, const long int i );

extern template int&         ArrayOperations< Devices::Host >::getArrayElementReference< int,         long int >( int* data, const long int i );

extern template long int&    ArrayOperations< Devices::Host >::getArrayElementReference< long int,    long int >( long int* data, const long int i );

#ifdef INSTANTIATE_FLOAT

extern template float&       ArrayOperations< Devices::Host >::getArrayElementReference< float,       long int >( float* data, const long int i );

#endif

extern template double&      ArrayOperations< Devices::Host >::getArrayElementReference< double,      long int >( double* data, const long int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template long double& ArrayOperations< Devices::Host >::getArrayElementReference< long double, long int >( long double* data, const long int i );

#endif

#endif



extern template const char&        ArrayOperations< Devices::Host >::getArrayElementReference< char,        int >( const char* data, const int i );

extern template const int&         ArrayOperations< Devices::Host >::getArrayElementReference< int,         int >( const int* data, const int i );

extern template const long int&    ArrayOperations< Devices::Host >::getArrayElementReference< long int,    int >( const long int* data, const int i );

#ifdef INSTANTIATE_FLOAT

extern template const float&       ArrayOperations< Devices::Host >::getArrayElementReference< float,       int >( const float* data, const int i );

#endif

extern template const double&      ArrayOperations< Devices::Host >::getArrayElementReference< double,      int >( const double* data, const int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template const long double& ArrayOperations< Devices::Host >::getArrayElementReference< long double, int >( const long double* data, const int i );

#endif



#ifdef INSTANTIATE_LONG_INT

extern template const char&        ArrayOperations< Devices::Host >::getArrayElementReference< char,        long int >( const char* data, const long int i );

extern template const int&         ArrayOperations< Devices::Host >::getArrayElementReference< int,         long int >( const int* data, const long int i );

extern template const long int&    ArrayOperations< Devices::Host >::getArrayElementReference< long int,    long int >( const long int* data, const long int i );

#ifdef INSTANTIATE_FLOAT

extern template const float&       ArrayOperations< Devices::Host >::getArrayElementReference< float,       long int >( const float* data, const long int i );

#endif

extern template const double&      ArrayOperations< Devices::Host >::getArrayElementReference< double,      long int >( const double* data, const long int i );

#ifdef INSTANTIATE_LONG_DOUBLE

extern template const long double& ArrayOperations< Devices::Host >::getArrayElementReference< long double, long int >( const long double* data, const long int i );

#endif

#endif



extern template bool ArrayOperations< Devices::Host >::copyMemory< char,                char, int >( char* destination, const char* source, const int size );

extern template bool ArrayOperations< Devices::Host >::copyMemory< int,                  int, int >( int* destination, const int* source, const int size );

extern template bool ArrayOperations< Devices::Host >::copyMemory< long int,        long int, int >( long int* destination, const long int* source, const int size );

src/TNL/Containers/Algorithms/ArrayOperationsMIC_impl.h

+0 −18
Original line number Diff line number Diff line
@@ -77,24 +77,6 @@ getMemoryElement( const Element* data ) 
   return result;

}



template< typename Element, typename Index >

Element&

ArrayOperations< Devices::MIC >::

getArrayElementReference( Element* data, const Index i )

{

   TNL_ASSERT( data, );

   return data[ i ];

}



template< typename Element, typename Index >

const

Element& ArrayOperations< Devices::MIC >::

getArrayElementReference( const Element* data, const Index i )

{

   TNL_ASSERT( data, );

   return data[ i ];

}



template< typename Element, typename Index >

bool

ArrayOperations< Devices::MIC >::

src/TNL/Containers/Algorithms/TemplateExplicitInstantiation/ArrayOperationsCuda_impl.cpp

+0 −48
Original line number Diff line number Diff line
@@ -73,54 +73,6 @@ template double ArrayOperations< Devices::Cuda >::getMemoryElement< double 
template long double ArrayOperations< Devices::Cuda >::getMemoryElement< long double >( const long double* data );

#endif



template char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        int >( char* data, const int i );

template int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         int >( int* data, const int i );

template long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    int >( long int* data, const int i );

#ifdef INSTANTIATE_FLOAT

template float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       int >( float* data, const int i );

#endif

template double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      int >( double* data, const int i );

#ifdef INSTANTIATE_LONG_DOUBLE

template long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, int >( long double* data, const int i );

#endif



#ifdef INSTANTIATE_LONG_INT

template char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        long int >( char* data, const long int i );

template int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         long int >( int* data, const long int i );

template long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    long int >( long int* data, const long int i );

#ifdef INSTANTIATE_FLOAT

template float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       long int >( float* data, const long int i );

#endif

template double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      long int >( double* data, const long int i );

#ifdef INSTANTIATE_LONG_DOUBLE

template long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, long int >( long double* data, const long int i );

#endif

#endif



template const char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        int >( const char* data, const int i );

template const int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         int >( const int* data, const int i );

template const long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    int >( const long int* data, const int i );

#ifdef INSTANTIATE_FLOAT

template const float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       int >( const float* data, const int i );

#endif

template const double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      int >( const double* data, const int i );

#ifdef INSTANTIATE_LONG_DOUBLE

template const long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, int >( const long double* data, const int i );

#endif



#ifdef INSTANTIATE_LONG_INT

template const char&        ArrayOperations< Devices::Cuda >::getArrayElementReference< char,        long int >( const char* data, const long int i );

template const int&         ArrayOperations< Devices::Cuda >::getArrayElementReference< int,         long int >( const int* data, const long int i );

template const long int&    ArrayOperations< Devices::Cuda >::getArrayElementReference< long int,    long int >( const long int* data, const long int i );

#ifdef INSTANTIATE_FLOAT

template const float&       ArrayOperations< Devices::Cuda >::getArrayElementReference< float,       long int >( const float* data, const long int i );

#endif

template const double&      ArrayOperations< Devices::Cuda >::getArrayElementReference< double,      long int >( const double* data, const long int i );

#ifdef INSTANTIATE_LONG_DOUBLE

template const long double& ArrayOperations< Devices::Cuda >::getArrayElementReference< long double, long int >( const long double* data, const long int i );

#endif

#endif



template bool ArrayOperations< Devices::Cuda >::copyMemory< char,               char, int >( char* destination, const char* source, const int size );

template bool ArrayOperations< Devices::Cuda >::copyMemory< int,                 int, int >( int* destination, const int* source, const int size );

template bool ArrayOperations< Devices::Cuda >::copyMemory< long int,       long int, int >( long int* destination, const long int* source, const int size );