Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / utility / binaryinformation.cpp

diff --git a/src/gromacs/utility/binaryinformation.cpp b/src/gromacs/utility/binaryinformation.cpp
index c27e28ad37aa09a0fc803521ea04bd9f4d88c3ba..ab64d393cf3af7728d958f69aff3fd432bbb659f 100644 (file)
--- a/src/gromacs/utility/binaryinformation.cpp
+++ b/src/gromacs/utility/binaryinformation.cpp
@@ -59,7 +59,7 @@
 #include <extrae_user_events.h>
 #endif
 
-#if GMX_HWLOC
+#if GMX_USE_HWLOC
 #include <hwloc.h>
 #endif
 
@@ -154,14 +154,14 @@ void printCopyright(gmx::TextWriter *writer)
         "of the License, or (at your option) any later version."
     };
 
-#define NCONTRIBUTORS (int)asize(Contributors)
-#define NCR (int)asize(CopyrightText)
+#define NCONTRIBUTORS static_cast<int>(asize(Contributors))
+#define NCR static_cast<int>(asize(CopyrightText))
 
 // FAH has an exception permission from LGPL to allow digital signatures in Gromacs.
 #ifdef GMX_FAHCORE
 #define NLICENSE 0
 #else
-#define NLICENSE (int)asize(LicenseText)
+#define NLICENSE static_cast<int>(asize(LicenseText))
 #endif
 
     // TODO a centering behaviour of TextWriter could be useful here
@@ -239,7 +239,7 @@ void gmx_print_version_info(gmx::TextWriter *writer)
 #else
     writer->writeLine("Precision:          single");
 #endif
-    writer->writeLine(formatString("Memory model:       %u bit", (unsigned)(8*sizeof(void *))));
+    writer->writeLine(formatString("Memory model:       %u bit", static_cast<unsigned>(8*sizeof(void *))));
 
 #if GMX_THREAD_MPI
     writer->writeLine("MPI library:        thread_mpi");
@@ -262,7 +262,7 @@ void gmx_print_version_info(gmx::TextWriter *writer)
 #else
     writer->writeLine("TNG support:        disabled");
 #endif
-#if GMX_HWLOC
+#if GMX_USE_HWLOC
     writer->writeLine(formatString("Hwloc support:      hwloc-%s", HWLOC_VERSION));
 #else
     writer->writeLine("Hwloc support:      disabled");
@@ -302,12 +302,10 @@ void gmx_print_version_info(gmx::TextWriter *writer)
     writer->writeLine(formatString("OpenCL version:     %s", OPENCL_VERSION_STRING));
 #endif
 #if GMX_GPU == GMX_GPU_CUDA
-    writer->writeLine(formatString("CUDA compiler:      %s\n", CUDA_COMPILER_INFO));
-    writer->writeLine(formatString("CUDA compiler flags:%s\n", CUDA_COMPILER_FLAGS));
-    auto driverVersion = gmx::getCudaDriverVersion();
-    writer->writeLine(formatString("CUDA driver:        %d.%d\n", driverVersion.first, driverVersion.second));
-    auto runtimeVersion = gmx::getCudaRuntimeVersion();
-    writer->writeLine(formatString("CUDA runtime:       %d.%d\n", runtimeVersion.first, runtimeVersion.second));
+    writer->writeLine(formatString("CUDA compiler:      %s", CUDA_COMPILER_INFO));
+    writer->writeLine(formatString("CUDA compiler flags:%s", CUDA_COMPILER_FLAGS));
+    writer->writeLine("CUDA driver:        " + gmx::getCudaDriverVersionString());
+    writer->writeLine("CUDA runtime:       " + gmx::getCudaRuntimeVersionString());
 #endif
 }