make smpiff behave like smpif90, so we don't use f2c anymore

diff --git a/examples/smpi/energy/f77/energy.tesh b/examples/smpi/energy/f77/energy.tesh
index 1f4b353..a8f82fd 100644 (file)
--- a/examples/smpi/energy/f77/energy.tesh
+++ b/examples/smpi/energy/f77/energy.tesh
@@ -10,17 +10,17 @@ $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile  -platf
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [80.000000] [surf_energy/INFO] Total energy (Joules) of host MyHost1: 12900.000000
 > [80.000000] [surf_energy/INFO] Total energy (Joules) of host MyHost2: 2000.000000
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [80.000000] [surf_energy/INFO] Total energy (Joules) of host MyHost1: 12900.000000
 > [80.000000] [surf_energy/INFO] Total energy (Joules) of host MyHost2: 2000.000000

->  [  0.] [rank  0] 3 pstates available
->  [  0.] [rank  1] 1 pstates available
->  [  0.] [rank  0] Power:   100000000.
->  [  0.] [rank  1] Power:   100000000.
->  [  0.] [rank  0] Power:   50000000.
->  [  0.] [rank  0] Power:   20000000.
->  [  0.] [rank  1] Current pstate:  0; Current power:   100000000.
->  [  0.] [rank  0] Current pstate:  0; Current power:   100000000.
->  [  10.] [rank  1] Energy consumed (Joules):   2000.
->  [  10.] [rank  0] Energy consumed (Joules):   2000.
->  [  10.] [rank  0] Current pstate:  1; Current power:   50000000.
->  [  30.] [rank  0] Energy consumed (Joules):   5400.
->  [  30.] [rank  0] Current pstate:  2; Current power:   20000000.
->  [  80.] [rank  0] Energy consumed (Joules):   12900.
+>  [   0.0000000000000000      ] [rank            0 ]           3  pstates available
+>  [   0.0000000000000000      ] [rank            1 ]           1  pstates available
+>  [   0.0000000000000000      ] [rank            0 ] Power:    100000000.00000000     
+>  [   0.0000000000000000      ] [rank            1 ] Power:    100000000.00000000     
+>  [   0.0000000000000000      ] [rank            0 ] Power:    50000000.000000000     
+>  [   0.0000000000000000      ] [rank            0 ] Power:    20000000.000000000     
+>  [   0.0000000000000000      ] [rank            1 ] Current pstate:            0 ; Current power:    100000000.00000000     
+>  [   0.0000000000000000      ] [rank            0 ] Current pstate:            0 ; Current power:    100000000.00000000     
+>  [   10.000000000000000      ] [rank            1 ] Energy consumed (Joules):    2000.0000000000000     
+>  [   10.000000000000000      ] [rank            0 ] Energy consumed (Joules):    2000.0000000000000     
+>  [   10.000000000000000      ] [rank            0 ] Current pstate:            1 ; Current power:    50000000.000000000     
+>  [   30.000000000000000      ] [rank            0 ] Energy consumed (Joules):    5400.0000000000000     
+>  [   30.000000000000000      ] [rank            0 ] Current pstate:            2 ; Current power:    20000000.000000000     
+>  [   80.000000000000000      ] [rank            0 ] Energy consumed (Joules):    12900.000000000000     

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index b74f559..4e73752 100644 (file)
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -223,8 +223,8 @@
       parameter(MPI_ORDER_FORTRAN=0)
 
       external MPI_INIT, MPI_FINALIZE, MPI_ABORT
       parameter(MPI_ORDER_FORTRAN=0)
 
       external MPI_INIT, MPI_FINALIZE, MPI_ABORT

-      external MPI_COMM_RANK, MPI_COMM_SIZE, MPI_COMM_DUP, MPI_COMM_SPLIT
-      external MPI_SEND_INIT, MPI_ISEND, MPI_SEND
+      external MPI_COMM_RANK, MPI_COMM_SIZE, MPI_COMM_DUP
+      external MPI_SEND_INIT, MPI_ISEND, MPI_SEND, MPI_COMM_SPLIT

       external MPI_RECV_INIT, MPI_IRECV, MPI_RECV
       external MPI_START, MPI_STARTALL
       external MPI_WAIT, MPI_WAITANY, MPI_WAITALL
       external MPI_RECV_INIT, MPI_IRECV, MPI_RECV
       external MPI_START, MPI_STARTALL
       external MPI_WAIT, MPI_WAITANY, MPI_WAITALL

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 9e30ca3..c160a99 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -39,7 +39,7 @@ while [ $# -gt 0 ]; do
             TMPFILE=$(mymktemp "${ARG}" ".f90")
             list_add TMPFILES "${TMPFILE}"
       #replace "program main_name by subroutine user\_main (and the end clause as well)"
             TMPFILE=$(mymktemp "${ARG}" ".f90")
             list_add TMPFILES "${TMPFILE}"
       #replace "program main_name by subroutine user\_main (and the end clause as well)"

-            sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
+            sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"

             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 13955eb..e97d6c2 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -1,70 +1,57 @@
 #! /bin/sh
 
 #! /bin/sh
 

-# Copyright (c) 2010-2014. The SimGrid Team.
+# Copyright (c) 2012-2014. The SimGrid Team.

 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 

-prefix="@exec_prefix@"
-smpicc="$prefix/bin/smpicc"
-smpif2c="$prefix/bin/smpif2c"
+F77=@GFORTRAN_EXE@
+
+INCLUDEARGS="@includeflag@"
+CMAKE_LINKARGS="-L@libdir@"

 
 @SMPITOOLS_SH@
 
 
 @SMPITOOLS_SH@
 

-list_set ARGS "-DMAIN__=user_main" "-Diargc_=smpi_process_argc" "-Dgetarg_=smpi_process_getarg"
-list_set LINKARGS "-L@F2C_LIBRARY_PATH@" "-lf2c" "-lm"
-list_set SRCFILES
+list_set FFLAGS "-ff2c" "-fno-second-underscore"
+list_set LINKARGS "-lsimgrid" "-lm" "-lgfortran"
+list_set TMPFILES
+main_name=main
+
+cleanup () {
+    eval $(list_get TMPFILES)
+   # rm -f "$@"
+}
+trap 'cleanup' EXIT

 
 

+list_set CMDLINE "${F77}"
+list_add_not_empty CMDLINE "${FFLAGS}"

 while [ $# -gt 0 ]; do
     ARG="$1"
     shift
     case "${ARG}" in
 while [ $# -gt 0 ]; do
     ARG="$1"
     shift
     case "${ARG}" in

-        *.f)
-            SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
-            if [ -z "$SRCFILE" ] ; then
-                SRCFILE="$ARG"
-            fi
-            list_add SRCFILES "${SRCFILE}"
+        -c)
+            CMAKE_LINKARGS=""
+            LINKARGS=""
+            list_add CMDLINE "-c"
+            ;;
+        *.f|*.F)
+            TMPFILE=$(mymktemp "${ARG}" ".f")
+            list_add TMPFILES "${TMPFILE}"
+      #replace "program main_name by subroutine user\_main (and the end clause as well)"
+            sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
+            SRCFILE="${TMPFILE}"
+            list_add CMDLINE "${SRCFILE}"

             ;;
         *)
             ;;
         *)

-            if [ "${ARG}" = "-c" ]; then
-                LINKARGS=""
-            fi
-            list_add ARGS "${ARG}"
+            list_add CMDLINE "${ARG}"

             ;;
     esac
 done
             ;;
     esac
 done

-list_add_not_empty ARGS "${LINKARGS}"

 
 

-build () {
-    local SRCFILE
-    SRCFILE="$1"
-    TMPFILE=$(mymktemp "${SRCFILE}" ".f")
-    CFILE="${TMPFILE%.f}.c"
-
-    eval $(list_get ARGS)
-
-    cp "${SRCFILE}" "${TMPFILE}" \
-        && "$smpif2c" "${TMPFILE}" \
-        && "$smpicc" "$@" "${CFILE}" \
-        && rm -f "${CFILE}" \
-        && rm -f "${TMPFILE}" \
-        || exit $?
-
-    # When the file is compiled with "-c" and no output file is specified with
-    # "-o", rename the output.  FIXME: do it properly.
-    if [ -f "${CFILE%.c}.o" ]; then
-        mv "${CFILE%.c}.o" "${SRCFILE%.f}.o"
-    fi
-}
+list_add_not_empty CMDLINE ${INCLUDEARGS}
+list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
+list_add_not_empty CMDLINE "${LINKARGS}"

 
 

-if [ -n "${SRCFILES}" ]; then
-    eval $(list_get SRCFILES)
-    for SRCFILE in "$@"; do
-        build "$SRCFILE"
-    done
-else
-    eval $(list_get ARGS)
-    "$smpicc" "$@"
-fi
+eval $(list_get CMDLINE)
+"$@"