Skip to content

Commit

Permalink
Update "\Fortran{}" -> "\Fortran"
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicholas S. Park committed Mar 13, 2017
1 parent 17a52ee commit f96ea7f
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 36 deletions.
18 changes: 9 additions & 9 deletions content/backmatter.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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 <compiler options> -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}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.



Expand Down Expand Up @@ -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}.
Expand Down Expand Up @@ -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}.
Expand Down
4 changes: 2 additions & 2 deletions content/language_bindings_and_conformance.tex
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion content/library_constants.tex
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions content/memory_model.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion content/programming_model_overview.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion content/shmem_addr_accessible.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions content/shmem_broadcast.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -125,7 +125,7 @@
{}

\apifexample
{\Fortran{} example:}
{\Fortran example:}
{./example_code/shmem_broadcast_example.f90}
{}

Expand Down
10 changes: 5 additions & 5 deletions content/shmem_collect.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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}
{}

Expand Down
2 changes: 1 addition & 1 deletion content/shmem_iget.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
{}
Expand Down
2 changes: 1 addition & 1 deletion content/shmem_inc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion content/shmem_ptr.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
{}
Expand Down
14 changes: 7 additions & 7 deletions content/shmem_reductions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion content/shmem_wait.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
{}

Expand Down
2 changes: 1 addition & 1 deletion content/shpalloc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}())
}
Expand Down

0 comments on commit f96ea7f

Please sign in to comment.