Skip to content

Commit 1506816

Browse files
committed
Deal with ESMF_NUMA==OFF correctly, and add NUMA section to ESMF User
Doc.
1 parent 1027c45 commit 1506816

File tree

2 files changed

+40
-1
lines changed

2 files changed

+40
-1
lines changed

build/common.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,10 @@ endif
18081808
#-------------------------------------------------------------------------------
18091809
# NUMA
18101810
#-------------------------------------------------------------------------------
1811+
ifeq ($(ESMF_NUMA),OFF)
1812+
ESMF_NUMA=
1813+
endif
1814+
18111815
ifeq ($(ESMF_NUMA),ON)
18121816
ESMF_NUMA = standard
18131817
endif

src/doc/ESMF_install.tex

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,41 @@ \subsubsection{MOAB}
606606

607607
\end{description}
608608

609+
\subsubsection{NUMA}
610+
\label{sec:NUMA}
611+
612+
The LibNUMA API for Non Uniform Memory Access
613+
(\htmladdnormallink{NUMA}{https://halobates.de/numaapi3.pdf})
614+
can be used to discover the NUMA architecture at run-time.
615+
616+
\begin{description}
617+
618+
\item[ESMF\_NUMA] Possible values: {\tt "ON"}, {\tt "standard"}, {\tt "OFF"} (default).
619+
620+
\begin{description}
621+
\item[{\tt "ON"}/{\tt "standard"}] The NUMA dependent code inside of ESMF will
622+
be enabled.
623+
The {\tt ESMF\_NUMA\_LIBS} environment variable will be set to
624+
{\tt "-lnuma"}.
625+
626+
\item[{\tt "OFF"} (default)] Disables NUMA dependent code.
627+
\end{description}
628+
629+
\item[ESMF\_NUMA\_INCLUDE] Typically not needed. (no default).
630+
631+
Specifies the path where the NUMA header files are located.
632+
633+
\item[ESMF\_NUMA\_LIBPATH] Typically not needed. (no default).
634+
635+
Specifies the path where the NUMA library file is located.
636+
637+
\item[ESMF\_NUMA\_LIBS] Typical value: {\tt "-lnuma"}.
638+
639+
Specifies the linker directives needed to link the NUMA library to
640+
the application.
641+
642+
\end{description}
643+
609644
\subsubsection{NVML}
610645
\label{sec:NVML}
611646

@@ -634,7 +669,7 @@ \subsubsection{NVML}
634669

635670
Specifies the path where the NVML library file is located.
636671

637-
\item[ESMF\_NVML\_LIBS] Typical value: {\tt "-lnvidia-ml"} (no default).
672+
\item[ESMF\_NVML\_LIBS] Typical value: {\tt "-lnvidia-ml"}.
638673

639674
Specifies the linker directives needed to link the NVML library to
640675
the application.

0 commit comments

Comments
 (0)