diff --git a/oshmem/include/Makefile.am b/oshmem/include/Makefile.am index 161b19196a..5da9f601ed 100644 --- a/oshmem/include/Makefile.am +++ b/oshmem/include/Makefile.am @@ -7,11 +7,7 @@ # $HEADER$ # -# mpif-common.h is not generated, but mpif.h and mpif-config.h are. -# See big comments in these files for an explanation. -# note - headers and nodist_headers will go in ${includedir}/openmpi, -# not ${includedir}/ headers = nodist_headers = \ oshmem_config.h diff --git a/oshmem/include/mpif-common.h b/oshmem/include/mpif-common.h deleted file mode 100644 index 2a9fe8cab0..0000000000 --- a/oshmem/include/mpif-common.h +++ /dev/null @@ -1,457 +0,0 @@ -! -! Copyright (c) 2013 Mellanox Technologies, Inc. -! All rights reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! -! Do ***not*** copy this file to the directory where your Fortran -! fortran application is compiled unless it is absolutely necessary! Most -! modern Fortran compilers now support the -I command line flag, which -! tells the compiler where to find .h files (specifically, this one). For -! example: -! -! shell$ mpif77 foo.f -o foo -I$OMPI_HOME/include -! -! will probably do the trick (assuming that you have set OMPI_HOME -! properly). -! -! That being said, OMPI's "mpif77" wrapper compiler should -! automatically include the -I option for you. The following command -! should be equivalent to the command listed above: -! -! shell$ mpif77 foo.f -o foo -! -! You should not copy this file to your local directory because it is -! possible that this file will be changed between versions of Open MPI. -! Indeed, this mpif.h is incompatible with the mpif.f of other -! implementations of MPI. Using this mpif.h with other implementations -! of MPI, or with other versions of Open MPI will result in undefined -! behavior (to include incorrect results, segmentation faults, -! unexplainable "hanging" in your application, etc.). Always use the -! -I command line option instead (or let mpif77 do it for you). -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! -! This file contains the bulk of the Open MPI Fortran interface. It -! is included as a back-end file to both mpif.h (i.e., the -! standardized MPI Fortran header file) and mpi.f90 (the MPI-2 -! Fortran module source file, found in ompi/mpi/f90). -! -! This file is marginally different than mpif.h. mpif.h includes -! some "external" statements that are not suitable for use with the -! MPI-2 F90 module, and therefore cannot be included in the mpi.f90 -! source file. Hence, this file is essentially everything that -! needs to be in the standardized mpif.h *except* the "external" -! statements, and is therefore suitable to be included in mpi.f90. -! - -! First, however, include some output from configure. -! - include 'mpif-config.h' - -! -! MPI version -! - integer MPI_VERSION, MPI_SUBVERSION - - parameter (MPI_VERSION=2) - parameter (MPI_SUBVERSION=1) -! -! Miscellaneous constants -! - integer MPI_ANY_SOURCE, MPI_ANY_TAG - integer MPI_PROC_NULL - integer MPI_ROOT - integer MPI_UNDEFINED - integer MPI_CART, MPI_GRAPH, MPI_KEYVAL_INVALID - integer MPI_SOURCE, MPI_TAG, MPI_ERROR - integer MPI_TAG_UB, MPI_HOST, MPI_IO, MPI_WTIME_IS_GLOBAL - integer MPI_APPNUM, MPI_LASTUSEDCODE, MPI_UNIVERSE_SIZE - integer IMPI_CLIENT_SIZE, IMPI_CLIENT_COLOR - integer IMPI_HOST_SIZE, IMPI_HOST_COLOR - integer MPI_BSEND_OVERHEAD - integer MPI_ORDER_C, MPI_ORDER_FORTRAN - integer MPI_DISTRIBUTE_BLOCK, MPI_DISTRIBUTE_CYCLIC - integer MPI_DISTRIBUTE_NONE, MPI_DISTRIBUTE_DFLT_DARG - integer MPI_TYPECLASS_INTEGER, MPI_TYPECLASS_REAL - integer MPI_TYPECLASS_COMPLEX - integer MPI_MODE_NOCHECK, MPI_MODE_NOPRECEDE, MPI_MODE_NOPUT - integer MPI_MODE_NOSTORE, MPI_MODE_NOSUCCEED - integer MPI_LOCK_EXCLUSIVE, MPI_LOCK_SHARED - integer MPI_WIN_BASE, MPI_WIN_SIZE, MPI_WIN_DISP_UNIT - - parameter (MPI_ANY_SOURCE=-1) - parameter (MPI_ANY_TAG=-1) - parameter (MPI_PROC_NULL=-2) - parameter (MPI_ROOT=-4) - parameter (MPI_UNDEFINED=-32766) - parameter (MPI_CART=1) - parameter (MPI_GRAPH=2) - parameter (MPI_KEYVAL_INVALID=-1) - parameter (MPI_SOURCE=1) - parameter (MPI_TAG=2) - parameter (MPI_ERROR=3) - parameter (MPI_TAG_UB=0) - parameter (MPI_HOST=1) - parameter (MPI_IO=2) - parameter (MPI_WTIME_IS_GLOBAL=3) - parameter (MPI_APPNUM=4) - parameter (MPI_LASTUSEDCODE=5) - parameter (MPI_UNIVERSE_SIZE=6) - parameter (MPI_WIN_BASE=7) - parameter (MPI_WIN_SIZE=8) - parameter (MPI_WIN_DISP_UNIT=9) - parameter (IMPI_CLIENT_SIZE=10) - parameter (IMPI_CLIENT_COLOR=11) - parameter (IMPI_HOST_SIZE=12) - parameter (IMPI_HOST_COLOR=13) - - parameter (MPI_BSEND_OVERHEAD=128) - parameter (MPI_ORDER_C=0) - parameter (MPI_ORDER_FORTRAN=1) - parameter (MPI_DISTRIBUTE_BLOCK=0) - parameter (MPI_DISTRIBUTE_CYCLIC=1) - parameter (MPI_DISTRIBUTE_NONE=2) - parameter (MPI_DISTRIBUTE_DFLT_DARG=-1) - parameter (MPI_TYPECLASS_INTEGER=1) - parameter (MPI_TYPECLASS_REAL=2) - parameter (MPI_TYPECLASS_COMPLEX=3) - parameter (MPI_MODE_NOCHECK=1) - parameter (MPI_MODE_NOPRECEDE=2) - parameter (MPI_MODE_NOPUT=4) - parameter (MPI_MODE_NOSTORE=8) - parameter (MPI_MODE_NOSUCCEED=16) - parameter (MPI_LOCK_EXCLUSIVE=1) - parameter (MPI_LOCK_SHARED=2) - -! -! MPI sentinel values -! -! Several of these types were chosen with care to match specific -! overloaded functions in the F90 bindings. They should also match -! the types of their corresponding C variables. Do not arbitrarily -! change their types without also updating the F90 bindings and -! their corresponding types in ompi/mpi/f77/constants.h and -! ompi/mpi/runtime/ompi_init.c! -! -! MPI_BOTTOM is only used where choice buffers can be used (meaning -! that we already have overloaded F90 bindings for all available -! types), so any type is fine. - integer MPI_BOTTOM -! MPI_IN_PLACE has the same rationale as MPI_BOTTOM. - integer MPI_IN_PLACE -! Making MPI_ARGV_NULL be the same type as the parameter that is -! exepected in the F90 binding for MPI_COMM_SPAWN means that we -! don't need another binding for MPI_COMM_SPAWN. - character MPI_ARGV_NULL(1) -! The array_of_argv parameter in the F90 bindings for -! MPI_COMM_SPAWN_MULTIPLE takes a variable number of dimensions -! (specified by the "count" parameter), so it's not possible to have -! a single variable match all possible values. Hence, make it an -! entirely different type (one that would never likely be used by a -! correct program, e.g., double) and have a separate F90 binding for -! matching just this type. - double precision MPI_ARGVS_NULL -! MPI_ERRCODES_IGNORE has similar rationale to MPI_ARGV_NULL. The -! F77 functions are all smart enough to check that the errcodes -! parameter is not ERRCODES_IGNORE before assigning values into it -! (hence, the fact that this is an array of only 1 element does not -! matter -- we'll never overrun it because we never assign values -! into it). - integer MPI_ERRCODES_IGNORE(1) -! MPI_STATUS_IGNORE has similar rationale to MPI_ERRCODES_IGNORE. - integer MPI_STATUS_IGNORE(MPI_STATUS_SIZE) -! MPI_STATUSES_IGNORE has similar rationale to MPI_ARGVS_NULL. - double precision MPI_STATUSES_IGNORE - - common/mpi_fortran_bottom/MPI_BOTTOM - common/mpi_fortran_in_place/MPI_IN_PLACE - common/mpi_fortran_argv_null/MPI_ARGV_NULL - common/mpi_fortran_argvs_null/MPI_ARGVS_NULL - common/mpi_fortran_errcodes_ignore/MPI_ERRCODES_IGNORE - common/mpi_fortran_status_ignore/MPI_STATUS_IGNORE - common/mpi_fortran_statuses_ignore/MPI_STATUSES_IGNORE -! -! NULL "handles" (indices) -! - integer MPI_GROUP_NULL, MPI_COMM_NULL, MPI_DATATYPE_NULL - integer MPI_REQUEST_NULL, MPI_OP_NULL, MPI_ERRHANDLER_NULL - integer MPI_INFO_NULL, MPI_WIN_NULL - - parameter (MPI_GROUP_NULL=0) - parameter (MPI_COMM_NULL=2) - parameter (MPI_DATATYPE_NULL=0) - parameter (MPI_REQUEST_NULL=0) - parameter (MPI_OP_NULL=0) - parameter (MPI_ERRHANDLER_NULL=0) - parameter (MPI_INFO_NULL=0) - parameter (MPI_WIN_NULL=0) -! -! MPI_Init_thread constants -! - integer MPI_THREAD_SINGLE, MPI_THREAD_FUNNELED - integer MPI_THREAD_SERIALIZED, MPI_THREAD_MULTIPLE - - parameter (MPI_THREAD_SINGLE=0) - parameter (MPI_THREAD_FUNNELED=1) - parameter (MPI_THREAD_SERIALIZED=2) - parameter (MPI_THREAD_MULTIPLE=3) -! -! error classes -! - integer SHMEM_SUCCESS - integer SHMEM_ERR_BUFFER - integer SHMEM_ERR_COUNT - integer SHMEM_ERR_TYPE - integer SHMEM_ERR_TAG - integer SHMEM_ERR_COMM - integer SHMEM_ERR_RANK - integer SHMEM_ERR_REQUEST - integer SHMEM_ERR_ROOT - integer SHMEM_ERR_GROUP - integer SHMEM_ERR_OP - integer SHMEM_ERR_TOPOLOGY - integer SHMEM_ERR_DIMS - integer SHMEM_ERR_ARG - integer SHMEM_ERR_UNKNOWN - integer SHMEM_ERR_TRUNCATE - integer SHMEM_ERR_OTHER - integer SHMEM_ERR_INTERN - integer SHMEM_ERR_IN_STATUS - integer SHMEM_ERR_PENDING - integer SHMEM_ERR_ACCESS - integer SHMEM_ERR_AMODE - integer SHMEM_ERR_ASSERT - integer SHMEM_ERR_BAD_FILE - integer SHMEM_ERR_BASE - integer SHMEM_ERR_CONVERSION - integer SHMEM_ERR_DISP - integer SHMEM_ERR_DUP_DATAREP - integer SHMEM_ERR_FILE_EXISTS - integer SHMEM_ERR_FILE_IN_USE - integer SHMEM_ERR_FILE - integer SHMEM_ERR_INFO_KEY - integer SHMEM_ERR_INFO_NOKEY - integer SHMEM_ERR_INFO_VALUE - integer SHMEM_ERR_INFO - integer SHMEM_ERR_IO - integer SHMEM_ERR_KEYVAL - integer SHMEM_ERR_LOCKTYPE - integer SHMEM_ERR_NAME - integer SHMEM_ERR_NO_MEM - integer SHMEM_ERR_NOT_SAME - integer SHMEM_ERR_NO_SPACE - integer SHMEM_ERR_NO_SUCH_FILE - integer SHMEM_ERR_PORT - integer SHMEM_ERR_QUOTA - integer SHMEM_ERR_READ_ONLY - integer SHMEM_ERR_RMA_CONFLICT - integer SHMEM_ERR_RMA_SYNC - integer SHMEM_ERR_SERVICE - integer SHMEM_ERR_SIZE - integer SHMEM_ERR_SPAWN - integer SHMEM_ERR_UNSUPPORTED_DATAREP - integer SHMEM_ERR_UNSUPPORTED_OPERATION - integer SHMEM_ERR_WIN - - integer SHMEM_ERR_SYSRESOURCE - integer SHMEM_ERR_LASTCODE - - parameter( SHMEM_SUCCESS = 0) - parameter( SHMEM_ERR_BUFFER = 1) - parameter( SHMEM_ERR_COUNT = 2) - parameter( SHMEM_ERR_TYPE = 3) - parameter( SHMEM_ERR_TAG = 4) - parameter( SHMEM_ERR_COMM = 5) - parameter( SHMEM_ERR_RANK = 6) - parameter( SHMEM_ERR_REQUEST = 7) - parameter( SHMEM_ERR_ROOT = 8) - parameter( SHMEM_ERR_GROUP = 9) - parameter( SHMEM_ERR_OP = 10) - parameter( SHMEM_ERR_TOPOLOGY = 11) - parameter( SHMEM_ERR_DIMS = 12) - parameter( SHMEM_ERR_ARG = 13) - parameter( SHMEM_ERR_UNKNOWN = 14) - parameter( SHMEM_ERR_TRUNCATE = 15) - parameter( SHMEM_ERR_OTHER = 16) - parameter( SHMEM_ERR_INTERN = 17) - parameter( SHMEM_ERR_IN_STATUS = 18) - parameter( SHMEM_ERR_PENDING = 19) - parameter( SHMEM_ERR_ACCESS = 20) - parameter( SHMEM_ERR_AMODE = 21) - parameter( SHMEM_ERR_ASSERT = 22) - parameter( SHMEM_ERR_BAD_FILE = 23) - parameter( SHMEM_ERR_BASE = 24) - parameter( SHMEM_ERR_CONVERSION = 25) - parameter( SHMEM_ERR_DISP = 26) - parameter( SHMEM_ERR_DUP_DATAREP = 27) - parameter( SHMEM_ERR_FILE_EXISTS = 28) - parameter( SHMEM_ERR_FILE_IN_USE = 29) - parameter( SHMEM_ERR_FILE = 30) - parameter( SHMEM_ERR_INFO_KEY = 31) - parameter( SHMEM_ERR_INFO_NOKEY = 32) - parameter( SHMEM_ERR_INFO_VALUE = 33) - parameter( SHMEM_ERR_INFO = 34) - parameter( SHMEM_ERR_IO = 35) - parameter( SHMEM_ERR_KEYVAL = 36) - parameter( SHMEM_ERR_LOCKTYPE = 37) - parameter( SHMEM_ERR_NAME = 38) - parameter( SHMEM_ERR_NO_MEM = 39) - parameter( SHMEM_ERR_NOT_SAME = 40) - parameter( SHMEM_ERR_NO_SPACE = 41) - parameter( SHMEM_ERR_NO_SUCH_FILE = 42) - parameter( SHMEM_ERR_PORT = 43) - parameter( SHMEM_ERR_QUOTA = 44) - parameter( SHMEM_ERR_READ_ONLY = 45) - parameter( SHMEM_ERR_RMA_CONFLICT = 46) - parameter( SHMEM_ERR_RMA_SYNC = 47) - parameter( SHMEM_ERR_SERVICE = 48) - parameter( SHMEM_ERR_SIZE = 49) - parameter( SHMEM_ERR_SPAWN = 50) - parameter( SHMEM_ERR_UNSUPPORTED_DATAREP = 51) - parameter( SHMEM_ERR_UNSUPPORTED_OPERATION= 52) - parameter( SHMEM_ERR_WIN = 53) - - parameter( SHMEM_ERR_SYSRESOURCE = -2) - parameter( SHMEM_ERR_LASTCODE = 54) - -! -! comparison results -! - integer MPI_IDENT, MPI_CONGRUENT, MPI_SIMILAR, MPI_UNEQUAL - - parameter (MPI_IDENT=0) - parameter (MPI_CONGRUENT=1) - parameter (MPI_SIMILAR=2) - parameter (MPI_UNEQUAL=3) -! -! datatype combiners -! - integer MPI_COMBINER_NAMED - integer MPI_COMBINER_DUP - integer MPI_COMBINER_CONTIGUOUS - integer MPI_COMBINER_VECTOR - integer MPI_COMBINER_HVECTOR_INTEGER - integer MPI_COMBINER_HVECTOR - integer MPI_COMBINER_INDEXED - integer MPI_COMBINER_HINDEXED_INTEGER - integer MPI_COMBINER_HINDEXED - integer MPI_COMBINER_INDEXED_BLOCK - integer MPI_COMBINER_STRUCT_INTEGER - integer MPI_COMBINER_STRUCT - integer MPI_COMBINER_SUBARRAY - integer MPI_COMBINER_DARRAY - integer MPI_COMBINER_F90_REAL - integer MPI_COMBINER_F90_COMPLEX - integer MPI_COMBINER_F90_INTEGER - integer MPI_COMBINER_RESIZED - - parameter (MPI_COMBINER_NAMED=0) - parameter (MPI_COMBINER_DUP=1) - parameter (MPI_COMBINER_CONTIGUOUS=2) - parameter (MPI_COMBINER_VECTOR=3) - parameter (MPI_COMBINER_HVECTOR_INTEGER=4) - parameter (MPI_COMBINER_HVECTOR=5) - parameter (MPI_COMBINER_INDEXED=6) - parameter (MPI_COMBINER_HINDEXED_INTEGER=7) - parameter (MPI_COMBINER_HINDEXED=8) - parameter (MPI_COMBINER_INDEXED_BLOCK=9) - parameter (MPI_COMBINER_STRUCT_INTEGER=10) - parameter (MPI_COMBINER_STRUCT=11) - parameter (MPI_COMBINER_SUBARRAY=12) - parameter (MPI_COMBINER_DARRAY=13) - parameter (MPI_COMBINER_F90_REAL=14) - parameter (MPI_COMBINER_F90_COMPLEX=15) - parameter (MPI_COMBINER_F90_INTEGER=16) - parameter (MPI_COMBINER_RESIZED=17) -! -! lookup table indices -! - integer MPI_COMM_WORLD, MPI_COMM_SELF - integer MPI_GROUP_EMPTY - integer MPI_ERRORS_ARE_FATAL, MPI_ERRORS_RETURN - - parameter (MPI_COMM_WORLD=0) - parameter (MPI_COMM_SELF=1) - parameter (MPI_GROUP_EMPTY=1) - parameter (MPI_ERRORS_ARE_FATAL=1) - parameter (MPI_ERRORS_RETURN=2) - - integer MPI_BYTE, MPI_PACKED, MPI_UB, MPI_LB - integer MPI_CHARACTER, MPI_LOGICAL - integer MPI_INTEGER, MPI_INTEGER1, MPI_INTEGER2, MPI_INTEGER4 - integer MPI_INTEGER8, MPI_INTEGER16 - integer MPI_REAL, MPI_REAL2, MPI_REAL4, MPI_REAL8, MPI_REAL16 - integer MPI_DOUBLE_PRECISION - integer MPI_COMPLEX, MPI_COMPLEX8, MPI_COMPLEX16, MPI_COMPLEX32 - integer MPI_DOUBLE_COMPLEX - integer MPI_2REAL, MPI_2DOUBLE_PRECISION, MPI_2INTEGER - integer MPI_2COMPLEX, MPI_2DOUBLE_COMPLEX -! Note that MPI_LOGICALx are not defined by the MPI spec, but there are -! other MPI implementations that have them, so it's good for us to have -! as well. - integer MPI_LOGICAL1, MPI_LOGICAL2, MPI_LOGICAL4, MPI_LOGICAL8 - -! -! Do NOT change the order of these parameters -! - parameter (MPI_BYTE=1) - parameter (MPI_PACKED=2) - parameter (MPI_UB=3) - parameter (MPI_LB=4) - parameter (MPI_CHARACTER=5) - parameter (MPI_LOGICAL=6) - parameter (MPI_INTEGER=7) - parameter (MPI_INTEGER1=8) - parameter (MPI_INTEGER2=9) - parameter (MPI_INTEGER4=10) - parameter (MPI_INTEGER8=11) - parameter (MPI_INTEGER16=12) - parameter (MPI_REAL=13) - parameter (MPI_REAL4=14) - parameter (MPI_REAL8=15) - parameter (MPI_REAL16=16) - parameter (MPI_DOUBLE_PRECISION=17) - parameter (MPI_COMPLEX=18) - parameter (MPI_COMPLEX8=19) - parameter (MPI_COMPLEX16=20) - parameter (MPI_COMPLEX32=21) - parameter (MPI_DOUBLE_COMPLEX=22) - parameter (MPI_2REAL=23) - parameter (MPI_2DOUBLE_PRECISION=24) - parameter (MPI_2INTEGER=25) - parameter (MPI_2COMPLEX=26) - parameter (MPI_2DOUBLE_COMPLEX=27) - parameter (MPI_REAL2=28) - parameter (MPI_LOGICAL1=29) - parameter (MPI_LOGICAL2=30) - parameter (MPI_LOGICAL4=31) - parameter (MPI_LOGICAL8=32) - - integer MPI_MAX, MPI_MIN, MPI_SUM, MPI_PROD, MPI_LAND - integer MPI_BAND, MPI_LOR, MPI_BOR, MPI_LXOR, MPI_BXOR - integer MPI_MAXLOC, MPI_MINLOC, MPI_REPLACE - - parameter (MPI_MAX=1) - parameter (MPI_MIN=2) - parameter (MPI_SUM=3) - parameter (MPI_PROD=4) - parameter (MPI_LAND=5) - parameter (MPI_BAND=6) - parameter (MPI_LOR=7) - parameter (MPI_BOR=8) - parameter (MPI_LXOR=9) - parameter (MPI_BXOR=10) - parameter (MPI_MAXLOC=11) - parameter (MPI_MINLOC=12) - parameter (MPI_REPLACE=13) diff --git a/oshmem/include/mpif-config.h.in b/oshmem/include/mpif-config.h.in deleted file mode 100644 index 3971d0ebfc..0000000000 --- a/oshmem/include/mpif-config.h.in +++ /dev/null @@ -1,99 +0,0 @@ -! -*- fortran -*- -! -! Copyright (c) 2013 Mellanox Technologies, Inc. -! All rights reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! -! Do ***not*** copy this file to the directory where your Fortran -! fortran application is compiled unless it is absolutely necessary! Most -! modern Fortran compilers now support the -I command line flag, which -! tells the compiler where to find .h files (specifically, this one). For -! example: -! -! shell$ mpif77 foo.f -o foo -I$OMPI_HOME/include -! -! will probably do the trick (assuming that you have set OMPI_HOME -! properly). -! -! That being said, OMPI's "mpif77" wrapper compiler should -! automatically include the -I option for you. The following command -! should be equivalent to the command listed above: -! -! shell$ mpif77 foo.f -o foo -! -! You should not copy this file to your local directory because it is -! possible that this file will be changed between versions of Open MPI. -! Indeed, this mpif.h is incompatible with the mpif.f of other -! implementations of MPI. Using this mpif.h with other implementations -! of MPI, or with other versions of Open MPI will result in undefined -! behavior (to include incorrect results, segmentation faults, -! unexplainable "hanging" in your application, etc.). Always use the -! -I command line option instead (or let mpif77 do it for you). -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! -! This file is included as a back-end file to both mpif.h (i.e., the -! standardized MPI Fortran header file) and a bunch of the MPI -! Fortran 90 subroutine implementations found in ompi/mpi/f90. -! -! This file contains the output from configure that is relevant for -! Fortran applications (both 77 and 90) and a few values that are -! necessary to compile the F90 module (e.g., MPI_STATUS_SIZE). -! - -! Include the MPI I/O stuff, if needed - @OMPI_MPIF_MPI_IO_INCLUDE@ - -! -! OMPI version -! This file is generated from configure; do not edit it manually. -! - integer OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION - integer OMPI_RELEASE_VERSION - character*32 OMPI_GREEK_VERSION - character*32 OMPI_SVN_VERSION - parameter (OMPI_MAJOR_VERSION=@OMPI_MAJOR_VERSION@) - parameter (OMPI_MINOR_VERSION=@OMPI_MINOR_VERSION@) - parameter (OMPI_RELEASE_VERSION=@OMPI_RELEASE_VERSION@) - parameter (OMPI_GREEK_VERSION="@OMPI_GREEK_VERSION@") - parameter (OMPI_SVN_VERSION="@OMPI_SVN_R@") -! -! Kind parameters -! - integer MPI_OFFSET_KIND, MPI_ADDRESS_KIND, MPI_INTEGER_KIND - parameter (MPI_INTEGER_KIND=@OMPI_MPI_INTEGER_KIND@) - parameter (MPI_ADDRESS_KIND=@OMPI_MPI_ADDRESS_KIND@) - parameter (MPI_OFFSET_KIND=@OMPI_MPI_OFFSET_KIND@) -! -! Miscellaneous constants -! - integer MPI_STATUS_SIZE - parameter (MPI_STATUS_SIZE=5) -! -! Configurable length constants -! - integer MPI_MAX_PROCESSOR_NAME - integer MPI_MAX_ERROR_STRING - integer MPI_MAX_OBJECT_NAME - integer MPI_MAX_INFO_KEY - integer MPI_MAX_INFO_VAL - integer MPI_MAX_PORT_NAME - integer MPI_MAX_DATAREP_STRING - parameter (MPI_MAX_PROCESSOR_NAME=@OPAL_MAX_PROCESSOR_NAME@-1) - parameter (MPI_MAX_ERROR_STRING=@OPAL_MAX_ERROR_STRING@-1) - parameter (MPI_MAX_OBJECT_NAME=@OPAL_MAX_OBJECT_NAME@-1) - parameter (MPI_MAX_INFO_KEY=@OPAL_MAX_INFO_KEY@-1) - parameter (MPI_MAX_INFO_VAL=@OPAL_MAX_INFO_VAL@-1) - parameter (MPI_MAX_PORT_NAME=@OPAL_MAX_PORT_NAME@-1) - parameter (MPI_MAX_DATAREP_STRING=@OPAL_MAX_DATAREP_STRING@-1) diff --git a/oshmem/include/mpif-mpi-io.h b/oshmem/include/mpif-mpi-io.h deleted file mode 100644 index 771e0aefff..0000000000 --- a/oshmem/include/mpif-mpi-io.h +++ /dev/null @@ -1,74 +0,0 @@ -!Copyright (c) 2013 Mellanox Technologies, Inc. -! All rights reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! -! Do ***not*** copy this file to the directory where your Fortran -! fortran application is compiled unless it is absolutely necessary! Most -! modern Fortran compilers now support the -I command line flag, which -! tells the compiler where to find .h files (specifically, this one). For -! example: -! -! shell$ mpif77 foo.f -o foo -I$OMPI_HOME/include -! -! will probably do the trick (assuming that you have set OMPI_HOME -! properly). -! -! That being said, OMPI's "mpif77" wrapper compiler should -! automatically include the -I option for you. The following command -! should be equivalent to the command listed above: -! -! shell$ mpif77 foo.f -o foo -! -! You should not copy this file to your local directory because it is -! possible that this file will be changed between versions of Open MPI. -! Indeed, this mpif.h is incompatible with the mpif.f of other -! implementations of MPI. Using this mpif.h with other implementations -! of MPI, or with other versions of Open MPI will result in undefined -! behavior (to include incorrect results, segmentation faults, -! unexplainable "hanging" in your application, etc.). Always use the -! -I command line option instead (or let mpif77 do it for you). -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! -! This file is included as a back-end file to both mpif.h (i.e., the -! standardized MPI Fortran header file) and a bunch of the MPI -! Fortran 90 subroutine implementations found in ompi/mpi/f90. -! -! This file contains the output from configure that is relevant for -! Fortran applications (both 77 and 90) and a few values that are -! necessary to compile the F90 module (e.g., MPI_STATUS_SIZE). -! - - integer MPI_FILE_NULL - integer MPI_SEEK_SET, MPI_SEEK_CUR, MPI_SEEK_END - integer MPI_MODE_CREATE - integer MPI_MODE_RDONLY, MPI_MODE_WRONLY, MPI_MODE_RDWR - integer MPI_MODE_DELETE_ON_CLOSE, MPI_MODE_UNIQUE_OPEN - integer MPI_MODE_EXCL, MPI_MODE_APPEND, MPI_MODE_SEQUENTIAL - integer MPI_DISPLACEMENT_CURRENT - - parameter (MPI_FILE_NULL=0) - parameter (MPI_SEEK_SET=600) - parameter (MPI_SEEK_CUR=602) - parameter (MPI_SEEK_END=604) - parameter (MPI_MODE_CREATE=1) - parameter (MPI_MODE_RDONLY=2) - parameter (MPI_MODE_WRONLY=4) - parameter (MPI_MODE_RDWR=8) - parameter (MPI_MODE_DELETE_ON_CLOSE=16) - parameter (MPI_MODE_UNIQUE_OPEN=32) - parameter (MPI_MODE_EXCL=64) - parameter (MPI_MODE_APPEND=128) - parameter (MPI_MODE_SEQUENTIAL=256) - parameter (MPI_DISPLACEMENT_CURRENT=-54278278) diff --git a/oshmem/include/mpif.h.in b/oshmem/include/mpif.h.in deleted file mode 100644 index 48751683f3..0000000000 --- a/oshmem/include/mpif.h.in +++ /dev/null @@ -1,76 +0,0 @@ -! -*- fortran -*- -! -! Copyright (c) 2013 Mellanox Technologies, Inc. -! All rights reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! -! Do ***not*** copy this file to the directory where your Fortran -! fortran application is compiled unless it is absolutely necessary! Most -! modern Fortran compilers now support the -I command line flag, which -! tells the compiler where to find .h files (specifically, this one). For -! example: -! -! shell$ mpif77 foo.f -o foo -I$OMPI_HOME/include -! -! will probably do the trick (assuming that you have set OMPI_HOME -! properly). -! -! That being said, OMPI's "mpif77" wrapper compiler should -! automatically include the -I option for you. The following command -! should be equivalent to the command listed above: -! -! shell$ mpif77 foo.f -o foo -! -! You should not copy this file to your local directory because it is -! possible that this file will be changed between versions of Open MPI. -! Indeed, this mpif.h is incompatible with the mpif.f of other -! implementations of MPI. Using this mpif.h with other implementations -! of MPI, or with other versions of Open MPI will result in undefined -! behavior (to include incorrect results, segmentation faults, -! unexplainable "hanging" in your application, etc.). Always use the -! -I command line option instead (or let mpif77 do it for you). -! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -! -! Include the back-end file that has the bulk of the MPI Fortran -! interface. -! - - include 'mpif-common.h' - -! -! These "external" statements are specific to the MPI F77 interface -! (and are toxic to the MPI F90 interface), and are therefore in the -! MPI F77-specific header file (i.e., this one). -! - external MPI_NULL_COPY_FN, MPI_NULL_DELETE_FN - external MPI_COMM_NULL_COPY_FN, MPI_COMM_NULL_DELETE_FN - external MPI_TYPE_NULL_COPY_FN, MPI_TYPE_NULL_DELETE_FN - external MPI_DUP_FN, MPI_COMM_DUP_FN, MPI_TYPE_DUP_FN - external MPI_WIN_NULL_COPY_FN - external MPI_WIN_NULL_DELETE_FN - external MPI_WIN_DUP_FN -! Note that MPI_CONVERSION_FN_NULL is a "constant" (it is only ever -! checked for comparison; it is never invoked), but it is passed as -! a function pointer (to MPI_REGISTER_DATAREP) and therefore must be -! the same size/type. It is therefore external'ed here, and not -! defined with an integer value in mpif-common.h. - external MPI_CONVERSION_FN_NULL - -! -! double precision functions -! - external MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@ - double precision MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@ - diff --git a/oshmem/tools/wrappers/Makefile.am b/oshmem/tools/wrappers/Makefile.am index fb23097288..f8fe308388 100644 --- a/oshmem/tools/wrappers/Makefile.am +++ b/oshmem/tools/wrappers/Makefile.am @@ -20,19 +20,26 @@ dist_pkgdata_DATA = \ install-exec-hook: test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" (cd $(DESTDIR)$(bindir); rm -f shmemrun$(EXEEXT); $(LN_S) mpirun shmemrun) + (cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) mpirun oshrun) (cd $(DESTDIR)$(bindir); rm -f shmemcc$(EXEEXT); $(LN_S) mpicc shmemcc) (cd $(DESTDIR)$(bindir); rm -f oshcc$(EXEEXT); $(LN_S) mpicc oshcc) - (cd $(DESTDIR)$(bindir); rm -f shmem_info$(EXEEXT); $(LN_S) ompi_info shmem_info) (cd $(DESTDIR)$(bindir); rm -f shmemfort$(EXEEXT); $(LN_S) mpifort shmemfort) + (cd $(DESTDIR)$(bindir); rm -f oshfort$(EXEEXT); $(LN_S) mpifort oshfort) + (cd $(DESTDIR)$(bindir); rm -f shmem_info$(EXEEXT); $(LN_S) ompi_info shmem_info) install-data-hook: (cd $(DESTDIR)$(pkgdatadir); rm -f oshcc-wrapper-data.txt; $(LN_S) shmemcc-wrapper-data.txt oshcc-wrapper-data.txt) + (cd $(DESTDIR)$(pkgdatadir); rm -f oshfort-wrapper-data.txt; $(LN_S) shmemfort-wrapper-data.txt oshfort-wrapper-data.txt) uninstall-local: - rm -f $(DESTDIR)$(bindir)/shmemcc$(EXEEXT) \ + rm -f $(DESTDIR)$(bindir)/shmemrun$(EXEEXT) \ + $(DESTDIR)$(bindir)/oshrun$(EXEEXT) \ + $(DESTDIR)$(bindir)/shmemcc$(EXEEXT) \ $(DESTDIR)$(bindir)/oshcc$(EXEEXT) \ - $(DESTDIR)$(bindir)/shmem_info$(EXEEXT) \ $(DESTDIR)$(bindir)/shmemfort$(EXEEXT) \ + $(DESTDIR)$(bindir)/oshfort$(EXEEXT) \ + $(DESTDIR)$(bindir)/shmem_info$(EXEEXT) \ $(DESTDIR)$(pkgdatadir)/shmemcc-wrapper-data.txt \ $(DESTDIR)$(pkgdatadir)/oshcc-wrapper-data.txt \ - $(DESTDIR)$(pkgdatadir)/shmemfort-wrapper-data.txt + $(DESTDIR)$(pkgdatadir)/shmemfort-wrapper-data.txt \ + $(DESTDIR)$(pkgdatadir)/oshfort-wrapper-data.txt