From dbfec57e77af847d352da2419b97a576e81d2a35 Mon Sep 17 00:00:00 2001
From: Nina Dzugasova <dzugasova.nina@gmail.com>
Date: Thu, 13 Dec 2018 15:18:20 +0100
Subject: [PATCH] Successfully ran.
---
Doxyfile | 1 -
src/Benchmarks/Benchmarks.h | 10 +++++-----
.../DistSpMV/tnl-benchmark-distributed-spmv.h | 6 +++---
.../LinearSolvers/tnl-benchmark-linear-solvers.h | 6 +++---
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Doxyfile b/Doxyfile
index 2e7eec18ca..1b947de18b 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -891,7 +891,6 @@ EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = */Communicators/* \
*/Config/* \
- */Containers/* \
*/Debugging/* \
*/Devices/* \
*/DistributedContainers/* \
diff --git a/src/Benchmarks/Benchmarks.h b/src/Benchmarks/Benchmarks.h
index 2b8b28b892..de3727b212 100644
--- a/src/Benchmarks/Benchmarks.h
+++ b/src/Benchmarks/Benchmarks.h
@@ -508,12 +508,12 @@ Benchmark::MetadataMap getHardwareMetadata()
? Communicators::MpiCommunicator::GetSize( Communicators::MpiCommunicator::AllGroup )
: 1 },
#endif
- { "OpenMP enabled", Devices::Host::isOMPEnabled() },
- { "OpenMP threads", Devices::Host::getMaxThreadsCount() },
+ { "OpenMP enabled", String( Devices::Host::isOMPEnabled() ) },
+ { "OpenMP threads", String( Devices::Host::getMaxThreadsCount() ) },
{ "CPU model name", Devices::SystemInfo::getCPUModelName( cpu_id ) },
- { "CPU cores", Devices::SystemInfo::getNumberOfCores( cpu_id ) },
- { "CPU threads per core", Devices::SystemInfo::getNumberOfThreads( cpu_id ) / Devices::SystemInfo::getNumberOfCores( cpu_id ) },
- { "CPU max frequency (MHz)", Devices::SystemInfo::getCPUMaxFrequency( cpu_id ) / 1e3 },
+ { "CPU cores", String( Devices::SystemInfo::getNumberOfCores( cpu_id ) ) },
+ { "CPU threads per core", String( Devices::SystemInfo::getNumberOfThreads( cpu_id ) / Devices::SystemInfo::getNumberOfCores( cpu_id ) ) },
+ { "CPU max frequency (MHz)", String( Devices::SystemInfo::getCPUMaxFrequency( cpu_id ) / 1e3 ) },
{ "CPU cache sizes (L1d, L1i, L2, L3) (kiB)", cacheInfo },
#ifdef HAVE_CUDA
{ "GPU name", Devices::CudaDeviceInfo::getDeviceName( activeGPU ) },
diff --git a/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h b/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h
index 11ae35b436..ecc001d667 100644
--- a/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h
+++ b/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h
@@ -177,11 +177,11 @@ struct SpmvBenchmark
benchmark.setMetadataColumns( Benchmark::MetadataColumns({
// TODO: strip the device
// {"matrix type", matrix.getType()},
- {"rows", matrix.getRows()},
- {"columns", matrix.getColumns()},
+ {"rows", String( matrix.getRows() ) },
+ {"columns", String( matrix.getColumns() ) },
// FIXME: getMaxRowLengths() returns 0 for matrices loaded from file
// {"max elements per row", matrix.getMaxRowLength()},
- {"max elements per row", maxRowLength},
+ {"max elements per row", String( maxRowLength ) },
} ));
const bool reorder = parameters.getParameter< bool >( "reorder-dofs" );
diff --git a/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h b/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
index a898f156b4..c31f776cd4 100644
--- a/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
+++ b/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
@@ -347,11 +347,11 @@ struct LinearSolversBenchmark
benchmark.setMetadataColumns( Benchmark::MetadataColumns({
// TODO: strip the device
// {"matrix type", matrixPointer->getType()},
- {"rows", matrixPointer->getRows()},
- {"columns", matrixPointer->getColumns()},
+ {"rows", String( matrixPointer->getRows() ) },
+ {"columns", String( matrixPointer->getColumns() ) },
// FIXME: getMaxRowLengths() returns 0 for matrices loaded from file
// {"max elements per row", matrixPointer->getMaxRowLength()},
- {"max elements per row", maxRowLength},
+ {"max elements per row", String( maxRowLength ) },
} ));
const bool reorder = parameters.getParameter< bool >( "reorder-dofs" );
--
GitLab