Commit c09870c5 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed tests for expression templates to work with nested vector types 

Tests for vertical operations which are not well defined for nested
vectors are disabled.
parent ee68bdc9

src/UnitTests/Containers/CMakeLists.txt

+10 −13
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ ADD_EXECUTABLE( VectorVerticalOperationsTest VectorVerticalOperationsTest.cpp ) 
TARGET_COMPILE_OPTIONS( VectorVerticalOperationsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( VectorVerticalOperationsTest ${GTEST_BOTH_LIBRARIES} )



# FIXME

#ADD_EXECUTABLE( VectorOfStaticVectorsTest VectorOfStaticVectorsTest.cpp )

#TARGET_COMPILE_OPTIONS( VectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

#TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )

ADD_EXECUTABLE( VectorOfStaticVectorsTest VectorOfStaticVectorsTest.cpp )

TARGET_COMPILE_OPTIONS( VectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )



IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( ArrayTestCuda ArrayTest.cu
@@ -62,9 +61,8 @@ IF( BUILD_CUDA ) 
   CUDA_ADD_EXECUTABLE( VectorVerticalOperationsTestCuda VectorVerticalOperationsTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( VectorVerticalOperationsTestCuda ${GTEST_BOTH_LIBRARIES} )



   # FIXME

#   CUDA_ADD_EXECUTABLE( VectorOfStaticVectorsTestCuda VectorOfStaticVectorsTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

#   TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTestCuda ${GTEST_BOTH_LIBRARIES} )

   CUDA_ADD_EXECUTABLE( VectorOfStaticVectorsTestCuda VectorOfStaticVectorsTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTestCuda ${GTEST_BOTH_LIBRARIES} )

ENDIF( BUILD_CUDA )



ADD_EXECUTABLE( StaticArrayTest StaticArrayTest.cpp )
@@ -79,10 +77,9 @@ ADD_EXECUTABLE( StaticVectorOperationsTest StaticVectorOperationsTest.cpp ) 
TARGET_COMPILE_OPTIONS( StaticVectorOperationsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticVectorOperationsTest ${GTEST_BOTH_LIBRARIES} )



# FIXME

#ADD_EXECUTABLE( StaticVectorOfStaticVectorsTest StaticVectorOfStaticVectorsTest.cpp )

#TARGET_COMPILE_OPTIONS( StaticVectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

#TARGET_LINK_LIBRARIES( StaticVectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )

ADD_EXECUTABLE( StaticVectorOfStaticVectorsTest StaticVectorOfStaticVectorsTest.cpp )

TARGET_COMPILE_OPTIONS( StaticVectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticVectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )





ADD_TEST( ArrayTest ${EXECUTABLE_OUTPUT_PATH}/ArrayTest${CMAKE_EXECUTABLE_SUFFIX} )
@@ -93,7 +90,7 @@ ADD_TEST( VectorEvaluateAndReduceTest ${EXECUTABLE_OUTPUT_PATH}/VectorEvaluateAn 
ADD_TEST( VectorBinaryOperationsTest ${EXECUTABLE_OUTPUT_PATH}/VectorBinaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( VectorUnaryOperationsTest ${EXECUTABLE_OUTPUT_PATH}/VectorUnaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( VectorVerticalOperationsTest ${EXECUTABLE_OUTPUT_PATH}/VectorVerticalOperationsTest${CMAKE_EXECUTABLE_SUFFIX} )

#ADD_TEST( VectorOfStaticVectorsTest ${EXECUTABLE_OUTPUT_PATH}/VectorOfStaticVectorsTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( VectorOfStaticVectorsTest ${EXECUTABLE_OUTPUT_PATH}/VectorOfStaticVectorsTest${CMAKE_EXECUTABLE_SUFFIX} )

IF( BUILD_CUDA )

   ADD_TEST( ArrayTestCuda ${EXECUTABLE_OUTPUT_PATH}/ArrayTestCuda${CMAKE_EXECUTABLE_SUFFIX} )

   ADD_TEST( ArrayViewTestCuda ${EXECUTABLE_OUTPUT_PATH}/ArrayViewTestCuda${CMAKE_EXECUTABLE_SUFFIX} )
@@ -108,7 +105,7 @@ ENDIF() 
ADD_TEST( StaticArrayTest ${EXECUTABLE_OUTPUT_PATH}/StaticArrayTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( StaticVectorTest ${EXECUTABLE_OUTPUT_PATH}/StaticVectorTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( StaticVectorOperationsTest ${EXECUTABLE_OUTPUT_PATH}/StaticVectorOperationsTest${CMAKE_EXECUTABLE_SUFFIX} )

#ADD_TEST( StaticVectorOfStaticVectorsTest ${EXECUTABLE_OUTPUT_PATH}/StaticVectorOfStaticVectorsTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( StaticVectorOfStaticVectorsTest ${EXECUTABLE_OUTPUT_PATH}/StaticVectorOfStaticVectorsTest${CMAKE_EXECUTABLE_SUFFIX} )





ADD_SUBDIRECTORY( Multimaps )

src/UnitTests/Containers/VectorBinaryOperationsTest.cpp

+1 −0
Original line number Diff line number Diff line 
#include "VectorBinaryOperationsTest.h"

#include "../main.h"

src/UnitTests/Containers/VectorBinaryOperationsTest.cu

+1 −0
Original line number Diff line number Diff line 
#include "VectorBinaryOperationsTest.h"

#include "../main.h"

src/UnitTests/Containers/VectorBinaryOperationsTest.h

+2 −6
Original line number Diff line number Diff line
@@ -627,8 +627,8 @@ TYPED_TEST( VectorBinaryOperationsTest, comparisonOnDifferentDevices ) 
{

   SETUP_BINARY_TEST_ALIASES;



   using RightHostVector = typename TestFixture::RightVector::Self< typename TestFixture::RightVector::RealType, Devices::Sequential >;

   using RightHost = typename TestFixture::Right::Self< typename TestFixture::Right::RealType, Devices::Sequential >;

   using RightHostVector = typename TestFixture::RightVector::template Self< typename TestFixture::RightVector::RealType, Devices::Sequential >;

   using RightHost = typename TestFixture::Right::template Self< typename TestFixture::Right::RealType, Devices::Sequential >;



   RightHostVector _R1_h; _R1_h = this->_R1;

   RightHost R1_h( _R1_h );
@@ -646,7 +646,3 @@ TYPED_TEST( VectorBinaryOperationsTest, comparisonOnDifferentDevices ) 
} // namespace binary_tests



#endif // HAVE_GTEST
 


#if !defined(DISTRIBUTED_VECTOR) && !defined(STATIC_VECTOR)

#include "../main.h"

#endif

src/UnitTests/Containers/VectorHelperFunctions.h

+32 −0
Original line number Diff line number Diff line
@@ -112,3 +112,35 @@ void bindOrAssign( V1& v1, V2& v2 ) 
{

   v1 = v2;

}





#ifdef HAVE_GTEST

#include "gtest/gtest.h"



template< typename T1, typename T2,

          std::enable_if_t< ! TNL::HasSubscriptOperator< T1 >::value &&

                            ! TNL::HasSubscriptOperator< T2 >::value, bool > = true >

void expect_near( const T1& arg, const T2& expected, double epsilon )

{

   EXPECT_NEAR( arg, expected, epsilon );

}



template< typename T1, typename T2,

          std::enable_if_t< TNL::HasSubscriptOperator< T1 >::value &&

                            ! TNL::HasSubscriptOperator< T2 >::value, bool > = true >

void expect_near( const T1& arg, const T2& expected, double epsilon )

{

   for( int i = 0; i < arg.getSize(); i++ )

      expect_near( arg[ i ], expected, epsilon );

}



template< typename T1, typename T2,

          std::enable_if_t< TNL::HasSubscriptOperator< T1 >::value &&

                            TNL::HasSubscriptOperator< T2 >::value, bool > = true >

void expect_near( const T1& arg, const T2& expected, double epsilon )

{

   ASSERT_EQ( arg.getSize(), expected.getSize() );

   for( int i = 0; i < arg.getSize(); i++ )

      expect_near( arg[ i ], expected[ i ], epsilon );

}

#endif