Commit fa82db44 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

New tool tnl-quickstart was added.

parent aaea7cc7

src/solvers/tnlIterativeSolver_impl.h

+3 −3
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ bool tnlIterativeSolver< Real, Index> :: nextIteration() 
         solverMonitor->refresh();

   }



   if( std::isnan( this->getResidue() || 

   if( std::isnan( this->getResidue() ) || 

       this->getIterations() > this->getMaxIterations()  ||

       ( this->getResidue() > this->getDivergenceResidue() && this->getIterations() > this->minIterations ) ) ||

       ( this->getResidue() > this->getDivergenceResidue() && this->getIterations() > this->minIterations ) ||

       ( this->getResidue() < this->getConvergenceResidue() && this->getIterations() > this->minIterations ) ) 

      return false;

   return true;

tests/benchmarks/share/tnl-matrix-solvers-benchmark.cfg.desc

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
group IO

{

   string input-file(!)         [Input binary file name.];

   string input-mtx-file("")    [Input mtx file name.];

   string log-file("")          [Log file name.];

   string matrix-stats-file("") [File for matrix statistics like size number of non-zero elements.];

   real stop-time(3.0)          [How many seconds shell we iterate SpMV.];

   integer verbose(1)           [Verbose mode.];

},[Arguments describing input and output data.];



group solver

{

   string device("host")         [On what device the solver will run. Can be host or cuda.];

   string solver-name(!)         [Set matrix solver for benchmarking. It can be sor, cg, bicgstab, tfqmr, gmres. ];

   string solver-class("tnl")    [Choose other library of solvers. It can be tnl or petsc.];

   real max-residue(1.0e-6)      [Set what residue we want to achieve.];

   integer gmres-restarting(20)  [Set restarting for GMRES method.];   

   real sor-omega(1.0)           [Omega parameter for the SOR method. Can be 0--2.];

},[Arguments describing the solver.];
 
 No newline at end of file

tests/benchmarks/share/tnl-sparse-matrix-benchmark.cfg.desc

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
group IO

{

   string input-mtx-file(!)     [Input mtx file name.];

   string input-file("")        [Input binary file name.];

   string pdf-file("")          [PDF file with matrix pattern.];

   string log-file("")          [Log file name.];

   string precision("double")   [Precision of the arithmetics.];

   real stop-time(3.0)          [How many seconds shell we iterate SpMV.];

   integer max-iterations(100)  [Maximum number of SpMV repetitions.];

   bool format-test( no )       [Turn on/off test of matrix formats.]; 

   integer verbose(1)           [Verbose mode.];

},[Arguments describing input and output data.];
 
 No newline at end of file

tools/CMakeLists.txt

+3 −2
Original line number Diff line number Diff line 
add_subdirectory (src)

add_subdirectory (share)

add_subdirectory (tnl-quickstart)



CONFIGURE_FILE( "tnl-compile.in" "${PROJECT_TOOLS_PATH}/tnl-compile" )

CONFIGURE_FILE( "tnl-link.in" "${PROJECT_TOOLS_PATH}/tnl-link" )

CONFIGURE_FILE( "tnl-compile.in" "${PROJECT_TOOLS_PATH}/tnl-compile" @ONLY )

CONFIGURE_FILE( "tnl-link.in" "${PROJECT_TOOLS_PATH}/tnl-link" @ONLY )



INSTALL( FILES ${PROJECT_TOOLS_PATH}/tnl-compile 

               ${PROJECT_TOOLS_PATH}/tnl-link

tools/tnl-compile.in

+12 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash



echo -I@CMAKE_INSTALL_PREFIX@/include/tnl-@tnlVersion@
 
 No newline at end of file
 
DEBUG_FLAGS = "-DNDEBUG -march=native"

CUDA_FLAGS = ""



for option in "$@"

do

    case $option in

        --cuda                  ) CUDA_FLAGS="-DHAVE_CUDA -DHAVE_NOT_CXX11 `tnl-cuda-arch`" ;;

        --debug                 ) DEBUG_FLAGS="-g -O0"

    esac

done



echo -I@CMAKE_INSTALL_PREFIX@/include/tnl-@tnlVersion@ ${CUDA_FLAGS}
 
 No newline at end of file