Skip to content

v1.10: fortran and misc fixes #2281

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 9 commits into from
May 8, 2017
Merged

v1.10: fortran and misc fixes #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8bcb3a2
fortran/use-mpi-ignore-trk: fix typo in MPI_File_read_ordered_begin i…
ggouaillardet Oct 23, 2016
1ba7519
fortran/use-mpi-ignore-tkr: fix typo in MPI_File_write_at_all_begin i…
ggouaillardet Oct 23, 2016
2b504a2
fortran: correctly defines MPI_DISPLACEMENT_CURRENT with KIND=MPI_OFF…
ggouaillardet Oct 24, 2016
1e0cf38
man: fix typos in MPI_Info_get_{nkeys,nthkey}
ggouaillardet Oct 24, 2016
2400dfd
fortran/use-mpi-tkr: update .gitignore
ggouaillardet Oct 28, 2016
9befd81
fortran/use-mpi-tkr: rename mpi-f90-cptr-interfaces.F90 into mpi-f90-…
ggouaillardet Oct 25, 2016
d6c07b8
fortran/use-mpi-tkr: only build MPI_File support if requested
ggouaillardet Oct 25, 2016
19763a0
fortran/use-mpi-trk: add PMPI_* interfaces in mpi module
ggouaillardet Oct 25, 2016
18c8d67
fortran/use-mpi-tkr: fix MPI_Sizeof handling
ggouaillardet Oct 26, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,9 @@ ompi/mpi/fortran/use-mpi-tkr/fortran_sizes.h
ompi/mpi/fortran/use-mpi-tkr/mpi_*.f90
ompi/mpi/fortran/use-mpi-tkr/mpi_kinds.ompi_module
ompi/mpi/fortran/use-mpi-tkr/mpi-f90-interfaces.h
ompi/mpi/fortran/use-mpi-tkr/mpi-tkr-sizeof.f90
ompi/mpi/fortran/use-mpi-tkr/mpi-tkr-sizeof.h

ompi/mpi/java/java/mpi
ompi/mpi/java/java/*.jar
ompi/mpi/java/java/*.h
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 @@ -85,6 +85,7 @@ sub write_file {
#----------------------------------------------------------------------------

my $handles;
my $lhandles;

$handles->{MPI_COMM_WORLD} = 0;
$handles->{MPI_COMM_SELF} = 1;
Expand Down Expand Up @@ -364,7 +365,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 @@ -387,6 +390,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 @@ -397,26 +402,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 @@ -444,6 +455,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 @@ -468,6 +481,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 @@ -878,27 +878,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 @@ -1343,7 +1343,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 @@ -1353,13 +1353,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 @@ -1369,7 +1369,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
22 changes: 15 additions & 7 deletions ompi/mpi/fortran/use-mpi-tkr/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2007 Los Alamos National Security, LLC. All rights
# reserved.
# Copyright (c) 2014-2015 Research Organization for Information Science
# reserved.
# Copyright (c) 2014-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
#
# Additional copyrights may follow
#
#
# $HEADER$
#

Expand Down Expand Up @@ -57,8 +57,12 @@ lib_LTLIBRARIES += libmpi_usempi.la

mpi.lo: mpi.F90
mpi.lo: mpi-f90-interfaces.h
mpi.lo: mpi-f90-file-interfaces.h
mpi.lo: $(top_builddir)/ompi/mpi/fortran/configure-fortran-output.h
mpi.lo: mpi-f90-cptr-interfaces.F90
mpi.lo: mpi-f90-cptr-interfaces.h
mpi.lo: pmpi-f90-interfaces.h
mpi.lo: pmpi-f90-file-interfaces.h
mpi.lo: pmpi-f90-cptr-interfaces.h

# Per MPI-3 p610:34-41, if we're building a TKR mpi module, we should
# not build any interfaces for MPI subroutines that take a choice
Expand Down Expand Up @@ -162,5 +166,9 @@ endif

EXTRA_DIST = \
mpi-f90-interfaces.h \
mpi-f90-cptr-interfaces.F90
mpi-f90-file-interfaces.h \
mpi-f90-cptr-interfaces.h \
pmpi-f90-interfaces.h \
pmpi-f90-file-interfaces.h \
pmpi-f90-cptr-interfaces.h

0 ...n/use-mpi-tkr/mpi-f90-cptr-interfaces.F90 → ...ran/use-mpi-tkr/mpi-f90-cptr-interfaces.h
View file
Open in desktop
File renamed without changes.
Loading