Merge branch 'master' of TinkerTools/tinker9 into hippo-dev

Author: roseane-reis

include/macro.h

@@ -39,6 +39,9 @@ to mimic its name mangling.
 #if defined(__INTEL_COMPILER)
 #   define TINKER_ICPC
 
+#elif defined(__PGIC__)
+#   define TINKER_PGI
+
 #elif defined(__clang__)
 #   define TINKER_CLANG
 // xcode clang is different from llvm clang

src/compilers.cpp

@@ -9,6 +9,14 @@ std::string cxx_compiler_name()
 #if defined(TINKER_ICPC)
    n = format("icpc %d.%d", __INTEL_COMPILER, __INTEL_COMPILER_BUILD_DATE);
 
+#elif defined(TINKER_PGI)
+   if (__PGIC__ <= 19)
+      n = format("pgc++ %d.%d.%d", __PGIC__, __PGIC_MINOR__,
+                 __PGIC_PATCHLEVEL__);
+   else
+      n = format("nvc++ %d.%d.%d", __PGIC__, __PGIC_MINOR__,
+                 __PGIC_PATCHLEVEL__);
+
 #elif defined(TINKER_APPLE_CLANG)
    n = format("clang++ %d.%d.%d (xcode)", __clang_major__, __clang_minor__,
               __clang_patchlevel__);

src/compilers_acc.cpp

@@ -6,8 +6,12 @@ namespace tinker {
 #if TINKER_CUDART
 std::string acc_compiler_name()
 {
-   return format("pgc++ %d.%d.%d", __PGIC__, __PGIC_MINOR__,
-                 __PGIC_PATCHLEVEL__);
+   if (__PGIC__ <= 19)
+      return format("pgc++ %d.%d.%d", __PGIC__, __PGIC_MINOR__,
+                    __PGIC_PATCHLEVEL__);
+   else
+      return format("nvc++ %d.%d.%d", __PGIC__, __PGIC_MINOR__,
+                    __PGIC_PATCHLEVEL__);
 }
 #endif
 }