From 7af68afccfbcb9dcea77a055c76d4b5f8e04f004 Mon Sep 17 00:00:00 2001
From: Libor <bakajsa.libor@seznam.cz>
Date: Sun, 31 Jul 2016 17:44:47 +0200
Subject: [PATCH] Fixed
---
CMakeLists.txt | 25 +++++--------------------
src/matrices/tnlMatrixReader.h | 2 +-
tests/benchmarks/tnl-benchmark-spmv.h | 4 +++-
3 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 374806de37..2f372d69a3 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 117813039a..0805424d9e 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 42b96b4b21..035057ed28 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();
// }
}
--
GitLab