From f96ea7f2ec77069647fb58ca400d479f6e3011ea Mon Sep 17 00:00:00 2001 From: "Nicholas S. Park" Date: Mon, 13 Mar 2017 08:54:14 -0400 Subject: [PATCH] Update "\Fortran{}" -> "\Fortran" --- content/backmatter.tex | 18 +++++++++--------- content/language_bindings_and_conformance.tex | 4 ++-- content/library_constants.tex | 2 +- content/memory_model.tex | 4 ++-- content/programming_model_overview.tex | 2 +- content/shmem_addr_accessible.tex | 2 +- content/shmem_broadcast.tex | 6 +++--- content/shmem_collect.tex | 10 +++++----- content/shmem_iget.tex | 2 +- content/shmem_inc.tex | 2 +- content/shmem_ptr.tex | 2 +- content/shmem_reductions.tex | 14 +++++++------- content/shmem_wait.tex | 2 +- content/shpalloc.tex | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/content/backmatter.tex b/content/backmatter.tex index 5a5f3536c..4e7d96a50 100644 --- a/content/backmatter.tex +++ b/content/backmatter.tex @@ -41,7 +41,7 @@ \section*{Incorporating \openshmem{} into Programs}\label{sec:writing_programs} \vspace{0.1in} \end{minipage} -\openshmem also has a \Fortran{} API, so for completeness we will now give the +\openshmem also has a \Fortran API, so for completeness we will now give the same program written in \Fortran, in listing~\ref{openshmem-hello-f90}: \begin{minipage}{\linewidth} @@ -114,14 +114,14 @@ \subsection*{Programs written in \Cpp} \subsection*{Programs written in \Fortran} The \openshmem{} Reference Implementation provides a wrapper program named -\textbf{oshfort}, to aid in the compilation of \Fortran{} programs, the wrapper +\textbf{oshfort}, to aid in the compilation of \Fortran programs, the wrapper could be called as follows: \begin{lstlisting}[language=bash] oshfort -o myprogram myprogram.f \end{lstlisting} Where the $\langle\mbox{compiler options}\rangle$ are options understood by the -underlying \Fortran{} compiler called by \textbf{oshfort}. +underlying \Fortran compiler called by \textbf{oshfort}. \section{Running Programs} @@ -234,7 +234,7 @@ \section{\ac{MPI} Interoperability} \openshmem routines can be used to communicate with processes running from the same or different executable files, provided that the communication is limited to symmetric data objects. On these systems, static memory such as a -\Fortran{} common block or \Cstd global variable, is symmetric between +\Fortran common block or \Cstd global variable, is symmetric between processes running from the same executable file, but is not symmetric between processes running from different executable files. Data allocated from the symmetric heap (\FUNC{shmem\_malloc} or \FUNC{shpalloc}) is symmetric across the @@ -390,8 +390,8 @@ \subsection{start\_pes} \hyperref[subsec:shmem_init]{\FUNC{shmem\_init}} instead. \subsection{SHMEM\_PUT (Fortran API)} -The \Fortran{} function \FUNC{SHMEM\_PUT} is defined only for the \Fortran{} -\ac{API} and is semantically identical to \Fortran{} functions +The \Fortran function \FUNC{SHMEM\_PUT} is defined only for the \Fortran +\ac{API} and is semantically identical to \Fortran functions \FUNC{SHMEM\_PUT8} and \FUNC{SHMEM\_PUT64}. Since \FUNC{SHMEM\_PUT8} and \FUNC{SHMEM\_PUT64} have defined equivalents in the \CorCpp interface, \FUNC{SHMEM\_PUT} is ambiguous and has been deprecated. @@ -427,7 +427,7 @@ \subsection{\_SHMEM\_* constants} do not adhere to the \Cstd standard's reserved identifiers and the \Cpp{} standard's reserved names. These constants have been deprecated and replaced with corresponding constants of prefix \shmemprefix{} that adhere to \CorCpp{} -and \Fortran{} naming conventions. +and \Fortran naming conventions. @@ -642,7 +642,7 @@ \section{Version 1.1} \item Added examples to the different interfaces. % \item Clarification of the naming conventions for constant in \Cstd and - \Fortran{}. + \Fortran. \\See Section \ref{subsec:library_constants} and \ref{subsec:shmem_wait}. % \item Added \ac{API} calls: \FUNC{shmem\_char\_p}, \FUNC{shmem\_char\_g}. @@ -672,7 +672,7 @@ \section{Version 1.1} \item Clarification of the size of the symmetric heap and when it is set. \\See Section \ref{subsec:shfree}. % -\item Clarification of the integer and real sizes for \Fortran{} \ac{API}. +\item Clarification of the integer and real sizes for \Fortran \ac{API}. \\See Sections \ref{subsec:shmem_add}, \ref{subsec:shmem_cswap}, \ref{subsec:shmem_swap}, \ref{subsec:shmem_finc}, \ref{subsec:shmem_inc}, and \ref{subsec:shmem_fadd}. diff --git a/content/language_bindings_and_conformance.tex b/content/language_bindings_and_conformance.tex index e076a3c8d..93129d938 100644 --- a/content/language_bindings_and_conformance.tex +++ b/content/language_bindings_and_conformance.tex @@ -1,10 +1,10 @@ \openshmem provides ISO \Cstd and \Fortran[90] language bindings. -Any implementation that provides both \Cstd and \Fortran{} bindings can claim +Any implementation that provides both \Cstd and \Fortran bindings can claim conformance to the specification. An implementation that provides e.g.\ only a \Cstd interface may claim to conform to the \openshmem specification with respect to the \Cstd language, but not to \Fortran, and should make this clear in its documentation. The \openshmem header files for \Cstd and -\Fortran{} must contain only the interfaces and constant names defined in this +\Fortran must contain only the interfaces and constant names defined in this specification. \openshmem \ac{API}s can be implemented as either routines or macros. However, diff --git a/content/library_constants.tex b/content/library_constants.tex index 4e2346f0d..5a13ce4a9 100644 --- a/content/library_constants.tex +++ b/content/library_constants.tex @@ -1,4 +1,4 @@ -The constants that start with SHMEM\_* are for both \Fortran{} +The constants that start with SHMEM\_* are for both \Fortran and \CorCpp, and they are compile-time constants. All constants that start with \_SHMEM\_* are deprecated and provided for backwards compatibility. diff --git a/content/memory_model.tex b/content/memory_model.tex index 654135451..ff1c2f0c0 100644 --- a/content/memory_model.tex +++ b/content/memory_model.tex @@ -26,11 +26,11 @@ data objects are symmetric: % \begin{itemize} - \item \Fortran{} data objects in common blocks or with the SAVE attribute. + \item \Fortran data objects in common blocks or with the SAVE attribute. These data objects must not be defined in a dynamic shared object (DSO). \item Global and static \Cstd and \Cpp variables. These data objects must not be defined in a DSO. - \item \Fortran{} arrays allocated with \textit{shpalloc} + \item \Fortran arrays allocated with \textit{shpalloc} \item \Cstd and \Cpp data allocated by \textit{shmem\_malloc} \end{itemize} diff --git a/content/programming_model_overview.tex b/content/programming_model_overview.tex index 9994d0ee7..9801eb1e8 100644 --- a/content/programming_model_overview.tex +++ b/content/programming_model_overview.tex @@ -19,7 +19,7 @@ into multiple sub-problems that can be solved independently or with coordination using the communication and synchronization interfaces. The \openshmem specification defines library calls, constants, variables, and language bindings -for \Cstd and \Fortran{}. The \Cpp{} interface is currently the same as that +for \Cstd and \Fortran. The \Cpp{} interface is currently the same as that for \Cstd. Unlike UPC, Fortran 2008, Titanium, X10 and Chapel, which are all PGAS languages, \openshmem relies on the user to use the library calls to implement the correct semantics of its programming model. diff --git a/content/shmem_addr_accessible.tex b/content/shmem_addr_accessible.tex index 6286c1150..13212a646 100644 --- a/content/shmem_addr_accessible.tex +++ b/content/shmem_addr_accessible.tex @@ -32,7 +32,7 @@ communication libraries (such as \ac{MPI}) or parallel languages. For example, in SGI Altix series systems, for multiple executable MPI programs that use \openshmem routines, it is important to note that static memory, such as a - \Fortran{} common block or \Cstd global variable, is symmetric between + \Fortran common block or \Cstd global variable, is symmetric between processes running from the same executable file, but is not symmetric between processes running from different executable files. Data allocated from the symmetric heap (\FUNC{shmem\_malloc} or \FUNC{shpalloc}) is symmetric across the diff --git a/content/shmem_broadcast.tex b/content/shmem_broadcast.tex index 80700dc50..ae4193638 100644 --- a/content/shmem_broadcast.tex +++ b/content/shmem_broadcast.tex @@ -86,10 +86,10 @@ }{Routine}{Data type of \VAR{dest} and \VAR{source}} \apitablerow{shmem\_broadcast8, shmem\_broadcast64}{Any noncharacter - type that has an element size of \CONST{64} bits. No \Fortran{} derived types or + type that has an element size of \CONST{64} bits. No \Fortran derived types or \CorCpp{} structures are allowed.} \apitablerow{shmem\_broadcast4, shmem\_broadcast32}{Any noncharacter - type that has an element size of \CONST{32} bits. No \Fortran{} + type that has an element size of \CONST{32} bits. No \Fortran derived types or \CorCpp{} structures are allowed.} \apireturnvalues{ @@ -125,7 +125,7 @@ {} \apifexample - {\Fortran{} example:} + {\Fortran example:} {./example_code/shmem_broadcast_example.f90} {} diff --git a/content/shmem_collect.tex b/content/shmem_collect.tex index 3c9e8eb08..b522b735f 100644 --- a/content/shmem_collect.tex +++ b/content/shmem_collect.tex @@ -32,11 +32,11 @@ to accept the concatenation of the \source{} arrays on all \ac{PE}s. The data types are as follows: For \FUNC{shmem\_collect8}, \FUNC{shmem\_collect64}, \FUNC{shmem\_fcollect8}, and \FUNC{shmem\_fcollect64}, any data type with an - element size of 64 bits. \Fortran{} derived types, \Fortran{} character type, + element size of 64 bits. \Fortran derived types, \Fortran character type, and \CorCpp{} structures are not permitted. For \FUNC{shmem\_collect4}, \FUNC{shmem\_collect32}, \FUNC{shmem\_fcollect4}, and \FUNC{shmem\_fcollect32}, - any data type with an element size of \CONST{32} bits. \Fortran{} derived - types, \Fortran{} character type, and \CorCpp{} structures are not permitted.} + any data type with an element size of \CONST{32} bits. \Fortran derived + types, \Fortran character type, and \CorCpp{} structures are not permitted.} \apiargument{IN}{source}{A symmetric data object that can be of any type permissible for the \dest{} argument.} \apiargument{IN}{nelems}{The number of elements in the \source{} array. \VAR{nelems} @@ -56,7 +56,7 @@ \VAR{pSync} must be of type integer and size \CONST{SHMEM\_COLLECT\_SYNC\_SIZE}. If you are using \Fortran, it must be a default integer value. Every element of this array must be initialized with the value \CONST{SHMEM\_SYNC\_VALUE} in - \CorCpp{} or \CONST{SHMEM\_SYNC\_VALUE} in \Fortran{} before any of the \ac{PE}s + \CorCpp{} or \CONST{SHMEM\_SYNC\_VALUE} in \Fortran before any of the \ac{PE}s in the \activeset{} enter \FUNC{shmem\_collect} or \FUNC{shmem\_fcollect}.} \end{apiarguments} @@ -123,7 +123,7 @@ {} \apifexample - {The following \FUNC{SHMEM\_COLLECT} example is for \Fortran{} programs:} + {The following \FUNC{SHMEM\_COLLECT} example is for \Fortran programs:} {./example_code/shmem_collect_example.f90} {} diff --git a/content/shmem_iget.tex b/content/shmem_iget.tex index f635311f2..34f0ad926 100644 --- a/content/shmem_iget.tex +++ b/content/shmem_iget.tex @@ -95,7 +95,7 @@ \begin{apiexamples} \apifexample - {The following example uses \FUNC{shmem\_logical\_iget} in a \Fortran{} + {The following example uses \FUNC{shmem\_logical\_iget} in a \Fortran program.} {./example_code/shmem_iget_example.f90} {} diff --git a/content/shmem_inc.tex b/content/shmem_inc.tex index 239247e1d..059320215 100644 --- a/content/shmem_inc.tex +++ b/content/shmem_inc.tex @@ -26,7 +26,7 @@ on the remote \ac{PE}. The type of \dest{} should match that implied in the SYNOPSIS section.} \apiargument{IN}{pe}{An integer that indicates the \ac{PE} number on which - \dest{} is to be updated. If you are using \Fortran{}, it must be a default + \dest{} is to be updated. If you are using \Fortran, it must be a default integer value.} \end{apiarguments} diff --git a/content/shmem_ptr.tex b/content/shmem_ptr.tex index a0cf53c80..ebf50aeed 100644 --- a/content/shmem_ptr.tex +++ b/content/shmem_ptr.tex @@ -48,7 +48,7 @@ \begin{apiexamples} \apifexample - { This \Fortran{} program calls \FUNC{shmem\_ptr} and then \ac{PE} 0 writes to + { This \Fortran program calls \FUNC{shmem\_ptr} and then \ac{PE} 0 writes to the \VAR{BIGD} array on \ac{PE} 1: } {./example_code/shmem_ptr_example.f90 } {} diff --git a/content/shmem_reductions.tex b/content/shmem_reductions.tex index c9ed53875..ba6c3f34f 100644 --- a/content/shmem_reductions.tex +++ b/content/shmem_reductions.tex @@ -269,46 +269,46 @@ \begin{apiexamples} \apifexample - {This \Fortran{} reduction example statically initializes the \VAR{pSync} array + {This \Fortran reduction example statically initializes the \VAR{pSync} array and finds the logical \OPR{AND} of the integer variable \VAR{FOO} across all even \ac{PE}s.} {./example_code/shmem_and_example.f90} {} \apifexample - {This \Fortran{} example statically initializes the \VAR{pSync} array and finds + {This \Fortran example statically initializes the \VAR{pSync} array and finds the \OPR{maximum} value of real variable \VAR{FOO} across all even \ac{PE}s.} {./example_code/shmem_max_example.f90} {} \apifexample - { This \Fortran{} example statically initializes the \VAR{pSync} array and finds + { This \Fortran example statically initializes the \VAR{pSync} array and finds the \OPR{minimum} value of real variable \VAR{FOO} across all the even \ac{PE}s.} {./example_code/shmem_min_example.f90} {} \apifexample - {This \Fortran{} example statically initializes the \VAR{pSync} array and finds + {This \Fortran example statically initializes the \VAR{pSync} array and finds the \OPR{sum} of the real variable \VAR{FOO} across all even \ac{PE}s.} {./example_code/shmem_sum_example.f90} {} \apifexample - {This \Fortran{} example statically initializes the \VAR{pSync} array and finds + {This \Fortran example statically initializes the \VAR{pSync} array and finds the \OPR{product} of the real variable \VAR{FOO} across all the even \ac{PE}s.} {./example_code/shmem_prod_example.f90} {} \apifexample - {This \Fortran{} example statically initializes the \VAR{pSync} array and finds + {This \Fortran example statically initializes the \VAR{pSync} array and finds the logical \OPR{OR} of the integer variable \VAR{FOO} across all even \ac{PE}s.} {./example_code/shmem_or_example.f90} {} \apifexample - {This \Fortran{} example statically initializes the \VAR{pSync} array and + {This \Fortran example statically initializes the \VAR{pSync} array and computes the exclusive \OPR{XOR} of variable \VAR{FOO} across all even \ac{PE}s.} {./example_code/shmem_xor_example.f90} diff --git a/content/shmem_wait.tex b/content/shmem_wait.tex index f6b8c297c..4b61cf708 100644 --- a/content/shmem_wait.tex +++ b/content/shmem_wait.tex @@ -119,7 +119,7 @@ {} \apifexample -{The following \Fortran{} example is in the context of a subroutine:} +{The following \Fortran example is in the context of a subroutine:} {./example_code/shmem_wait4_example.f90} {} diff --git a/content/shpalloc.tex b/content/shpalloc.tex index 68f5b66d1..86cd94e27 100644 --- a/content/shpalloc.tex +++ b/content/shpalloc.tex @@ -25,7 +25,7 @@ consistency, all \ac{PE}s in an program must call \FUNC{SHPALLOC} with the same value of length; if any \ac{PE}s are missing, the program will hang. - By using the \Fortran{} \CONST{POINTER} mechanism in the following manner, you + By using the \Fortran \CONST{POINTER} mechanism in the following manner, you can use array \VAR{A} to refer to the block allocated by \FUNC{SHPALLOC}: \CONST{POINTER} (\VAR{addr}, \VAR{A}()) }