Skip to content

v2.x: NEWS for fortran ABI changes #2392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 9, 2016
Merged

v2.x: NEWS for fortran ABI changes #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7229070
fortran/use-mpi-ignore-trk: fix typo in MPI_File_read_ordered_begin i…
ggouaillardet Oct 23, 2016
54713a8
fortran/use-mpi-ignore-tkr: fix typo in MPI_File_write_at_all_begin i…
ggouaillardet Oct 23, 2016
3e01b96
fortran: correctly defines MPI_DISPLACEMENT_CURRENT with KIND=MPI_OFF…
ggouaillardet Oct 24, 2016
f27d0db
man: fix typos in MPI_Info_get_{nkeys,nthkey}
ggouaillardet Oct 24, 2016
cc7e72b
NEWS: Add bullet about Fortran ABI changes
jsquyres Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ included in the vX.Y.Z section and be denoted as:
(** also appeared: A.B.C) -- indicating that this item was previously
included in release version vA.B.C.

2.0.2 -- TBD
-----------------------

- The following backwards-incompatible changes to the Fortran API were
made. They were made because Open MPI's Fortran bindings for these
were incorrect; any MPI applications using them were therefore also
erroneous, and not subject to backwards compatibility constraints.
- All Fortran bindings:
- The type of MPI_DISPLACEMENT_CURRENT was changed from INTEGER to
INTEGER(KIND=MPI_OFFSET_KIND)
- Fortran "use mpi" module:
- MPI_File_wr_at_all_begin -> MPI_File_write_at_all_begin
- MPI_File_read_ord_begin -> MPI_File_read_ordered_begin


2.0.1 -- 2 September 2016
-----------------------

Expand Down
85 changes: 0 additions & 85 deletions ompi/include/mpif-mpi-io.h
View file
Open in desktop

This file was deleted.

28 changes: 22 additions & 6 deletions ompi/include/mpif-values.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ sub write_file {
#----------------------------------------------------------------------------

my $handles;
my $lhandles;

$handles->{MPI_COMM_WORLD} = 0;
$handles->{MPI_COMM_SELF} = 1;
Expand Down Expand Up @@ -398,7 +399,9 @@ sub write_file {
$io_constants->{MPI_MODE_EXCL} = 64;
$io_constants->{MPI_MODE_APPEND} = 128;
$io_constants->{MPI_MODE_SEQUENTIAL} = 256;
$io_constants->{MPI_DISPLACEMENT_CURRENT} = -54278278;

my $lio_constants;
$lio_constants->{MPI_DISPLACEMENT_CURRENT} = -54278278;

#----------------------------------------------------------------------------

Expand All @@ -421,6 +424,8 @@ sub write_file {
! All rights reserved.
! Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
! Copyright (c) 2016 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! $COPYRIGHT$
!
! Additional copyrights may follow
Expand All @@ -431,26 +436,32 @@ sub write_file {
';

sub write_fortran_file {
my ($header, $vals, $file) = @_;
my ($header, $vals, $lvals, $file) = @_;

foreach my $key (sort(keys(%{$vals}))) {
$header .= " integer $key\n";
}
foreach my $key (sort(keys(%{$lvals}))) {
$header .= " integer(KIND=MPI_OFFSET_KIND) $key\n";
}
$header .= "\n";
foreach my $key (sort(keys(%{$vals}))) {
$header .= " parameter ($key=$vals->{$key})\n";
}
foreach my $key (sort(keys(%{$lvals}))) {
$header .= " parameter ($key=$lvals->{$key})\n";
}

write_file($file, $header);
}

write_fortran_file($header, $handles,
write_fortran_file($header, $handles, {},
"$topdir/ompi/include/mpif-handles.h");
write_fortran_file($header, $constants,
write_fortran_file($header, $constants, {},
"$topdir/ompi/include/mpif-constants.h");
write_fortran_file($header, $io_handles,
write_fortran_file($header, $io_handles, {},
"$topdir/ompi/include/mpif-io-handles.h");
write_fortran_file($header, $io_constants,
write_fortran_file($header, $io_constants, $lio_constants,
"$topdir/ompi/include/mpif-io-constants.h");

#----------------------------------------------------------------------------
Expand Down Expand Up @@ -478,6 +489,8 @@ sub write_fortran_file {
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2009-2012 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -502,6 +515,9 @@ sub write_fortran_file {
foreach my $key (sort(keys(%{$io_constants}))) {
$output .= "#define OMPI_$key $io_constants->{$key}\n";
}
foreach my $key (sort(keys(%{$lio_constants}))) {
$output .= "#define OMPI_$key $lio_constants->{$key}\n";
}
$output .= "\n";
foreach my $key (sort(keys(%{$io_handles}))) {
$output .= "#define OMPI_$key $io_handles->{$key}\n";
Expand Down
16 changes: 8 additions & 8 deletions ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,27 +1002,27 @@ end interface

interface MPI_File_read_ordered_begin

subroutine MPI_File_read_ord_begin(fh, buf, count, datatype, ierror)
subroutine MPI_File_read_ordered_begin(fh, buf, count, datatype, ierror)
integer, intent(in) :: fh
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ buf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: buf
integer, intent(in) :: count
integer, intent(in) :: datatype
integer, intent(out) :: ierror
end subroutine MPI_File_read_ord_begin
end subroutine MPI_File_read_ordered_begin

end interface

interface PMPI_File_read_ordered_begin

subroutine PMPI_File_read_ord_begin(fh, buf, count, datatype, ierror)
subroutine PMPI_File_read_ordered_begin(fh, buf, count, datatype, ierror)
integer, intent(in) :: fh
@OMPI_FORTRAN_IGNORE_TKR_PREDECL@ buf
@OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: buf
integer, intent(in) :: count
integer, intent(in) :: datatype
integer, intent(out) :: ierror
end subroutine PMPI_File_read_ord_begin
end subroutine PMPI_File_read_ordered_begin

end interface

Expand Down Expand Up @@ -1467,7 +1467,7 @@ end interface

interface MPI_File_write_at_all_begin

subroutine MPI_File_wr_at_all_begin(fh, offset, buf, count, datatype&
subroutine MPI_File_write_at_all_begin(fh, offset, buf, count, datatype&
, ierror)
include 'mpif-config.h'
integer, intent(in) :: fh
Expand All @@ -1477,13 +1477,13 @@ subroutine MPI_File_wr_at_all_begin(fh, offset, buf, count, datatype&
integer, intent(in) :: count
integer, intent(in) :: datatype
integer, intent(out) :: ierror
end subroutine MPI_File_wr_at_all_begin
end subroutine MPI_File_write_at_all_begin

end interface

interface PMPI_File_write_at_all_begin

subroutine PMPI_File_wr_at_all_begin(fh, offset, buf, count, datatype&
subroutine PMPI_File_write_at_all_begin(fh, offset, buf, count, datatype&
, ierror)
include 'mpif-config.h'
integer, intent(in) :: fh
Expand All @@ -1493,7 +1493,7 @@ subroutine PMPI_File_wr_at_all_begin(fh, offset, buf, count, datatype&
integer, intent(in) :: count
integer, intent(in) :: datatype
integer, intent(out) :: ierror
end subroutine PMPI_File_wr_at_all_begin
end subroutine PMPI_File_write_at_all_begin

end interface

Expand Down
2 changes: 1 addition & 1 deletion ompi/mpi/man/man3/MPI_Info_get_nkeys.3in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ MPI_Info_get
.br
MPI_Info_get_nthkey
.br
MPI_Info_get_valueln
MPI_Info_get_valuelen
.br

2 changes: 1 addition & 1 deletion ompi/mpi/man/man3/MPI_Info_get_nthkey.3in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ MPI_Info_get
.br
MPI_Info_get_nkeys
.br
MPI_Info_get_valueln
MPI_Info_get_valuelen
.br