Merge branch 'feature/numa' into develop

Author: theurich

build/common.mk

@@ -1808,6 +1808,10 @@ endif
 #-------------------------------------------------------------------------------
 # NUMA
 #-------------------------------------------------------------------------------
+ifeq ($(ESMF_NUMA),OFF)
+ESMF_NUMA=
+endif
+
 ifeq ($(ESMF_NUMA),ON)
 ESMF_NUMA = standard
 endif

src/Infrastructure/VM/src/ESMCI_VMKernel.C

@@ -3134,6 +3134,8 @@ void VMK::log(std::string prefix, ESMC_LogMsgType_Flag msgType)const{
 
 
 void VMK::logSystem(std::string prefix, ESMC_LogMsgType_Flag msgType){
+#undef  ESMC_METHOD
+#define ESMC_METHOD "ESMCI::VMK::logSystem()"
   std::stringstream msg;
   msg << prefix << "--- VMK::logSystem() start -------------------------------";
   ESMC_LogDefault.Write(msg.str(), msgType);
@@ -3245,17 +3247,18 @@ void VMK::logSystem(std::string prefix, ESMC_LogMsgType_Flag msgType){
       descLen = sizeof(desc);
       mpi_rc = MPI_T_cvar_get_info(i, name, &nameLen, &verbosity, &datatype,
         &enumtype, desc, &descLen, &binding, &scope);
-      if (mpi_rc != MPI_SUCCESS){
+      if (mpi_rc == MPI_SUCCESS){
+        msg.str("");  // clear
+        msg << prefix << "index=" << std::setw(4) << i << std::setw(60) << name
+          << " : " << desc;
+        ESMC_LogDefault.Write(msg.str(), msgType);
+      }else if (mpi_rc != MPI_T_ERR_INVALID_INDEX){
         int localrc;
         ESMC_LogDefault.MsgFoundError(ESMC_RC_INTNRL_BAD,
-          "MPI_T_cvar_get_info() did not return MPI_SUCCESS.",
+          "Call to MPI_T_cvar_get_info() failed in unsupported way.",
           ESMC_CONTEXT, &localrc);
         throw localrc;  // bail out with exception
       }
-      msg.str("");  // clear
-      msg << prefix << "index=" << std::setw(4) << i << std::setw(60) << name
-        << " : " << desc;
-      ESMC_LogDefault.Write(msg.str(), msgType);
     }
 #if 0
     // testing to change the MPICH EAGER limit for the shared memory channel

src/doc/ESMF_install.tex

@@ -606,6 +606,41 @@ \subsubsection{MOAB}
 
 \end{description}
 
+\subsubsection{NUMA}
+\label{sec:NUMA}
+
+The LibNUMA API for Non Uniform Memory Access
+(\htmladdnormallink{NUMA}{https://halobates.de/numaapi3.pdf})
+can be used to discover the NUMA architecture at run-time.
+
+\begin{description}
+
+\item[ESMF\_NUMA] Possible values: {\tt "ON"}, {\tt "standard"}, {\tt "OFF"} (default).
+
+\begin{description}
+\item[{\tt "ON"}/{\tt "standard"}] The NUMA dependent code inside of ESMF will
+be enabled.
+The {\tt ESMF\_NUMA\_LIBS} environment variable will be set to
+{\tt "-lnuma"}.
+
+\item[{\tt "OFF"} (default)] Disables NUMA dependent code.
+\end{description}
+
+\item[ESMF\_NUMA\_INCLUDE] Typically not needed. (no default).
+
+Specifies the path where the NUMA header files are located.
+
+\item[ESMF\_NUMA\_LIBPATH] Typically not needed. (no default).
+
+Specifies the path where the NUMA library file is located.
+
+\item[ESMF\_NUMA\_LIBS] Typical value: {\tt "-lnuma"}.
+
+Specifies the linker directives needed to link the NUMA library to
+the application.
+
+\end{description}
+
 \subsubsection{NVML}
 \label{sec:NVML}
 
@@ -634,7 +669,7 @@ \subsubsection{NVML}
 
 Specifies the path where the NVML library file is located.
 
-\item[ESMF\_NVML\_LIBS] Typical value: {\tt "-lnvidia-ml"} (no default).
+\item[ESMF\_NVML\_LIBS] Typical value: {\tt "-lnvidia-ml"}.
 
 Specifies the linker directives needed to link the NVML library to
 the application.