From 6d55eed7bae8b8ed2cfe8db814de1370eaf53fda Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Fri, 21 Sep 2018 18:20:55 +0200
Subject: [PATCH] Make simple cosmetic improvements to build info
---
src/utils/BuildInfo.cpp | 6 +++++-
src/utils/PastisUtils.cpp | 2 +-
src/utils/pastis_build_info.hpp.in | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/utils/BuildInfo.cpp b/src/utils/BuildInfo.cpp
index c47c183b0..600d249ea 100644
--- a/src/utils/BuildInfo.cpp
+++ b/src/utils/BuildInfo.cpp
@@ -14,7 +14,11 @@ std::string BuildInfo::type()
std::string BuildInfo::compiler()
{
- return PASTIS_BUILD_COMPILER;
+ std::stringstream compiler_info;
+ compiler_info << PASTIS_BUILD_COMPILER
+ << " (" << PASTIS_BUILD_COMPILER_VERSION
+ << ")" << std::ends;
+ return compiler_info.str();
}
std::string BuildInfo::kokkosDevices()
diff --git a/src/utils/PastisUtils.cpp b/src/utils/PastisUtils.cpp
index a6be8f30a..db228f8d1 100644
--- a/src/utils/PastisUtils.cpp
+++ b/src/utils/PastisUtils.cpp
@@ -68,7 +68,7 @@ std::string initialize(int& argc, char* argv[])
<< '\n';
pout() << "type: " << rang::style::bold << BuildInfo::type() << rang::style::reset << '\n';
pout() << "compiler: " << rang::style::bold << BuildInfo::compiler() << rang::style::reset << '\n';
- pout() << "devices: " << rang::style::bold << BuildInfo::kokkosDevices() << rang::style::reset << '\n';
+ pout() << "kokkos: " << rang::style::bold << BuildInfo::kokkosDevices() << rang::style::reset << '\n';
pout() << "mpi: " << rang::style::bold << BuildInfo::mpiLibrary() << rang::style::reset << '\n';
pout() << "-------------------------------------------------------\n";
{
diff --git a/src/utils/pastis_build_info.hpp.in b/src/utils/pastis_build_info.hpp.in
index cd8756fc6..86a2eff3d 100644
--- a/src/utils/pastis_build_info.hpp.in
+++ b/src/utils/pastis_build_info.hpp.in
@@ -3,6 +3,7 @@
#define PASTIS_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define PASTIS_BUILD_COMPILER "@CMAKE_CXX_COMPILER@"
+#define PASTIS_BUILD_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@"
#define PASTIS_BUILD_KOKKOS_DEVICES "@KOKKOS_GMAKE_DEVICES@"
#endif // PASTIS_BUILD_INFO_HPP
--
GitLab