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

Moved headers from DistributedContainers to Containers and Matrices 

fixes #13
parent 8c7b246b

src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h

+6 −6
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <TNL/Communicators/MpiCommunicator.h>

#include <TNL/Communicators/NoDistrCommunicator.h>

#include <TNL/Communicators/ScopedInitializer.h>

#include <TNL/DistributedContainers/Partitioner.h>

#include <TNL/DistributedContainers/DistributedVector.h>

#include <TNL/DistributedContainers/DistributedMatrix.h>

#include <TNL/Containers/Partitioner.h>

#include <TNL/Containers/DistributedVector.h>

#include <TNL/Matrices/DistributedMatrix.h>



#include "../Benchmarks.h"

#include "ordering.h"
@@ -151,9 +151,9 @@ struct SpmvBenchmark 
   using IndexType = typename MatrixType::IndexType;

   using VectorType = Containers::Vector< RealType, DeviceType, IndexType >;



   using Partitioner = DistributedContainers::Partitioner< IndexType, CommunicatorType >;

   using DistributedMatrix = DistributedContainers::DistributedMatrix< MatrixType, CommunicatorType >;

   using DistributedVector = DistributedContainers::DistributedVector< RealType, DeviceType, IndexType, CommunicatorType >;

   using Partitioner = Containers::Partitioner< IndexType, CommunicatorType >;

   using DistributedMatrix = Matrices::DistributedMatrix< MatrixType, CommunicatorType >;

   using DistributedVector = Containers::DistributedVector< RealType, DeviceType, IndexType, CommunicatorType >;

   using DistributedRowLengths = typename DistributedMatrix::CompressedRowLengthsVector;



   static bool

src/Benchmarks/LinearSolvers/benchmarks.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <TNL/Pointers/SharedPointer.h>

#include <TNL/Config/ParameterContainer.h>

#include <TNL/Solvers/IterativeSolverMonitor.h>

#include <TNL/DistributedContainers/DistributedMatrix.h>

#include <TNL/Matrices/DistributedMatrix.h>



#include "../Benchmarks.h"
@@ -34,7 +34,7 @@ void barrier( const Matrix& matrix ) 
}



template< typename Matrix, typename Communicator >

void barrier( const DistributedContainers::DistributedMatrix< Matrix, Communicator >& matrix )

void barrier( const Matrices::DistributedMatrix< Matrix, Communicator >& matrix )

{

   Communicator::Barrier( matrix.getCommunicationGroup() );

}

src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h

+6 −6
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include <TNL/Communicators/MpiCommunicator.h>

#include <TNL/Communicators/NoDistrCommunicator.h>

#include <TNL/Communicators/ScopedInitializer.h>

#include <TNL/DistributedContainers/Partitioner.h>

#include <TNL/DistributedContainers/DistributedVector.h>

#include <TNL/DistributedContainers/DistributedMatrix.h>

#include <TNL/Containers/Partitioner.h>

#include <TNL/Containers/DistributedVector.h>

#include <TNL/Matrices/DistributedMatrix.h>

#include <TNL/Solvers/Linear/Preconditioners/Diagonal.h>

#include <TNL/Solvers/Linear/Preconditioners/ILU0.h>

#include <TNL/Solvers/Linear/Preconditioners/ILUT.h>
@@ -318,9 +318,9 @@ struct LinearSolversBenchmark 
   using IndexType = typename MatrixType::IndexType;

   using VectorType = Containers::Vector< RealType, DeviceType, IndexType >;



   using Partitioner = DistributedContainers::Partitioner< IndexType, CommunicatorType >;

   using DistributedMatrix = DistributedContainers::DistributedMatrix< MatrixType, CommunicatorType >;

   using DistributedVector = DistributedContainers::DistributedVector< RealType, DeviceType, IndexType, CommunicatorType >;

   using Partitioner = Containers::Partitioner< IndexType, CommunicatorType >;

   using DistributedMatrix = Matrices::DistributedMatrix< MatrixType, CommunicatorType >;

   using DistributedVector = Containers::DistributedVector< RealType, DeviceType, IndexType, CommunicatorType >;

   using DistributedRowLengths = typename DistributedMatrix::CompressedRowLengthsVector;



   static bool

src/TNL/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line 
ADD_SUBDIRECTORY( Config )

ADD_SUBDIRECTORY( Containers )

ADD_SUBDIRECTORY( DistributedContainers )

ADD_SUBDIRECTORY( Communicators )

ADD_SUBDIRECTORY( Debugging )

ADD_SUBDIRECTORY( Devices )

src/TNL/Containers/CMakeLists.txt

+27 −16
Original line number Diff line number Diff line
@@ -3,6 +3,32 @@ ADD_SUBDIRECTORY( Multimaps ) 


set( headers Array.h

             Array_impl.h

             ArrayView.h

             ArrayView_impl.h

             Vector.h

             Vector_impl.h

             VectorView.h

             VectorView_impl.h

             StaticArray.h

             StaticArray_impl.h

             StaticArray1D_impl.h

             StaticArray2D_impl.h

             StaticArray3D_impl.h

             StaticVector.h

             StaticVector_impl.h

             StaticVector1D_impl.h

             StaticVector2D_impl.h

             StaticVector3D_impl.h

             DistributedArray.h

             DistributedArray_impl.h

             DistributedArrayView.h

             DistributedArrayView_impl.h

             DistributedVector.h

             DistributedVector_impl.h

             DistributedVectorView.h

             DistributedVectorView_impl.h

             Partitioner.h

             Subrange.h

             ArrayIO.h

             IndexedMap.h

             IndexedMap_impl.h
@@ -17,26 +43,11 @@ set( headers Array.h 
             MultiArray2D_impl.h

             MultiArray3D_impl.h

             MultiArray4D_impl.h

             ArrayView.h

             ArrayView_impl.h

             StaticArray.h

             StaticArray_impl.h

             StaticArray1D_impl.h

             StaticArray2D_impl.h

             StaticArray3D_impl.h

             Vector.h

             Vector_impl.h

             MultiVector.h

             MultiVector1D_impl.h

             MultiVector2D_impl.h

             MultiVector3D_impl.h

             MultiVector4D_impl.h

             VectorView.h

             VectorView_impl.h

             StaticVector.h

             StaticVector_impl.h

             StaticVector1D_impl.h

             StaticVector2D_impl.h

             StaticVector3D_impl.h  )

)



INSTALL( FILES ${headers} DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY}/Containers )