Skip to content

Commit 2e0d2e1

Browse files
committed
Merge pull request #70 from zbeekman/fix-whitespace-1.x
Fix sloppy EOL & EOF whitespace on 1.x branch
2 parents ee1aff2 + 9495918 commit 2e0d2e1

File tree

89 files changed

+1067
-1080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1067
-1080
lines changed

CAF_ABI.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[This document is formatted with GitHub-Flavored Markdown. ]:#
2-
[For better viewing, including hyperlinks, read it online at ]:#
1+
[This document is formatted with GitHub-Flavored Markdown. ]:#
2+
[For better viewing, including hyperlinks, read it online at ]:#
33
[https://github.com/sourceryinstitute/opencoarrays/blob/master/CAF_API.md]:#
44

55
# OpenCoarrays Application Binary Interface (ABI) #
@@ -9,13 +9,13 @@
99
* [Definitions and types]
1010
* [Provided functions]
1111

12-
This document describes the OpenCoarrays application binary interface (ABI) through
13-
which a compiler accesses coarray functionality. As such, the target audience for
12+
This document describes the OpenCoarrays application binary interface (ABI) through
13+
which a compiler accesses coarray functionality. As such, the target audience for
1414
this document is compiler developers. Most application developers need only write
1515
standard-conforming Fortran 2008 or 2015 and compile their code with the OpenCoarrays
16-
'caf' compiler wrapper without knowledge of the ABI.
16+
'caf' compiler wrapper without knowledge of the ABI.
1717

18-
The actual function names in this document have a PREFIX in the source code to avoid
18+
The actual function names in this document have a PREFIX in the source code to avoid
1919
name clashes. The prefix can be vendor-specific.
2020

2121
## <a name="to-do">To Do</a> ##

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
2828
set(gfortran_compiler true)
2929
# add_definitions(-DPREFIX_NAME=_gfortran_caf_)
3030
else()
31-
message(WARNING
31+
message(WARNING
3232
"\n"
3333
"Attempting to build with untested Fortran compiler: ${CMAKE_Fortran_COMPILER_ID}. "
3434
"Please report any failures to [email protected]\n\n"
3535
)
3636
endif()
3737

38-
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
38+
if (CMAKE_VERSION VERSION_GREATER 3.2.3)
3939
# Detect Fortran compiler version directly
4040
if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
4141
set(opencoarrays_aware_compiler true)
@@ -70,7 +70,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
7070
add_subdirectory(src)
7171
add_subdirectory(install_prerequisites)
7272

73-
install(EXPORT OpenCoarraysTargets
73+
install(EXPORT OpenCoarraysTargets
7474
NAMESPACE
7575
OpenCoarrays::
7676
DESTINATION
@@ -126,8 +126,8 @@ if(opencoarrays_aware_compiler)
126126
add_mpi_test(co_min 4 ${tests_root}/unit/collectives/co_min_test)
127127
add_mpi_test(co_max 4 ${tests_root}/unit/collectives/co_max_test)
128128
add_mpi_test(syncall 32 ${tests_root}/unit/sync/syncall)
129-
add_mpi_test(syncimages 32 ${tests_root}/unit/sync/syncimages)
130-
add_mpi_test(co_reduce 4 ${tests_root}/unit/collectives/co_reduce_test)
129+
add_mpi_test(syncimages 32 ${tests_root}/unit/sync/syncimages)
130+
add_mpi_test(co_reduce 4 ${tests_root}/unit/collectives/co_reduce_test)
131131
# add_mpi_test(syncimages_status 32 ${tests_root}/unit/sync/syncimages_status)
132132

133133
# Integration tests verifying the use of libcaf_mpi in applications

CheckFortranSourceCompiles.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
#
3939
# * Redistributions of source code must retain the above copyright
4040
# notice, this list of conditions and the following disclaimer.
41-
#
41+
#
4242
# * Redistributions in binary form must reproduce the above copyright
4343
# notice, this list of conditions and the following disclaimer in the
4444
# documentation and/or other materials provided with the distribution.
45-
#
45+
#
4646
# * Neither the names of Kitware, Inc., the Insight Software Consortium,
4747
# nor the names of their contributors may be used to endorse or promote
4848
# products derived from this software without specific prior written

GETTING_STARTED.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[This document is formatted with GitHub-Flavored Markdown. ]:#
2-
[For better viewing, including hyperlinks, read it online at ]:#
1+
[This document is formatted with GitHub-Flavored Markdown. ]:#
2+
[For better viewing, including hyperlinks, read it online at ]:#
33
[https://github.com/sourceryinstitute/opencoarrays/blob/master/GETTING_STARTED.md]:#
44

55
# [Getting Started](#getting-started) #
@@ -10,56 +10,56 @@
1010

1111
<a name="the-caf-compiler-wrapper">
1212
## The caf compiler wrapper ##
13-
</a>
13+
</a>
1414

15-
The preferred method for compiling a CAF program is by invoking the "caf" bash script
15+
The preferred method for compiling a CAF program is by invoking the "caf" bash script
1616
that the OpenCoarrays CMake scripts install in the "bin" subdirectory of the installation
17-
path. This is an experimental script with limited but useful capabilities that will
17+
path. This is an experimental script with limited but useful capabilities that will
1818
grow over time. Please submit bug reports and feature requests via our [Issues] page.
1919

2020
The "caf" script liberates the source code and workflow from explicit dependence on the
21-
underlying compiler and communication library in the following ways:
21+
underlying compiler and communication library in the following ways:
2222

2323
1. With an OpenCoarrays-aware (OCA) CAF compiler, the "caf" script passes the unmodified
24-
source code to the underlying compiler with the necessary arguments for building a
25-
CAF program, embedding the paths to OpenCoarrays libraries (e.g., libcaf_mpi.a) installed
26-
in the "lib" subdirectory of the OpenCoarrays installation path. The "caf" script also
24+
source code to the underlying compiler with the necessary arguments for building a
25+
CAF program, embedding the paths to OpenCoarrays libraries (e.g., libcaf_mpi.a) installed
26+
in the "lib" subdirectory of the OpenCoarrays installation path. The "caf" script also
2727
embeds the path to the relevant module file in the "mod" subdirectory of the installation
2828
path (e.g., opencoarrays.mod). This supports use association with module entities via
2929
``use opencoarrays``.
30-
2. With a non-CAF compiler (including gfortran 4.9), "caf" supports a subset of CAF by
30+
2. With a non-CAF compiler (including gfortran 4.9), "caf" supports a subset of CAF by
3131
replacing CAF statements with calls to procedures in the [opencoarrays module] before
32-
passing the source code to the compiler.
32+
passing the source code to the compiler.
3333

3434
When using GCC 4.9, we recommend using the `use` statement's "only" clause to
35-
avoid inadvertent procedure name clashes between OpenCoarrays procedures and their
35+
avoid inadvertent procedure name clashes between OpenCoarrays procedures and their
3636
GCC counerparts. For example, use "use opencoarrays, only : co_reduce".
3737

3838
With a non-OCA and OCA CAF compilers, the extensions that "caf" imports include the collective
3939
subroutines proposed for Fortran 2015 in the draft Technical Specification [TS 18508]
4040
_Additional Parallel Features in Fortran_.
4141

42-
The latter use case provides an opportunity to mix a compiler's CAF support with that of OpenCoarrays.
43-
For example, a non-OCA CAF compiler, such as the Cray or Intel compilers, might support all of a
44-
program's coarray square-bracket syntax, while OpenCoarrays supports the same program's calls to
42+
The latter use case provides an opportunity to mix a compiler's CAF support with that of OpenCoarrays.
43+
For example, a non-OCA CAF compiler, such as the Cray or Intel compilers, might support all of a
44+
program's coarray square-bracket syntax, while OpenCoarrays supports the same program's calls to
4545
collective subroutine such as `co_sum` and `co_reduce`.
4646

4747
<a name="a-sample-basic-workflow">
4848
## A sample basic workflow ##
4949
</a>
5050

51-
The following program listing, compilation, and execution workflow exemplify
52-
the use of an OCA compiler (e.g., gfortran 5.1.0 or later) in a Linux bash shell
53-
with the "bin" directory of the chosen installation path in the user's PATH
51+
The following program listing, compilation, and execution workflow exemplify
52+
the use of an OCA compiler (e.g., gfortran 5.1.0 or later) in a Linux bash shell
53+
with the "bin" directory of the chosen installation path in the user's PATH
5454
environment variable:
5555

56-
$ cat tally.f90
56+
$ cat tally.f90
5757
program main
5858
use iso_c_binding, only : c_int
5959
use iso_fortran_env, only : error_unit
6060
implicit none
6161
integer(c_int) :: tally
62-
tally = this_image() ! this image's contribution
62+
tally = this_image() ! this image's contribution
6363
call co_sum(tally)
6464
verify: block
6565
integer(c_int) :: image
@@ -69,7 +69,7 @@ environment variable:
6969
end if
7070
end block verify
7171
! Wait for all images to pass the test
72-
sync all
72+
sync all
7373
if (this_image()==1) print *,"Test passed"
7474
end program
7575
$ caf tally.f90 -o tally
@@ -82,7 +82,7 @@ where "4" is the number of images to be launched at program start-up.
8282
## An advanced workflow </a> ##
8383

8484
To extend the capabilities of a non-OCA CAF compiler (e.g., the Intel or Cray compilers),
85-
access the types and procedures of the [opencoarrays module] by use assocication. We
85+
access the types and procedures of the [opencoarrays module] by use assocication. We
8686
recommend using a `use` statement with an `only` clause to reduce the likelihood of a
8787
name clash with the compiler's native CAf support. For eample, innsert the following
8888
at line 2 of `tally.f90` above:

0 commit comments

Comments
 (0)