Commit 86c875f4 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Moved ArrayIO to Containers/Algorithms

parent 63864468

src/TNL/Containers/ArrayIO.h→src/TNL/Containers/Algorithms/ArrayIO.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


namespace TNL {

namespace Containers {

namespace Algorithms {



template< typename Value,

          typename Device,
@@ -82,5 +83,6 @@ class ArrayIO< Value, Device, Index, false > 


};



} // namespace Algorithms

} // namespace Containers

} // namespace TNL

src/TNL/Containers/Algorithms/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line 
set( headers ArrayOperations.h

set( headers ArrayIO.h

             ArrayOperations.h

             ArrayOperationsHost_impl.h

             ArrayOperationsCuda_impl.h

             ArrayOperationsMIC_impl.h

src/TNL/Containers/Array_impl.h

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <TNL/Math.h>

#include <TNL/param-types.h>

#include <TNL/Containers/Algorithms/ArrayOperations.h>

#include <TNL/Containers/ArrayIO.h>

#include <TNL/Containers/Algorithms/ArrayIO.h>

#include <TNL/Containers/Array.h>



namespace TNL {
@@ -476,7 +476,7 @@ bool Array< Value, Device, Index >::save( File& file ) const 
      return false;

   if( ! file.write( &this->size ) )

      return false;

   if( this->size != 0 && ! ArrayIO< Value, Device, Index >::save( file, this->data, this->size ) )

   if( this->size != 0 && ! Algorithms::ArrayIO< Value, Device, Index >::save( file, this->data, this->size ) )

   {

      std::cerr << "I was not able to save " << this->getType()

           << " with size " << this -> getSize() << std::endl;
@@ -508,7 +508,7 @@ load( File& file ) 
   setSize( _size );

   if( _size )

   {

      if( ! ArrayIO< Value, Device, Index >::load( file, this->data, this->size ) )

      if( ! Algorithms::ArrayIO< Value, Device, Index >::load( file, this->data, this->size ) )

      {

         std::cerr << "I was not able to load " << this->getType()

                    << " with size " << this -> getSize() << std::endl;
@@ -547,7 +547,7 @@ boundLoad( File& file ) 
   else setSize( _size );

   if( _size )

   {

      if( ! ArrayIO< Value, Device, Index >::load( file, this->data, this->size ) )

      if( ! Algorithms::ArrayIO< Value, Device, Index >::load( file, this->data, this->size ) )

      {

         std::cerr << "I was not able to load " << this->getType()

                   << " with size " << this -> getSize() << std::endl;

src/TNL/Containers/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ set( headers Array.h 
             DistributedVectorView_impl.h

             Partitioner.h

             Subrange.h

             ArrayIO.h

             IndexedMap.h

             IndexedMap_impl.h

             IndexedSet.h