diff --git a/CMakeLists.txt b/CMakeLists.txt index 374806de37dedb17ff14d34c1c44f2438001ae2b..2f372d69a3ec5b7c3193c6a2db0e39eb4c534fd3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/src/matrices/tnlMatrixReader.h b/src/matrices/tnlMatrixReader.h index 117813039a3ff49eb7dbe763d21ca95c20cc7a7e..0805424d9e65f53a223aacd98a9278a8ffe23c5e 100644 --- a/src/matrices/tnlMatrixReader.h +++ b/src/matrices/tnlMatrixReader.h @@ -47,7 +47,7 @@ class tnlMatrixReader static bool readMtxFileHostMatrix( std::istream& file, Matrix& matrix, typename Matrix::RowLengthsVector& rowLengths, - bool verbose + bool verbose, bool symReader ); diff --git a/tests/benchmarks/tnl-benchmark-spmv.h b/tests/benchmarks/tnl-benchmark-spmv.h index 42b96b4b2193f8d12e3c9052c678ba00267e7567..035057ed28bc504c20b64befefdcedafb83343b6 100644 --- a/tests/benchmarks/tnl-benchmark-spmv.h +++ b/tests/benchmarks/tnl-benchmark-spmv.h @@ -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(); // } }