X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2d907185a41d4e59e9f4eaa7d42700ea9483140..b9625f82f86db0674e911887addce45dca31b57f:/include/smpi/mpif.h.in

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index 96f726cb96..6042a102bb 100644
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -1,5 +1,5 @@
 ! -*- fortran -*-
-! Copyright (c) 2010-2019. The SimGrid Team.
+! Copyright (c) 2010-2020. The SimGrid Team.
 ! All rights reserved.
 
 ! This program is free software; you can redistribute it and/or modify it
@@ -39,6 +39,8 @@
       parameter(MPI_SUBVERSION=1)
       parameter(MPI_LOCK_EXCLUSIVE=1)
       parameter(MPI_LOCK_SHARED=2)
+
+
       integer MPI_MODE_NOSTORE, MPI_MODE_NOPUT, MPI_MODE_NOPRECEDE
       integer MPI_MODE_NOSUCCEED, MPI_MODE_NOCHECK
       parameter(MPI_MODE_NOSTORE=1)
@@ -106,12 +108,6 @@
       parameter(MPI_UNIVERSE_SIZE=-7)
       parameter(MPI_LASTUSEDCODE=-8)
 
-      integer MPI_ERRORS_RETURN, MPI_ERRORS_ARE_FATAL
-      integer MPI_ERRHANDLER_NULL
-      parameter(MPI_ERRORS_RETURN=0)
-      parameter(MPI_ERRORS_ARE_FATAL=1)
-      parameter(MPI_ERRHANDLER_NULL=2)
-
 ! This should be equal to the number of int fields in MPI_Status
       integer MPI_STATUS_SIZE
       parameter(MPI_STATUS_SIZE=5)
@@ -128,8 +124,9 @@
       integer MPI_DOUBLE_PRECISION, MPI_COMPLEX, MPI_DOUBLE_COMPLEX
       integer MPI_2INTEGER, MPI_LOGICAL1, MPI_LOGICAL2, MPI_LOGICAL4
       integer MPI_LOGICAL8, MPI_2REAL, MPI_2DOUBLE_PRECISION
-      integer MPI_AINT, MPI_OFFSET, MPI_COUNT
-      integer MPI_REAL16, MPI_PACKED
+      integer MPI_AINT, MPI_OFFSET, MPI_COUNT, MPI_REAL16
+      integer MPI_PACKED, MPI_COMPLEX8, MPI_COMPLEX16, MPI_COMPLEX32
+      integer MPI_DOUBLE, MPI_INT, MPI_FLOAT
 
       integer MPI_MAX, MPI_MIN, MPI_MAXLOC, MPI_MINLOC
       integer MPI_SUM, MPI_PROD, MPI_LAND, MPI_LOR, MPI_LXOR, MPI_BAND
@@ -140,7 +137,7 @@
       integer MPI_REQUEST_NULL,MPI_DATATYPE_NULL,MPI_OP_NULL
       integer MPI_COMM_NULL, MPI_COMM_WORLD, MPI_COMM_SELF
       integer MPI_GROUP_NULL, MPI_GROUP_EMPTY, MPI_WIN_NULL
-      integer MPI_INFO_NULL
+      integer MPI_INFO_NULL, MPI_ERRHANDLER_NULL
 
       parameter(MPI_REQUEST_NULL=-1)
       parameter(MPI_DATATYPE_NULL=-1)
@@ -151,6 +148,7 @@
       parameter(MPI_GROUP_NULL=-1)
       parameter(MPI_GROUP_EMPTY=-2)
       parameter(MPI_WIN_NULL=-1)
+      parameter(MPI_ERRHANDLER_NULL=-1)
 
       integer MPI_WIN_BASE, MPI_WIN_SIZE, MPI_WIN_DISP_UNIT
 
@@ -165,15 +163,18 @@
       parameter(MPI_BYTE=1)
       parameter(MPI_CHARACTER=2)
       parameter(MPI_LOGICAL=3)
+      parameter(MPI_INT=4)
       parameter(MPI_INTEGER=4)
       parameter(MPI_INTEGER1=5)
       parameter(MPI_INTEGER2=6)
       parameter(MPI_INTEGER4=7)
       parameter(MPI_INTEGER8=8)
       parameter(MPI_REAL=9)
+      parameter(MPI_FLOAT=9)
       parameter(MPI_REAL4=10)
       parameter(MPI_REAL8=11)
       parameter(MPI_DOUBLE_PRECISION=12)
+      parameter(MPI_DOUBLE=12)
       parameter(MPI_COMPLEX=13)
       parameter(MPI_DOUBLE_COMPLEX=14)
       parameter(MPI_2INTEGER=15)
@@ -188,20 +189,30 @@
       parameter(MPI_COUNT=24)
       parameter(MPI_REAL16=25)
       parameter(MPI_PACKED=26)
+      parameter(MPI_COMPLEX8=27)
+      parameter(MPI_COMPLEX16=28)
+      parameter(MPI_COMPLEX32=29)
+      parameter(MPI_MAX=30)
+      parameter(MPI_MIN=31)
+      parameter(MPI_MAXLOC=32)
+      parameter(MPI_MINLOC=33)
+      parameter(MPI_SUM=34)
+      parameter(MPI_PROD=35)
+      parameter(MPI_LAND=36)
+      parameter(MPI_LOR=37)
+      parameter(MPI_LXOR=38)
+      parameter(MPI_BAND=39)
+      parameter(MPI_BOR=40)
+      parameter(MPI_BXOR=41)
 
-      parameter(MPI_MAX=27)
-      parameter(MPI_MIN=28)
-      parameter(MPI_MAXLOC=29)
-      parameter(MPI_MINLOC=30)
-      parameter(MPI_SUM=31)
-      parameter(MPI_PROD=32)
-      parameter(MPI_LAND=33)
-      parameter(MPI_LOR=34)
-      parameter(MPI_LXOR=35)
-      parameter(MPI_BAND=36)
-      parameter(MPI_BOR=37)
-      parameter(MPI_BXOR=38)
+      integer MPI_ERRORS_RETURN, MPI_ERRORS_ARE_FATAL
+      parameter(MPI_ERRORS_RETURN=42)
+      parameter(MPI_ERRORS_ARE_FATAL=43)
 
+      integer MPI_LB, MPI_UB
+      parameter(MPI_LB=44)
+      parameter(MPI_UB=45)
+      
       INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND
       PARAMETER (MPI_ADDRESS_KIND=@CMAKE_SIZEOF_VOID_P@)
       PARAMETER (MPI_OFFSET_KIND=@CMAKE_SIZEOF_VOID_P@)
@@ -240,6 +251,14 @@
       integer MPI_MODE_RDONLY, MPI_MODE_RDWR, MPI_MODE_WRONLY
       integer MPI_MODE_CREATE, MPI_MODE_EXCL, MPI_MODE_DELETE_ON_CLOSE
       integer MPI_MODE_UNIQUE_OPEN, MPI_MODE_APPEND, MPI_MODE_SEQUENTIAL
+      integer MPI_FILE_NULL
+      integer MPI_DISPLACEMENT_CURRENT, MPI_SEEK_SET, MPI_SEEK_CUR
+      integer MPI_MAX_DATAREP_STRING
+      parameter(MPI_FILE_NULL=0)
+      parameter(MPI_DISPLACEMENT_CURRENT=-54278278)
+      parameter(MPI_SEEK_SET=600)
+      parameter(MPI_SEEK_CUR=602)
+      parameter(MPI_MAX_DATAREP_STRING=128)
 
       parameter( MPI_MODE_RDONLY=2)
       parameter( MPI_MODE_RDWR=8)
@@ -273,16 +292,7 @@
       double precision MPI_WTICK
 
       external smpi_execute_flops
+      external smpi_execute_flops_benched
       external smpi_execute
-      external smpi_get_host_power_peak_at
-      external smpi_get_host_current_power_peak
-      external smpi_get_host_nb_pstates
-      external smpi_set_host_pstate
-      external smpi_get_host_consumed_energy
-
-      double precision smpi_get_host_power_peak_at
-      double precision smpi_get_host_current_power_peak
-      integer smpi_get_host_nb_pstates
-      integer smpi_get_host_pstate
-      double precision smpi_get_host_consumed_energy
+      external smpi_execute_benched
 @MODULE_MPIF_OUT@