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

Replaced NoDistrCommunicator in unit tests with MpiCommunicator and separate run without mpirun

parent 3bddf413

src/UnitTests/Containers/CMakeLists.txt

+9 −0
Original line number Diff line number Diff line
@@ -92,30 +92,39 @@ if( ${BUILD_MPI} ) 


   SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedArrayTest${CMAKE_EXECUTABLE_SUFFIX}" )

   ADD_TEST( NAME DistributedArrayTest COMMAND "mpirun" ${mpi_test_parameters})

   ADD_TEST( NAME DistributedArrayTest_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedArrayTest${CMAKE_EXECUTABLE_SUFFIX}" )



   SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorTest${CMAKE_EXECUTABLE_SUFFIX}" )

   ADD_TEST( NAME DistributedVectorTest COMMAND "mpirun" ${mpi_test_parameters})

   ADD_TEST( NAME DistributedVectorTest_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorTest${CMAKE_EXECUTABLE_SUFFIX}" )



   SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorBinaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX}" )

   ADD_TEST( NAME DistributedVectorBinaryOperationsTest COMMAND "mpirun" ${mpi_test_parameters})

   ADD_TEST( NAME DistributedVectorBinaryOperationsTest_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorBinaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX}" )



   SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorUnaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX}" )

   ADD_TEST( NAME DistributedVectorUnaryOperationsTest COMMAND "mpirun" ${mpi_test_parameters})

   ADD_TEST( NAME DistributedVectorUnaryOperationsTest_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorUnaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX}" )



   SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorVerticalOperationsTest${CMAKE_EXECUTABLE_SUFFIX}" )

   ADD_TEST( NAME DistributedVectorVerticalOperationsTest COMMAND "mpirun" ${mpi_test_parameters})

   ADD_TEST( NAME DistributedVectorVerticalOperationsTest_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorVerticalOperationsTest${CMAKE_EXECUTABLE_SUFFIX}" )



   if( BUILD_CUDA )

      SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )

      ADD_TEST( NAME DistributedVectorTestCuda COMMAND "mpirun" ${mpi_test_parameters})

      ADD_TEST( NAME DistributedVectorTestCuda_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )



      SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorBinaryOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )

      ADD_TEST( NAME DistributedVectorBinaryOperationsTestCuda COMMAND "mpirun" ${mpi_test_parameters})

      ADD_TEST( NAME DistributedVectorBinaryOperationsTestCuda_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorBinaryOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )



      SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorUnaryOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )

      ADD_TEST( NAME DistributedVectorUnaryOperationsTestCuda COMMAND "mpirun" ${mpi_test_parameters})

      ADD_TEST( NAME DistributedVectorUnaryOperationsTestCuda_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorUnaryOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )



      SET( mpi_test_parameters -np 4 -H localhost:4 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorVerticalOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )

      ADD_TEST( NAME DistributedVectorVerticalOperationsTestCuda COMMAND "mpirun" ${mpi_test_parameters})

      ADD_TEST( NAME DistributedVectorVerticalOperationsTestCuda_nodistr COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/DistributedVectorVerticalOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX}" )

   endif()

endif()

src/UnitTests/Containers/DistributedArrayTest.h

+2 −5
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <gtest/gtest.h>



#include <TNL/Communicators/MpiCommunicator.h>

#include <TNL/Communicators/NoDistrCommunicator.h>

#include <TNL/Containers/DistributedArray.h>

#include <TNL/Containers/Partitioner.h>
@@ -59,12 +58,10 @@ protected: 


// types for which DistributedArrayTest is instantiated

using DistributedArrayTypes = ::testing::Types<

   DistributedArray< double, Devices::Host, int, Communicators::MpiCommunicator >,

   DistributedArray< double, Devices::Host, int, Communicators::NoDistrCommunicator >

   DistributedArray< double, Devices::Host, int, Communicators::MpiCommunicator >

#ifdef HAVE_CUDA

   ,

   DistributedArray< double, Devices::Cuda, int, Communicators::MpiCommunicator >,

   DistributedArray< double, Devices::Cuda, int, Communicators::NoDistrCommunicator >

   DistributedArray< double, Devices::Cuda, int, Communicators::MpiCommunicator >

#endif

>;

src/UnitTests/Containers/DistributedVectorTest.h

+2 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <gtest/gtest.h>



#include <TNL/Communicators/MpiCommunicator.h>

#include <TNL/Communicators/NoDistrCommunicator.h>

#include <TNL/Containers/DistributedVector.h>

#include <TNL/Containers/DistributedVectorView.h>

#include <TNL/Containers/Partitioner.h>
@@ -69,12 +68,10 @@ protected: 


// types for which DistributedVectorTest is instantiated

using DistributedVectorTypes = ::testing::Types<

   DistributedVector< double, Devices::Host, int, Communicators::MpiCommunicator >,

   DistributedVector< double, Devices::Host, int, Communicators::NoDistrCommunicator >

   DistributedVector< double, Devices::Host, int, Communicators::MpiCommunicator >

#ifdef HAVE_CUDA

   ,

   DistributedVector< double, Devices::Cuda, int, Communicators::MpiCommunicator >,

   DistributedVector< double, Devices::Cuda, int, Communicators::NoDistrCommunicator >

   DistributedVector< double, Devices::Cuda, int, Communicators::MpiCommunicator >

#endif

>;

src/UnitTests/Containers/VectorBinaryOperationsTest.h

+2 −20
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#if defined(DISTRIBUTED_VECTOR)

   #include <TNL/Communicators/MpiCommunicator.h>

   #include <TNL/Communicators/NoDistrCommunicator.h>

   #include <TNL/Containers/DistributedVector.h>

   #include <TNL/Containers/DistributedVectorView.h>

   #include <TNL/Containers/Partitioner.h>
@@ -154,16 +153,7 @@ protected: 
      Pair< DistributedVectorView< int,   Devices::Host, int, Communicators::MpiCommunicator >,

            DistributedVector<     short, Devices::Host, int, Communicators::MpiCommunicator > >,

      Pair< DistributedVectorView< int,   Devices::Host, int, Communicators::MpiCommunicator >,

            DistributedVectorView< short, Devices::Host, int, Communicators::MpiCommunicator > >,



      Pair< DistributedVector<     int,   Devices::Host, int, Communicators::NoDistrCommunicator >,

            DistributedVector<     short, Devices::Host, int, Communicators::NoDistrCommunicator > >,

      Pair< DistributedVector<     int,   Devices::Host, int, Communicators::NoDistrCommunicator >,

            DistributedVectorView< short, Devices::Host, int, Communicators::NoDistrCommunicator > >,

      Pair< DistributedVectorView< int,   Devices::Host, int, Communicators::NoDistrCommunicator >,

            DistributedVector<     short, Devices::Host, int, Communicators::NoDistrCommunicator > >,

      Pair< DistributedVectorView< int,   Devices::Host, int, Communicators::NoDistrCommunicator >,

            DistributedVectorView< short, Devices::Host, int, Communicators::NoDistrCommunicator > >

            DistributedVectorView< short, Devices::Host, int, Communicators::MpiCommunicator > >

   #else

      Pair< DistributedVector<     int,   Devices::Cuda, int, Communicators::MpiCommunicator >,

            DistributedVector<     short, Devices::Cuda, int, Communicators::MpiCommunicator > >,
@@ -172,15 +162,7 @@ protected: 
      Pair< DistributedVectorView< int,   Devices::Cuda, int, Communicators::MpiCommunicator >,

            DistributedVector<     short, Devices::Cuda, int, Communicators::MpiCommunicator > >,

      Pair< DistributedVectorView< int,   Devices::Cuda, int, Communicators::MpiCommunicator >,

            DistributedVectorView< short, Devices::Cuda, int, Communicators::MpiCommunicator > >,

      Pair< DistributedVector<     int,   Devices::Cuda, int, Communicators::NoDistrCommunicator >,

            DistributedVector<     short, Devices::Cuda, int, Communicators::NoDistrCommunicator > >,

      Pair< DistributedVector<     int,   Devices::Cuda, int, Communicators::NoDistrCommunicator >,

            DistributedVectorView< short, Devices::Cuda, int, Communicators::NoDistrCommunicator > >,

      Pair< DistributedVectorView< int,   Devices::Cuda, int, Communicators::NoDistrCommunicator >,

            DistributedVector<     short, Devices::Cuda, int, Communicators::NoDistrCommunicator > >,

      Pair< DistributedVectorView< int,   Devices::Cuda, int, Communicators::NoDistrCommunicator >,

            DistributedVectorView< short, Devices::Cuda, int, Communicators::NoDistrCommunicator > >

            DistributedVectorView< short, Devices::Cuda, int, Communicators::MpiCommunicator > >

   #endif

   >;

#elif defined(STATIC_VECTOR)

src/UnitTests/Containers/VectorUnaryOperationsTest.h

+2 −9
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#if defined(DISTRIBUTED_VECTOR)

   #include <TNL/Communicators/MpiCommunicator.h>

   #include <TNL/Communicators/NoDistrCommunicator.h>

   #include <TNL/Containers/DistributedVector.h>

   #include <TNL/Containers/DistributedVectorView.h>

   #include <TNL/Containers/Partitioner.h>
@@ -70,17 +69,11 @@ protected: 
   #ifndef HAVE_CUDA

      DistributedVector<           double, Devices::Host, int, Communicators::MpiCommunicator >,

      DistributedVectorView<       double, Devices::Host, int, Communicators::MpiCommunicator >,

      DistributedVectorView< const double, Devices::Host, int, Communicators::MpiCommunicator >,

      DistributedVector<           double, Devices::Host, int, Communicators::NoDistrCommunicator >,

      DistributedVectorView<       double, Devices::Host, int, Communicators::NoDistrCommunicator >,

      DistributedVectorView< const double, Devices::Host, int, Communicators::NoDistrCommunicator >

      DistributedVectorView< const double, Devices::Host, int, Communicators::MpiCommunicator >

   #else

      DistributedVector<           double, Devices::Cuda, int, Communicators::MpiCommunicator >,

      DistributedVectorView<       double, Devices::Cuda, int, Communicators::MpiCommunicator >,

      DistributedVectorView< const double, Devices::Cuda, int, Communicators::MpiCommunicator >,

      DistributedVector<           double, Devices::Cuda, int, Communicators::NoDistrCommunicator >,

      DistributedVectorView<       double, Devices::Cuda, int, Communicators::NoDistrCommunicator >,

      DistributedVectorView< const double, Devices::Cuda, int, Communicators::NoDistrCommunicator >

      DistributedVectorView< const double, Devices::Cuda, int, Communicators::MpiCommunicator >

   #endif

   >;

#elif defined(STATIC_VECTOR)