Commit 1d595630 authored by Tomas Oberhuber's avatar Tomas Oberhuber
Browse files

Implementing new interace for linear iterative solvers (for GMRES only 

so far).
parent 8fe96358

CMakeLists.txt

+35 −27
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ if( NOT WITH_CUDA STREQUAL "no" ) 
        ####

        # Check for CUSPARSE

        #

        if( NOT WITH_CUSPARSE STREQUAL "no" )

           find_path( CUSPARSE_INCLUDE_DIR cusparse.h

                      /usr/local/cuda/include                   

                      ${CUDA_INCLUDE_DIR}
@@ -113,6 +114,7 @@ if( NOT WITH_CUDA STREQUAL "no" ) 
           endif()    

           string( REPLACE "/libcusparse.so" "" CUSPARSE_LINK_DIRECTORY ${CUSPARSE_LIBRARY} )

           link_directories( ${CUSPARSE_LINK_DIRECTORY} )

        endif( NOT WITH_CUSPARSE STREQUAL "no" )

            

    endif( CUDA_FOUND )

endif( NOT WITH_CUDA STREQUAL "no" )
@@ -165,6 +167,7 @@ endif() 
FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/TestCase.h

  /usr/local/include

  /usr/include

  DOC "CppUnit headers."

)



####
@@ -191,15 +194,20 @@ else(WIN32) 
               /usr/lib)

endif(WIN32)



if(CPPUNIT_INCLUDE_DIR)



if( ${CPPUNIT_INCLUDE_DIR} STREQUAL "CPPUNIT_INCLUDE_DIR-NOTFOUND" )

      message( "CPPUNIT not found." )

      set( HAVE_CPPUNIT "//#define HAVE_CPPUNIT" )

else( ${CPPUNIT_INCLUDE_DIR} STREQUAL "CPPUNIT_INCLUDE_DIR-NOTFOUND" )

  if(CPPUNIT_LIBRARY)

    message( "CPPUNIT found. -- ${CPPUNIT_INCLUDE_DIR}" )

    set(CPPUNIT_FOUND "YES")

    set(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY} ${CMAKE_DL_LIBS})

    set(CPPUNIT_DEBUG_LIBRARIES ${CPPUNIT_DEBUG_LIBRARY}

                                ${CMAKE_DL_LIBS})

   set( HAVE_CPPUNIT "#define HAVE_CPPUNIT" )

  endif(CPPUNIT_LIBRARY)

endif(CPPUNIT_INCLUDE_DIR)



endif( ${CPPUNIT_INCLUDE_DIR} STREQUAL "CPPUNIT_INCLUDE_DIR-NOTFOUND" )



ENABLE_TESTING()

INCLUDE( Dart )

buildAll

+3 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=no

WITH_CUSPARSE=no

CUDA_ARCHITECTURE=2.0

VERBOSE=1
@@ -20,13 +21,13 @@ then 
fi



cd Debug

cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=${CUDA_ARCHITECTURE} -DWITH_CUDA=${WITH_CUDA}

cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=${CUDA_ARCHITECTURE} -DWITH_CUDA=${WITH_CUDA} -DWITH_CUSPARSE=${WITH_CUSPARSE}

make -j${CPUS} #VERBOSE=1

make -j${CPUS} test

make -j${CPUS} install



cd ../Release

cmake .. -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=${CUDA_ARCHITECTURE} -DWITH_CUDA=${WITH_CUDA}

cmake .. -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=${CUDA_ARCHITECTURE} -DWITH_CUDA=${WITH_CUDA} -DWITH_CUSPARSE=${WITH_CUSPARSE}

make -j${CPUS} #VERBOSE=1

make -j${CPUS} test

make -j${CPUS} install

src/core/tnlVectorCUDA.h

+239 −250

File changed.

Preview size limit exceeded, changes collapsed.

src/core/tnlVectorHost.h

+138 −182

File changed.

Preview size limit exceeded, changes collapsed.

src/matrix/tnlCSRMatrix.h

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ class tnlCSRMatrix : public tnlMatrix< Real, Device, Index > 
{

   public:



   typedef Real RealType;

   typedef Index IndexType;



   //! Basic constructor

   tnlCSRMatrix( const tnlString& name );