Commit 7af68afc authored by Libor's avatar Libor
Browse files

Fixed

parent f9a176d4

CMakeLists.txt

+5 −20
Original line number Diff line number Diff line
@@ -145,11 +145,11 @@ endif() 
####

# Check for cppunit

#

FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/TestCase.h

  /usr/local/include

  /usr/include

  DOC "CppUnit headers."

)

#FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/TestCase.h

#  /usr/local/include

#  /usr/include

#  DOC "CppUnit headers."

#)



####

# With Win32, important to have both
@@ -176,21 +176,6 @@ else(WIN32) 
endif(WIN32)





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" )

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

  if(CPPUNIT_LIBRARY)

    message( "CPPUNIT library found -- ${CPPUNIT_LIBRARY}" )

    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} STREQUAL "CPPUNIT_INCLUDE_DIR-NOTFOUND" )



#if( BUILD_MPI )

#   FIND_PATH( PETSC_INCLUDE_DIR petsc.h

#     /usr/include/petsc

src/matrices/tnlMatrixReader.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class tnlMatrixReader 
   static bool readMtxFileHostMatrix( std::istream& file,

                                      Matrix& matrix,

                                      typename Matrix::RowLengthsVector& rowLengths,

                                      bool verbose

                                      bool verbose,

                                      bool symReader );

tests/benchmarks/tnl-benchmark-spmv.h

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <matrices/tnlChunkedEllpackMatrix.h>

#include <matrices/tnlMatrixReader.h>

#include <matrices/tnlBiEllpackMatrix.h>

#include <matrices/tnlAdEllpackMatrix.h>

//#include <matrices/tnlAdEllpackMatrix.h>

#include <core/tnlTimerRT.h>

#include "tnlCusparseCSRMatrix.h"
@@ -744,6 +744,7 @@ bool setupBenchmark( const tnlParameterContainer& parameters ) 
  //                        baseline,

  //                        verbose,

  //                        logFile );

/*

#ifdef HAVE_CUDA

         typedef tnlAdEllpackMatrix< Real, tnlCuda, int > AdEllpackMatrixCudaType;

         AdEllpackMatrixCudaType cudaAdEllpackMatrix;
@@ -771,6 +772,7 @@ bool setupBenchmark( const tnlParameterContainer& parameters ) 
         cudaAdEllpackMatrix.reset();

	}

#endif

*/

//         adEllpackMatrix.reset();

//      }

   }