Commit 9bb9c802 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Merge branch 'JK/config' into 'develop' 

Refactoring of the configuration system

See merge request !50
parents 56677044 32255672

src/Benchmarks/BLAS/tnl-benchmark-blas.h

+2 −5
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
#include <TNL/Allocators/CudaManaged.h>

#include <TNL/Devices/Host.h>

#include <TNL/Devices/Cuda.h>

#include <TNL/Config/ConfigDescription.h>

#include <TNL/Config/ParameterContainer.h>

#include <TNL/Config/parseCommandLine.h>



#include "array-operations.h"

#include "vector-operations.h"
@@ -135,10 +134,8 @@ main( int argc, char* argv[] ) 


   setupConfig( conf_desc );



   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) ) {

      conf_desc.printUsage( argv[ 0 ] );

   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) )

      return EXIT_FAILURE;

   }



   if( ! Devices::Host::setup( parameters ) ||

       ! Devices::Cuda::setup( parameters ) )

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

+2 −5
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
#include <TNL/Debugging/FPE.h>

#endif



#include <TNL/Config/ConfigDescription.h>

#include <TNL/Config/ParameterContainer.h>

#include <TNL/Config/parseCommandLine.h>

#include <TNL/Devices/Host.h>

#include <TNL/Devices/Cuda.h>

#include <TNL/Communicators/MpiCommunicator.h>
@@ -309,10 +308,8 @@ main( int argc, char* argv[] ) 
   Communicators::ScopedInitializer< CommunicatorType > scopedInit(argc, argv);

   const int rank = CommunicatorType::GetRank( CommunicatorType::AllGroup );



   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) ) {

      conf_desc.printUsage( argv[ 0 ] );

   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) )

      return EXIT_FAILURE;

   }



   if( ! Devices::Host::setup( parameters ) ||

       ! Devices::Cuda::setup( parameters ) ||

src/Benchmarks/HeatEquation/tnl-benchmark-simple-heat-equation.h

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 


#include <iostream>

#include <stdio.h>

#include <TNL/Config/ConfigDescription.h>

#include <TNL/Config/ParameterContainer.h>

#include <TNL/Config/parseCommandLine.h>

#include <TNL/Timer.h>

#include <TNL/Devices/Cuda.h>

#include <TNL/Containers/StaticVector.h>

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

+2 −5
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include <TNL/Debugging/FPE.h>

#endif



#include <TNL/Config/ConfigDescription.h>

#include <TNL/Config/ParameterContainer.h>

#include <TNL/Config/parseCommandLine.h>

#include <TNL/Devices/Host.h>

#include <TNL/Devices/Cuda.h>

#include <TNL/Communicators/MpiCommunicator.h>
@@ -592,10 +591,8 @@ main( int argc, char* argv[] ) 
   Communicators::ScopedInitializer< CommunicatorType > scopedInit(argc, argv);

   const int rank = CommunicatorType::GetRank( CommunicatorType::AllGroup );



   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) ) {

      conf_desc.printUsage( argv[ 0 ] );

   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) )

      return EXIT_FAILURE;

   }

   if( ! Devices::Host::setup( parameters ) ||

       ! Devices::Cuda::setup( parameters ) ||

       ! CommunicatorType::setup( parameters ) )

src/Benchmarks/NDArray/tnl-benchmark-ndarray-boundary.h

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


#include <TNL/Assert.h>

#include <TNL/Math.h>

#include <TNL/Config/parseCommandLine.h>



#include <TNL/Containers/NDArray.h>
@@ -423,10 +424,8 @@ int main( int argc, char* argv[] ) 


   setupConfig( conf_desc );



   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) ) {

      conf_desc.printUsage( argv[ 0 ] );

   if( ! parseCommandLine( argc, argv, conf_desc, parameters ) )

      return EXIT_FAILURE;

   }



   if( ! Devices::Host::setup( parameters ) ||

       ! Devices::Cuda::setup( parameters ) )