Set MPI_ADDRESS_KIND and MPI_OFFSET_KIND to 4 on 32 bits archs.

This is consistent with the definition of MPI_Aint (ptrdiff_t).

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 319f8f0..e8120d2 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -56,6 +56,12 @@ ELSE() #PROCESSOR NOT FOUND
 
 ENDIF()
 
 
 ENDIF()
 

+if(ARCH_32_BITS)
+  set(MPI_ADDRESS_SIZE 4)
+else()
+  set(MPI_ADDRESS_SIZE 8)
+endif()
+

 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 include(CheckFunctionExists)
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 include(CheckFunctionExists)


@@ -779,6 +785,7 @@ set(includedir "${CMAKE_INSTALL_PREFIX}/include")
 set(libdir ${exec_prefix}/lib)
 set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${GTNETS_LIB_PATH}:${HAVE_NS3_LIB}:$LD_LIBRARY_PATH")
 
 set(libdir ${exec_prefix}/lib)
 set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${GTNETS_LIB_PATH}:${HAVE_NS3_LIB}:$LD_LIBRARY_PATH")
 

+configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/mpif.h @ONLY)

 configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/smpif.h @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_BINARY_DIR}/bin/smpif2c @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/smpif.h @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_BINARY_DIR}/bin/smpif2c @ONLY)


@@ -816,6 +823,7 @@ if(NOT WIN32)
 endif()
 
 set(generated_headers_to_install
 endif()
 
 set(generated_headers_to_install

+  ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/mpif.h

   ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
   ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
   )
   ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
   ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
   )

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 940acdb..301ccb0 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -534,7 +534,6 @@ set(headers_to_install
   include/simgrid/platf_generator.h
   include/simgrid/simix.h
   include/smpi/mpi.h
   include/simgrid/platf_generator.h
   include/simgrid/simix.h
   include/smpi/mpi.h

-  include/smpi/mpif.h

   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
   include/smpi/smpi_main.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
   include/smpi/smpi_main.h


@@ -580,6 +579,7 @@ set(headers_to_install
   )
 set(source_of_generated_headers
   include/simgrid_config.h.in
   )
 set(source_of_generated_headers
   include/simgrid_config.h.in

+  include/smpi/mpif.h.in

   include/smpi/smpif.h.in
   src/context_sysv_config.h.in)
 
   include/smpi/smpif.h.in
   src/context_sysv_config.h.in)
 

diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in
index 2105d4d..c53efe4 100644 (file)
--- a/buildtools/Cmake/src/simgrid.nsi.in
+++ b/buildtools/Cmake/src/simgrid.nsi.in
@@ -201,9 +201,9 @@ Section "SMPI Library" SMPISection
        setOutPath $INSTDIR\include\smpi\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\mpi.h\r
        setOutPath $INSTDIR\include\smpi\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\mpi.h\r

-       file @CMAKE_HOME_DIRECTORY@\include\smpi\mpif.h\r

        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_cocci.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_main.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_cocci.h\r
        file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_main.h\r

+       file include\smpi\mpif.h\r

        file include\smpi\smpif.h\r
        \r
        CreateDirectory $INSTDIR\examples\smpi\r
        file include\smpi\smpif.h\r
        \r
        CreateDirectory $INSTDIR\examples\smpi\r

diff --git a/include/smpi/mpif.h b/include/smpi/mpif.h.in
similarity index 98%
rename from include/smpi/mpif.h
rename to include/smpi/mpif.h.in
index 88922f3..c6a96a2 100644 (file)
--- a/include/smpi/mpif.h
+++ b/include/smpi/mpif.h.in
@@ -182,8 +182,8 @@
       parameter(MPI_BXOR=11)
       
       INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND
       parameter(MPI_BXOR=11)
       
       INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND

-      PARAMETER (MPI_ADDRESS_KIND=8)
-      PARAMETER (MPI_OFFSET_KIND=8)
+      PARAMETER (MPI_ADDRESS_KIND=@MPI_ADDRESS_SIZE@)
+      PARAMETER (MPI_OFFSET_KIND=@MPI_ADDRESS_SIZE@)

       
       INTEGER MPI_MODE_NOPRECEDE
       PARAMETER (MPI_MODE_NOPRECEDE=8192)
       
       INTEGER MPI_MODE_NOPRECEDE
       PARAMETER (MPI_MODE_NOPRECEDE=8192)