Commit 549b8c78 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Disabled complicated vector tests for HIP

parent 7d99be2d

src/UnitTests/Containers/VectorBinaryOperationsTest.h

+6 −5
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ protected: 
#else

   #ifdef VECTOR_OF_STATIC_VECTORS

      using VectorPairs = ::testing::Types<

      #if !defined HAVE_CUDA && !defined HAVE_HIP

      #if !defined HAVE_CUDA //&& !defined HAVE_HIP

         Pair< Vector<     StaticVector< 3, int >, Devices::Host >, Vector<     StaticVector< 3, short >, Devices::Host > >,

         Pair< VectorView< StaticVector< 3, int >, Devices::Host >, Vector<     StaticVector< 3, short >, Devices::Host > >,

         Pair< Vector<     StaticVector< 3, int >, Devices::Host >, VectorView< StaticVector< 3, short >, Devices::Host > >,
@@ -227,10 +227,11 @@ protected: 
         Pair< VectorView< StaticVector< 3, int >, Devices::Cuda >, VectorView< StaticVector< 3, short >, Devices::Cuda > >

      #endif

      #ifdef HAVE_HIP

         Pair< Vector<     StaticVector< 3, int >, Devices::Hip >, Vector<     StaticVector< 3, short >, Devices::Hip > >,

         Pair< VectorView< StaticVector< 3, int >, Devices::Hip >, Vector<     StaticVector< 3, short >, Devices::Hip > >,

         Pair< Vector<     StaticVector< 3, int >, Devices::Hip >, VectorView< StaticVector< 3, short >, Devices::Hip > >,

         Pair< VectorView< StaticVector< 3, int >, Devices::Hip >, VectorView< StaticVector< 3, short >, Devices::Hip > >

         // FIXME: compilation fails because of shared memory in HipReductionKernel

         //Pair< Vector<     StaticVector< 3, int >, Devices::Hip >, Vector<     StaticVector< 3, short >, Devices::Hip > >,

         //Pair< VectorView< StaticVector< 3, int >, Devices::Hip >, Vector<     StaticVector< 3, short >, Devices::Hip > >,

         //Pair< Vector<     StaticVector< 3, int >, Devices::Hip >, VectorView< StaticVector< 3, short >, Devices::Hip > >,

         //Pair< VectorView< StaticVector< 3, int >, Devices::Hip >, VectorView< StaticVector< 3, short >, Devices::Hip > >

      #endif

      >;

   #else

src/UnitTests/Containers/VectorVerticalOperationsTest.h

+5 −4
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ protected: 
#else

   #ifdef VECTOR_OF_STATIC_VECTORS

      using VectorTypes = ::testing::Types<

      #if !defined HAVE_CUDA && !defined HAVE_HIP

      #if !defined HAVE_CUDA //&& !defined HAVE_HIP

         Vector<     StaticVector< 3, double >, Devices::Host >,

         VectorView< StaticVector< 3, double >, Devices::Host >

      #endif
@@ -158,8 +158,9 @@ protected: 
         VectorView< StaticVector< 3, double >, Devices::Cuda >

      #endif

      #ifdef HAVE_HIP

         Vector<     StaticVector< 3, double >, Devices::Hip >,

         VectorView< StaticVector< 3, double >, Devices::Hip >

         // FIXME: compilation fails because of shared memory in HipReductionKernel

         //Vector<     StaticVector< 3, double >, Devices::Hip >,

         //VectorView< StaticVector< 3, double >, Devices::Hip >

      #endif

      >;

   #else