Merge remote branch 'origin/master' into MPI

diff --git a/scilab/Makefile.in b/scilab/Makefile.in

index 1730d9b..08f157d 100644 (file)
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -98,11 +98,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -428,6 +429,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -441,6 +443,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/Makefile.incl.in b/scilab/Makefile.incl.in

index fb11bef..e2e54a9 100644 (file)
--- a/scilab/Makefile.incl.in
+++ b/scilab/Makefile.incl.in
@@ -42,7 +42,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.incl.am \
        config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/fortran.m4 \
-       $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/libs_by_debian.m4 \
+       $(top_srcdir)/m4/java.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
        $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pvm.m4 \
diff --git a/scilab/Version.incl b/scilab/Version.incl

index 80e8b92..383673f 100644 (file)
--- a/scilab/Version.incl
+++ b/scilab/Version.incl
@@ -1 +1,2 @@
-SCIVERSION=Scilab-master-GIT
+SCIVERSION=Scilab-MPI-GIT
+
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4

index 1127363..c81e01e 100644 (file)
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -3126,6 +3126,7 @@ m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
+m4_include([m4/mpi.m4])
 m4_include([m4/ocaml.m4])
 m4_include([m4/pcre.m4])
 m4_include([m4/pkg.m4])
diff --git a/scilab/configure b/scilab/configure

index 0c0cb07..ee6d775 100755 (executable)
--- a/scilab/configure
+++ b/scilab/configure
@@ -685,6 +685,12 @@ PVM_INCLUDE
 PVM_LIB
 PVM_ARCH
 PVMGETARCH
+MPI_FALSE
+MPI_TRUE
+MPI_ENABLE
+OPENMPI_LIBS
+OPENMPI_FLAGS
+OPENMPI_CC
 FFTW_FALSE
 FFTW_TRUE
 FFTW_ENABLE
@@ -929,6 +935,7 @@ with_ocaml
 with_fftw
 with_fftw_include
 with_fftw_library
+with_mpi
 with_pvm
 with_pvm_include
 with_pvm_library
@@ -1663,6 +1670,7 @@ Optional Packages:
   --without-fftw          Disable the interface to the FFTW 3 library
   --with-fftw-include=DIR Set the path to the FFTW headers
   --with-fftw-library=DIR Set the path to the FFTW libraries
+  --without-mpi           compile with MPI library
   --without-pvm           Disable the interface to the PVM library
   --with-pvm-include=DIR  Set the path to the PVM headers
   --with-pvm-library=DIR  Set the path to the PVM library directory
@@ -9839,7 +9847,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 9842 "configure"
+// #line 9850 "configure"
 
 
 public class conftest {
@@ -9899,7 +9907,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 9902 "configure"
+// #line 9910 "configure"
 import gnu.java.io.EncodingManager;
 
 public class conftest {
@@ -9957,7 +9965,7 @@ $as_echo_n "checking java API version... " >&6; }
 
 
     cat << \EOF > conftest.java
-// #line 9960 "configure"
+// #line 9968 "configure"
 import java.nio.charset.Charset;
 
 public class conftest {
@@ -9996,7 +10004,7 @@ EOF
 
 
     cat << \EOF > conftest.java
-// #line 9999 "configure"
+// #line 10007 "configure"
 import java.lang.StringBuilder;
 
 public class conftest {
@@ -11245,7 +11253,7 @@ $as_echo_n "checking jgraphx... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11248 "configure"
+// #line 11256 "configure"
 import com.mxgraph.model.mxCell;
 
 public class conftest {
@@ -11326,7 +11334,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
    export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11329 "configure"
+// #line 11337 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -11389,7 +11397,7 @@ $as_echo_n "checking flexdock... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11392 "configure"
+// #line 11400 "configure"
 import org.flexdock.docking.DockingManager;
 
 public class conftest {
@@ -11483,7 +11491,7 @@ $as_echo_n "checking looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11486 "configure"
+// #line 11494 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 
 public class conftest {
@@ -11577,7 +11585,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11580 "configure"
+// #line 11588 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 
 public class conftest {
@@ -11672,7 +11680,7 @@ $as_echo_n "checking skinlf... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11675 "configure"
+// #line 11683 "configure"
 import com.l2fprod.util.AccessUtils;
 
 public class conftest {
@@ -11766,7 +11774,7 @@ $as_echo_n "checking jogl... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11769 "configure"
+// #line 11777 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 
 public class conftest {
@@ -11960,7 +11968,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11963 "configure"
+// #line 11971 "configure"
 import com.sun.gluegen.runtime.CPU;
 
 public class conftest {
@@ -12109,7 +12117,7 @@ $as_echo_n "checking jhall... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12112 "configure"
+// #line 12120 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -12203,7 +12211,7 @@ $as_echo_n "checking javahelp2... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12206 "configure"
+// #line 12214 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -12298,7 +12306,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12301 "configure"
+// #line 12309 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -12392,7 +12400,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12395 "configure"
+// #line 12403 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 
 public class conftest {
@@ -12487,7 +12495,7 @@ $as_echo_n "checking jhdf5... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12490 "configure"
+// #line 12498 "configure"
 import ncsa.hdf.hdf5lib.HDF5Constants;
 
 public class conftest {
@@ -12582,7 +12590,7 @@ $as_echo_n "checking commons-logging... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12585 "configure"
+// #line 12593 "configure"
 import org.apache.commons.logging.LogFactory;
 
 public class conftest {
@@ -12676,7 +12684,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12679 "configure"
+// #line 12687 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -12776,7 +12784,7 @@ $as_echo_n "checking checkstyle... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12779 "configure"
+// #line 12787 "configure"
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 
 public class conftest {
@@ -12870,7 +12878,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12873 "configure"
+// #line 12881 "configure"
 import org.apache.commons.beanutils.Converter;
 
 public class conftest {
@@ -12964,7 +12972,7 @@ $as_echo_n "checking antlr... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12967 "configure"
+// #line 12975 "configure"
 import antlr.TokenStreamException;
 
 public class conftest {
@@ -16978,14 +16986,180 @@ fi
 #################
 
 # Not in Scilab 5.0
-#AC_ARG_WITH(mpi,
-#    [  --with-mpi                compile with MPI library])
-#
-#if test "$with_mpi" = yes; then
-#   AC_OPENMPI()
-#   # We will have to detect other implementation of OpenMPI
+
+# Check whether --with-mpi was given.
+if test "${with_mpi+set}" = set; then :
+  withval=$with_mpi;
+fi
+
+
+MPI_ENABLE=no
+if test "$with_mpi" != no; then
+
+#"$with_openmpi_path" != 'yes' -a "$with_openmpi_path" != 'no'
+#if test false != true; then
+   # Look if mpicc (which provides cflags and ldflags) is available
+#   AC_MSG_CHECKING([openmpi, for mpicc])
+#   OPENMPI_FOUND=0
+#   MPICC="$with_openmpi/bin/mpicc"
+#        if test -x "$MPICC"; then
+#                AC_MSG_RESULT([$MPICC])
+#                              OPENMPI_CC=$MPICC
+#                              OPENMPI_FOUND=1
+#              fi
+#   if test $OPENMPI_FOUND -eq 0; then
+#   MPICC="$with_openmpi/mpicc"
+#        if test -x "$MPICC"; then
+#                              OPENMPI_FOUND=1
+#                              OPENMPI_CC=$MPICC
+#                AC_MSG_RESULT([$MPICC])
+#        fi
+#   fi
+#              if test $OPENMPI_FOUND -eq 0; then
+#                AC_MSG_ERROR([Unable to find $MPICC. Please check the path you provided])
+#              else
+#                      unset OPENMPI_FOUND
+#              fi
+#else
+               for ac_prog in mpicc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OPENMPI_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OPENMPI_CC"; then
+  ac_cv_prog_OPENMPI_CC="$OPENMPI_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OPENMPI_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OPENMPI_CC=$ac_cv_prog_OPENMPI_CC
+if test -n "$OPENMPI_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENMPI_CC" >&5
+$as_echo "$OPENMPI_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$OPENMPI_CC" && break
+done
+test -n "$OPENMPI_CC" || OPENMPI_CC="no"
+
+               if test "x$MPICC" = "xno"; then
+                               as_fn_error "Unable to find mpicc in the path. Please check your installation of openmpi (example : openmpi & openmpi-dev with Debian)" "$LINENO" 5
+               fi
 #fi
-#AM_CONDITIONAL(MPI, test "$with_mpi" = yes)
+saved_cflags=$CFLAGS
+saved_LIBS="$LIBS"
+
+CFLAGS=`$OPENMPI_CC --showme:compile`
+LIBS=`$OPENMPI_CC --showme:link`
+
+ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default"
+if test "x$ac_cv_header_mpi_h" = x""yes; then :
+  OPENMPI_CFLAGS=$CFLAGS
+else
+  as_fn_error "Cannot find headers of the library OpenMPI. Please install the dev package (Debian : openmpi-dev)" "$LINENO" 5
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5
+$as_echo_n "checking for MPI_Init in -lmpi... " >&6; }
+if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmpi  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MPI_Init ();
+int
+main ()
+{
+return MPI_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_mpi_MPI_Init=yes
+else
+  ac_cv_lib_mpi_MPI_Init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5
+$as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; }
+if test "x$ac_cv_lib_mpi_MPI_Init" = x""yes; then :
+  OPENMPI_LIBS=$LIBS
+else
+  as_fn_error "openmpi : library missing. (Cannot find symbol MPI_Init in -lmpi). Check if OpenMPI is installed" "$LINENO" 5
+
+fi
+
+
+#OPENMPI_CPPFLAGS="-I$openmpi_dir/include"
+#OPENMPI_LDFLAGS="-L$openmpi_dir/lib/"
+
+#OPENMPI_HEADER="$openmpi_dir/include/mpi.h"
+#OPENMPI_DIR="$openmpi_dir"
+
+LIBS="$saved_LIBS"
+CFLAGS=$saved_cflags
+
+
+
+
+#CFLAGS="$CFLAGS $OPENMPI_FLAGS"
+#AC_CHECK_LIB(xml2,xmlInitParserCtxt,,[AC_MSG_ERROR([pcre : library missing])])
+
+
+#AC_CHECK_HEADERS([pcre/tree.h],,[AC_MSG_ERROR([pcre : library missing missing])])
+
+# Gets compilation and library flags
+
+   # We will have to detect other implementation of OpenMPI
+   MPI_ENABLE=yes
+fi
+
+
+ if test "$with_mpi" = yes; then
+  MPI_TRUE=
+  MPI_FALSE='#'
+else
+  MPI_TRUE='#'
+  MPI_FALSE=
+fi
+
 
 #################
 ## PVM
@@ -21011,7 +21185,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 21014 "configure"
+#line 21188 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -21323,7 +21497,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 21326 "configure"
+#line 21500 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -21904,7 +22078,7 @@ $as_echo_n "checking batik-all... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 21907 "configure"
+// #line 22081 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -21998,7 +22172,7 @@ $as_echo_n "checking batik... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22001 "configure"
+// #line 22175 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -22094,7 +22268,7 @@ $as_echo_n "checking saxon... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22097 "configure"
+// #line 22271 "configure"
 import com.icl.saxon.Loader;
 
 public class conftest {
@@ -22188,7 +22362,7 @@ $as_echo_n "checking fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22191 "configure"
+// #line 22365 "configure"
 import org.apache.fop.pdf.PDFInfo;
 
 public class conftest {
@@ -22282,7 +22456,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22285 "configure"
+// #line 22459 "configure"
 import net.sourceforge.jeuclid.LayoutContext;
 
 public class conftest {
@@ -22376,7 +22550,7 @@ $as_echo_n "checking commons-io... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22379 "configure"
+// #line 22553 "configure"
 import org.apache.commons.io.output.CountingOutputStream;
 
 public class conftest {
@@ -22470,7 +22644,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22473 "configure"
+// #line 22647 "configure"
 import org.apache.xmlgraphics.util.Service;
 
 public class conftest {
@@ -22564,7 +22738,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22567 "configure"
+// #line 22741 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -22658,7 +22832,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22661 "configure"
+// #line 22835 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -22756,7 +22930,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22759 "configure"
+// #line 22933 "configure"
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 public class conftest {
@@ -29021,7 +29195,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 29024 "configure"
+#line 29198 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -29127,7 +29301,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 29130 "configure"
+#line 29304 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -35149,7 +35323,7 @@ if test "$enable_stop_on_warning" = yes; then
    CXXFLAGS="$CXXFLAGS -Werror -O0"
 fi
 
-ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
+ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
 
 
 # Detection of the module for the future version of Scilab 6
@@ -35165,7 +35339,7 @@ fi
 
 
 #MAN_FR MAN_ENG
-#modules/mpi/Makefile
+
 #for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do
 #  test -f $top_builddir/configure && break
 #done
@@ -35374,6 +35548,10 @@ if test -z "${FFTW_TRUE}" && test -z "${FFTW_FALSE}"; then
   as_fn_error "conditional \"FFTW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MPI_TRUE}" && test -z "${MPI_FALSE}"; then
+  as_fn_error "conditional \"MPI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${PVM_TRUE}" && test -z "${PVM_FALSE}"; then
   as_fn_error "conditional \"PVM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -36510,6 +36688,7 @@ do
     "modules/action_binding/Makefile") CONFIG_FILES="$CONFIG_FILES modules/action_binding/Makefile" ;;
     "modules/gui/Makefile") CONFIG_FILES="$CONFIG_FILES modules/gui/Makefile" ;;
     "modules/pvm/Makefile") CONFIG_FILES="$CONFIG_FILES modules/pvm/Makefile" ;;
+    "modules/mpi/Makefile") CONFIG_FILES="$CONFIG_FILES modules/mpi/Makefile" ;;
     "modules/randlib/Makefile") CONFIG_FILES="$CONFIG_FILES modules/randlib/Makefile" ;;
     "modules/tclsci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/tclsci/Makefile" ;;
     "modules/windows_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/windows_tools/Makefile" ;;
@@ -38497,14 +38676,14 @@ echo ""
 #   echo "Not using MPI"
 #fi
 
-#if test "$with_openmpi" != "no"; then
-#   echo "OpenMPI Configuration:"
-#   echo "  OpenMPI LIBS ........... = $OPENMPI_LIBS"
-#   echo "  OpenMPI C Compiler ..... = $OPENMPI_CC"
-#   echo "  OpenMPI F77 Compiler ... = $MPIF77"
-#else
-#   echo "Not using MPI"
-#fi
+if test "$with_openmpi" != "no"; then
+   echo "OpenMPI Configuration:"
+   echo "OpenMPI LIBS ........... = $OPENMPI_LIBS"
+   echo "OpenMPI C Compiler ..... = $OPENMPI_CC"
+   echo "OpenMPI F77 Compiler ... = $MPIF77"
+else
+   echo "Not using MPI"
+fi
 
 echo ""
 if test $BUILD_LOCALIZATION_ENABLE != no; then
diff --git a/scilab/configure.ac b/scilab/configure.ac

index 60fb230..be45204 100644 (file)
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1109,14 +1109,18 @@ AM_CONDITIONAL(FFTW, test "$with_fftw" != no)
 #################
 
 # Not in Scilab 5.0
-#AC_ARG_WITH(mpi,
-#    [  --with-mpi                compile with MPI library])
-#
-#if test "$with_mpi" = yes; then
-#   AC_OPENMPI()
-#   # We will have to detect other implementation of OpenMPI
-#fi
-#AM_CONDITIONAL(MPI, test "$with_mpi" = yes)
+AC_ARG_WITH(mpi,
+    AC_HELP_STRING([--without-mpi],[compile with MPI library]))
+
+MPI_ENABLE=no
+if test "$with_mpi" != no; then
+   AC_OPENMPI()
+   # We will have to detect other implementation of OpenMPI
+   MPI_ENABLE=yes
+fi
+AC_SUBST(MPI_ENABLE)
+
+AM_CONDITIONAL(MPI, test "$with_mpi" = yes)
 
 #################
 ## PVM
@@ -1514,6 +1518,7 @@ modules/renderer/Makefile
 modules/action_binding/Makefile
 modules/gui/Makefile
 modules/pvm/Makefile
+modules/mpi/Makefile
 modules/randlib/Makefile
 modules/tclsci/Makefile
 modules/windows_tools/Makefile
@@ -1569,7 +1574,7 @@ AC_CONFIG_COMMANDS_POST([chmod +x $SCI_SRCDIR_FULL/modules/scicos_blocks/src/scr
 
 
 #MAN_FR MAN_ENG
-#modules/mpi/Makefile
+
 #for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do
 #  test -f $top_builddir/configure && break
 #done
@@ -1741,14 +1746,14 @@ echo ""
 #   echo "Not using MPI"
 #fi
 
-#if test "$with_openmpi" != "no"; then
-#   echo "OpenMPI Configuration:"
-#   echo "  OpenMPI LIBS ........... = $OPENMPI_LIBS"
-#   echo "  OpenMPI C Compiler ..... = $OPENMPI_CC"
-#   echo "  OpenMPI F77 Compiler ... = $MPIF77"
-#else
-#   echo "Not using MPI"
-#fi
+if test "$with_openmpi" != "no"; then
+   echo "OpenMPI Configuration:"
+   echo "OpenMPI LIBS ........... = $OPENMPI_LIBS"
+   echo "OpenMPI C Compiler ..... = $OPENMPI_CC"
+   echo "OpenMPI F77 Compiler ... = $MPIF77"
+else
+   echo "Not using MPI"
+fi
 
 echo ""
 if test $BUILD_LOCALIZATION_ENABLE != no; then
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in

index 9e94ffa..c5c4de2 100644 (file)
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -52,11 +52,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -171,6 +172,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -184,6 +186,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in

index 851edab..fb919b3 100644 (file)
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -81,6 +81,7 @@
 <module name="hdf5" activate="yes"/>
 <module name="xcos" activate="@GUI_ENABLE@"/>
 <module name="xpad" activate="@GUI_ENABLE@"/>
+<module name="mpi" activate="@MPI_ENABLE@"/>
 <module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="@HELP_ENABLE@"/>
 </modules>
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in

index 6f02d95..94729f8 100644 (file)
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -237,6 +238,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -250,6 +252,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in

index 0ff74b8..29f8084 100644 (file)
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -50,11 +50,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -209,6 +210,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -222,6 +224,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in

index 9e421ef..8ac61f8 100644 (file)
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -71,11 +71,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -239,6 +240,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +254,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in

index 93eea03..b1ebb7e 100644 (file)
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -71,11 +71,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -239,6 +240,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +254,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in

index 951cb64..678eb67 100644 (file)
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -71,11 +71,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -237,6 +238,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -250,6 +252,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in

index c384dca..7f82a7a 100644 (file)
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -69,11 +69,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -233,6 +234,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -246,6 +248,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/m4/mpi.m4 b/scilab/m4/mpi.m4

index 81f223c..190425d 100644 (file)
--- a/scilab/m4/mpi.m4
+++ b/scilab/m4/mpi.m4
@@ -15,44 +15,48 @@ dnl * if it is available
 dnl * what are the compilation flags 
 dnl * what are linking flags
 AC_DEFUN([AC_OPENMPI], [
-
-if test "$with_openmpi" != 'yes' -a "$with_openmpi" != 'no'; then
+#"$with_openmpi_path" != 'yes' -a "$with_openmpi_path" != 'no'
+#if test false != true; then
    # Look if mpicc (which provides cflags and ldflags) is available
-   AC_MSG_CHECKING([openmpi, for mpicc])
-   OPENMPI_FOUND=0
-   MPICC="$with_openmpi/bin/mpicc" 
-        if test -x "$MPICC"; then
-                AC_MSG_RESULT([$MPICC])
-                               OPENMPI_CC=$MPICC
-                               OPENMPI_FOUND=1
-               fi
-   if test $OPENMPI_FOUND -eq 0; then
-   MPICC="$with_openmpi/mpicc" 
-        if test -x "$MPICC"; then
-                               OPENMPI_FOUND=1
-                               OPENMPI_CC=$MPICC
-                AC_MSG_RESULT([$MPICC])
-        fi
-   fi
-               if test $OPENMPI_FOUND -eq 0; then
-                AC_MSG_ERROR([Unable to find $MPICC. Please check the path you provided])
-               else
-                       unset OPENMPI_FOUND
-               fi
-else
+#   AC_MSG_CHECKING([openmpi, for mpicc])
+#   OPENMPI_FOUND=0
+#   MPICC="$with_openmpi/bin/mpicc" 
+#        if test -x "$MPICC"; then
+#                AC_MSG_RESULT([$MPICC])
+#                              OPENMPI_CC=$MPICC
+#                              OPENMPI_FOUND=1
+#              fi
+#   if test $OPENMPI_FOUND -eq 0; then
+#   MPICC="$with_openmpi/mpicc" 
+#        if test -x "$MPICC"; then
+#                              OPENMPI_FOUND=1
+#                              OPENMPI_CC=$MPICC
+#                AC_MSG_RESULT([$MPICC])
+#        fi
+#   fi
+#              if test $OPENMPI_FOUND -eq 0; then
+#                AC_MSG_ERROR([Unable to find $MPICC. Please check the path you provided])
+#              else
+#                      unset OPENMPI_FOUND
+#              fi
+#else
                AC_CHECK_PROGS(OPENMPI_CC,mpicc,no)
                if test "x$MPICC" = "xno"; then
                                AC_MSG_ERROR([Unable to find mpicc in the path. Please check your installation of openmpi (example : openmpi & openmpi-dev with Debian)])
                fi
-fi
+#fi
 saved_cflags=$CFLAGS
 saved_LIBS="$LIBS"
+
+CFLAGS=`$OPENMPI_CC --showme:compile`
+LIBS=`$OPENMPI_CC --showme:link`
+
 AC_CHECK_HEADER([mpi.h],
-       [],
+       [OPENMPI_CFLAGS=$CFLAGS],
        [AC_MSG_ERROR([Cannot find headers of the library OpenMPI. Please install the dev package (Debian : openmpi-dev)])])
 
 AC_CHECK_LIB([mpi], [MPI_Init],
-               [OPENMPI_LIBS="-lmpi"],
+               [OPENMPI_LIBS=$LIBS],
                [AC_MSG_ERROR([openmpi : library missing. (Cannot find symbol MPI_Init in -lmpi). Check if OpenMPI is installed])]
                )
 
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in

index 31f0756..f2f0e9b 100644 (file)
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -76,11 +76,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -295,6 +296,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -308,6 +310,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in

index f493c98..6ac82e1 100644 (file)
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -75,11 +75,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -260,6 +261,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -273,6 +275,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in

index f6ef894..5439794 100644 (file)
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -74,11 +74,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -254,6 +255,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -267,6 +269,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/api_scilab/help/en_US/string_reading_api.xml b/scilab/modules/api_scilab/help/en_US/string_reading_api.xml

index 0fbd376..44eebf8 100644 (file)
--- a/scilab/modules/api_scilab/help/en_US/string_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/string_reading_api.xml
@@ -151,13 +151,12 @@ int read_string(char *fname,unsigned long fname_len)
                return 0;
        }
 
-       //fisrt call to retrieve dimensions
-       sciErr = getMatrixOfString(pvApiCtx, piAddr, &iRows, &iCols, NULL, NULL);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
+    //first call to retrieve dimensions
+    iRet = getMatrixOfString(piAddr, &iRows, &iCols, NULL, NULL);
+    if(iRet)
+    {
+        return 1;
+    }
 
        piLen = (int*)malloc(sizeof(int) * iRows * iCols);
        //second call to retrieve length of each string
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in

index f793b69..26f7ffa 100644 (file)
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -276,6 +277,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -289,6 +291,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in

index 6455fc1..4eb1dc9 100644 (file)
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -73,11 +73,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -216,6 +217,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -229,6 +231,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in

index f347d2a..a9a6940 100644 (file)
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -255,6 +256,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -268,6 +270,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in

index 5528554..a746d36 100644 (file)
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -350,6 +351,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -363,6 +365,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in

index f33c23b..ee59a08 100644 (file)
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -72,11 +72,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -251,6 +252,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -264,6 +266,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in

index bb2862a..75e0177 100644 (file)
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -215,6 +216,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -228,6 +230,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in

index 4db1e61..f6a602e 100644 (file)
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -76,11 +76,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -277,6 +278,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -290,6 +292,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in

index f43d02b..afb4b94 100644 (file)
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -82,11 +82,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -289,6 +290,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -302,6 +304,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in

index 9ca2834..6e11c43 100644 (file)
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -82,11 +82,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -488,6 +489,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -501,6 +503,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/core/includes/version.h b/scilab/modules/core/includes/version.h

index 584be49..9dba5f8 100644 (file)
--- a/scilab/modules/core/includes/version.h
+++ b/scilab/modules/core/includes/version.h
@@ -15,7 +15,7 @@
 #define SCI_VERSION_MAJOR 5
 #define SCI_VERSION_MINOR 3
 #define SCI_VERSION_MAINTENANCE 0
-#define SCI_VERSION_STRING "scilab-branch-master"
+#define SCI_VERSION_STRING "scilab-branch-MPI"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in

index db730ff..ee36aa9 100644 (file)
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -286,6 +287,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -299,6 +301,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in

index 9d93e6a..c7fcb52 100644 (file)
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -69,11 +69,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -214,6 +215,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -227,6 +229,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in

index eb7a9b5..0d516ef 100644 (file)
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -69,11 +69,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -213,6 +214,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -226,6 +228,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in

index a7ebd30..801c021 100644 (file)
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -45,11 +45,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -164,6 +165,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -177,6 +179,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in

index 7f30a03..916815a 100644 (file)
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -297,6 +298,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -310,6 +312,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in

index 78375f6..cfa98eb 100644 (file)
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -255,6 +256,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -268,6 +270,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in

index 2fa5936..7b45ed7 100644 (file)
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -71,11 +71,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -272,6 +273,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -285,6 +287,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in

index 0b8ebaa..6922f20 100644 (file)
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -624,6 +625,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -637,6 +639,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in

index ccc1aba..0943cd6 100644 (file)
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -75,11 +75,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -274,6 +275,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -287,6 +289,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in

index d2c4abb..125ec00 100644 (file)
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -304,6 +305,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -317,6 +319,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in

index 16c74b3..a1c1f67 100644 (file)
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -266,6 +267,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -279,6 +281,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in

index 1072992..f844ee2 100644 (file)
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -73,11 +73,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -217,6 +218,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -230,6 +232,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in

index a159114..a5268ec 100644 (file)
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -78,11 +78,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -291,6 +292,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -304,6 +306,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in

index 33e31fb..12d48e3 100644 (file)
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -78,11 +78,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -626,6 +627,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -639,6 +641,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in

index febecbe..395e36b 100644 (file)
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -80,11 +80,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -379,6 +380,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -392,6 +394,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in

index bd4071a..7e0c8b1 100644 (file)
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -78,11 +78,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -304,6 +305,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -317,6 +319,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in

index a7cc5b3..3f3b0b9 100644 (file)
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -279,6 +280,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -292,6 +294,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in

index 6967183..bfc1f17 100644 (file)
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -75,11 +75,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -302,6 +303,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -315,6 +317,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in

index 2339d61..9301fb7 100644 (file)
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -290,6 +291,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -303,6 +305,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in

index 2f99e58..fe70488 100644 (file)
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -74,11 +74,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -272,6 +273,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -285,6 +287,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in

index 3a270bc..c81c8eb 100644 (file)
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -74,11 +74,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -255,6 +256,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -268,6 +270,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in

index f61578d..45393dd 100644 (file)
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -276,6 +277,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -289,6 +291,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in

index ec1655a..3ec05e1 100644 (file)
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -77,11 +77,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -267,6 +268,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -280,6 +282,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in

index a9f3b51..2cf8379 100644 (file)
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -80,11 +80,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -282,6 +283,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -295,6 +297,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in

index bf02621..ffdcdd0 100644 (file)
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -70,11 +70,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -292,6 +293,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -305,6 +307,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in

index 1e9da14..e11cb79 100644 (file)
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -80,11 +80,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -279,6 +280,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -292,6 +294,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in

index 5e62814..1603c4c 100644 (file)
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -69,11 +69,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -212,6 +213,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -225,6 +227,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in

index c3147cd..6c74419 100644 (file)
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -69,11 +69,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -212,6 +213,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -225,6 +227,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in

index 00fc52d..cda34d9 100644 (file)
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -71,11 +71,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -278,6 +279,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -291,6 +293,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in

index 7714359..6d1bcae 100644 (file)
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -71,11 +71,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -256,6 +257,7 @@ MATIO_CFLAGS = @MATIO_CFLAGS@
 MATIO_ENABLE = @MATIO_ENABLE@
 MATIO_LIBS = @MATIO_LIBS@
 MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
 MSGCAT = @MSGCAT@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -269,6 +271,9 @@ OCAMLDEP = @OCAMLDEP@
 OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
diff --git a/scilab/modules/mpi/Makefile.am b/scilab/modules/mpi/Makefile.am

new file mode 100644 (file)

index 0000000..5ba3cb6
--- /dev/null
+++ b/scilab/modules/mpi/Makefile.am
@@ -0,0 +1,107 @@
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU
+# Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+# List of the c files
+#MPI_C_SOURCES = src/c/s_mpi_irecv.c \
+#src/c/build_buff_type.c \
+#src/c/s_mpi_recv.c \
+#src/c/s_mpi_send.c \
+#src/c/s_mpi_isend.c
+
+
+# List of the fortran files
+#MPI_FORTRAN_SOURCES = src/fortran/intsmpi_isend.f \
+#src/fortran/intmpi.f \
+#src/fortran/intsmpi_send.f \
+#src/fortran/intsmpi_recv.f \
+#src/fortran/intsmpi_comm_rank.f \
+#src/fortran/intsmpi_irecv.f \
+#src/fortran/intsmpi_init.f \
+#src/fortran/intsmpi_finalize.f \
+#src/fortran/intsmpi_comm_size.f
+#src/fortran/mpi_init.f
+
+MPI_TEST_EXE_SOURCES = src/c/mpitest.c
+bin_PROGRAMS = mpitest mpi_pi
+mpitest_SOURCES = $(MPI_TEST_EXE_SOURCES)
+mpitest_LDFLAGS = $(OPENMPI_LIBS)
+
+
+MPI_PI_SOURCES = src/c/mpi_pi_send.c src/c/dboard.c
+mpi_pi_SOURCES = $(MPI_PI_SOURCES)
+mpi_pi_LDFLAGS = $(OPENMPI_LIBS)
+
+MPI_C_SOURCES = src/c/mappingScilabMPI.c
+
+# List of the gateway c files
+GATEWAY_C_SOURCES = sci_gateway/c/sci_mpi_init.c \
+sci_gateway/c/sci_mpi_finalize.c \
+sci_gateway/c/sci_mpi_comm_size.c \
+sci_gateway/c/sci_mpi_comm_rank.c \
+sci_gateway/c/gw_mpi.c \
+sci_gateway/c/sci_mpi_recv.c \
+sci_gateway/c/sci_mpi_send.c \
+src/c/build_buff_type.c \
+src/c/s_mpi_recv.c \
+src/c/s_mpi_send.c
+
+#sci_gateway/c/sci_mpi_isend.c \
+#sci_gateway/c/sci_mpi_irecv.c \
+#sci_gateway/c/sci_mpi_comm_rank.c \
+#sci_gateway/c/sci_mpi_comm_size.c
+
+
+# Includes need for the compilation
+# MPI code needs to be compile with the openmpi 'compiler' (it is a wrapper)
+CC = $(OPENMPI_CC)
+libscimpi_la_CFLAGS=  -Iincludes/ \
+       -Isrc/c/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -DDEBUG
+libscimpi_la_LDFLAGS = $(OPENMPI_LIBS)
+# $(LAMPI_LDFLAGS)
+
+# Name of the future library (.la will be replace by .so, .a, etc regarding 
+# the system)
+pkglib_LTLIBRARIES = libscimpi.la
+
+# All the sources needed by libscimpi.la
+libscimpi_la_SOURCES =   $(GATEWAY_C_SOURCES)  $(MPI_C_SOURCES)
+#$(GATEWAY_FORTRAN_SOURCES) $(MPI_FORTRAN_SOURCES)
+
+
+## Libraries necessary
+libscimpi_la_LIBADD = \
+       $(top_builddir)/modules/localization/libscilocalization.la \
+       $(top_builddir)/modules/core/libscicore.la
+#      $(top_builddir)/libs/MALLOC/libscimalloc.la
+
+#### Target ######
+
+#### mpi : Conf files ####
+libscimpi_la_rootdir = $(mydatadir)
+libscimpi_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
+
+#### mpi : init scripts #### 
+libscimpi_la_etcdir = $(mydatadir)/etc
+libscimpi_la_etc_DATA = etc/mpi.quit etc/mpi.start
+
+#### mpi : gateway declaration #### 
+libscimpi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscimpi_la_sci_gateway_DATA = sci_gateway/mpi_gateway.xml
+
+#### mpi : include files ####
+libscimpi_la_includedir=$(pkgincludedir)/mpi
+libscimpi_la_include_HEADERS = includes/gw_mpi.h
+
+# Provides macros compilation, Java compilation, cleaning
+include $(top_srcdir)/Makefile.incl.am
diff --git a/scilab/modules/mpi/Makefile.in b/scilab/modules/mpi/Makefile.in

new file mode 100644 (file)

index 0000000..4ae6201
--- /dev/null
+++ b/scilab/modules/mpi/Makefile.in
@@ -0,0 +1,1335 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU
+# Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+# List of the c files
+#MPI_C_SOURCES = src/c/s_mpi_irecv.c \
+#src/c/build_buff_type.c \
+#src/c/s_mpi_recv.c \
+#src/c/s_mpi_send.c \
+#src/c/s_mpi_isend.c
+
+# List of the fortran files
+#MPI_FORTRAN_SOURCES = src/fortran/intsmpi_isend.f \
+#src/fortran/intmpi.f \
+#src/fortran/intsmpi_send.f \
+#src/fortran/intsmpi_recv.f \
+#src/fortran/intsmpi_comm_rank.f \
+#src/fortran/intsmpi_irecv.f \
+#src/fortran/intsmpi_init.f \
+#src/fortran/intsmpi_finalize.f \
+#src/fortran/intsmpi_comm_size.f
+#src/fortran/mpi_init.f
+
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
+# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+##########
+### Makefile included stuff
+### Target, variable, suffixes which are supposed to be usefull in every makefile.am
+##########
+
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = mpitest$(EXEEXT) mpi_pi$(EXEEXT)
+DIST_COMMON = $(libscimpi_la_include_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am TODO
+@NEED_JAVA_TRUE@am__append_1 = java
+subdir = modules/mpi
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
+       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
+       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
+       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
+       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(libscimpi_la_etcdir)" \
+       "$(DESTDIR)$(libscimpi_la_rootdir)" \
+       "$(DESTDIR)$(libscimpi_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libscimpi_la_includedir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+libscimpi_la_DEPENDENCIES =  \
+       $(top_builddir)/modules/localization/libscilocalization.la \
+       $(top_builddir)/modules/core/libscicore.la
+am__objects_1 = libscimpi_la-sci_mpi_init.lo \
+       libscimpi_la-sci_mpi_finalize.lo \
+       libscimpi_la-sci_mpi_comm_size.lo \
+       libscimpi_la-sci_mpi_comm_rank.lo libscimpi_la-gw_mpi.lo \
+       libscimpi_la-sci_mpi_recv.lo libscimpi_la-sci_mpi_send.lo \
+       libscimpi_la-build_buff_type.lo libscimpi_la-s_mpi_recv.lo \
+       libscimpi_la-s_mpi_send.lo
+am__objects_2 = libscimpi_la-mappingScilabMPI.lo
+am_libscimpi_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+libscimpi_la_OBJECTS = $(am_libscimpi_la_OBJECTS)
+libscimpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimpi_la_CFLAGS) \
+       $(CFLAGS) $(libscimpi_la_LDFLAGS) $(LDFLAGS) -o $@
+PROGRAMS = $(bin_PROGRAMS)
+am__objects_3 = mpi_pi_send.$(OBJEXT) dboard.$(OBJEXT)
+am_mpi_pi_OBJECTS = $(am__objects_3)
+mpi_pi_OBJECTS = $(am_mpi_pi_OBJECTS)
+mpi_pi_LDADD = $(LDADD)
+mpi_pi_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpi_pi_LDFLAGS) \
+       $(LDFLAGS) -o $@
+am__objects_4 = mpitest.$(OBJEXT)
+am_mpitest_OBJECTS = $(am__objects_4)
+mpitest_OBJECTS = $(am_mpitest_OBJECTS)
+mpitest_LDADD = $(LDADD)
+mpitest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpitest_LDFLAGS) \
+       $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
+SOURCES = $(libscimpi_la_SOURCES) $(mpi_pi_SOURCES) $(mpitest_SOURCES)
+DIST_SOURCES = $(libscimpi_la_SOURCES) $(mpi_pi_SOURCES) \
+       $(mpitest_SOURCES)
+DATA = $(libscimpi_la_etc_DATA) $(libscimpi_la_root_DATA) \
+       $(libscimpi_la_sci_gateway_DATA)
+HEADERS = $(libscimpi_la_include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+ANT = @ANT@
+ANTLR = @ANTLR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
+AWK = @AWK@
+BATIK = @BATIK@
+BLAS_LIBS = @BLAS_LIBS@
+
+#sci_gateway/c/sci_mpi_isend.c \
+#sci_gateway/c/sci_mpi_irecv.c \
+#sci_gateway/c/sci_mpi_comm_rank.c \
+#sci_gateway/c/sci_mpi_comm_size.c
+
+# Includes need for the compilation
+# MPI code needs to be compile with the openmpi 'compiler' (it is a wrapper)
+CC = $(OPENMPI_CC)
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKSTYLE = @CHECKSTYLE@
+COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
+COMMONS_IO = @COMMONS_IO@
+COMMONS_LOGGING = @COMMONS_LOGGING@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
+DEPDIR = @DEPDIR@
+DOCBOOK_ROOT = @DOCBOOK_ROOT@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FFTW3_LIB = @FFTW3_LIB@
+FFTW_ENABLE = @FFTW_ENABLE@
+FGREP = @FGREP@
+FLEXDOCK = @FLEXDOCK@
+FLIBS = @FLIBS@
+FOP = @FOP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIWS_BIN = @GIWS_BIN@
+GLUEGEN_RT = @GLUEGEN_RT@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
+GREP = @GREP@
+GUI_ENABLE = @GUI_ENABLE@
+HDF5_CFLAGS = @HDF5_CFLAGS@
+HDF5_ENABLE = @HDF5_ENABLE@
+HDF5_LIBS = @HDF5_LIBS@
+HELP_ENABLE = @HELP_ENABLE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JAR = @JAR@
+JAVA = @JAVA@
+JAVAC = @JAVAC@
+JAVAH = @JAVAH@
+JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
+JAVA_ENABLE = @JAVA_ENABLE@
+JAVA_G = @JAVA_G@
+JAVA_HOME = @JAVA_HOME@
+JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
+JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
+JDB = @JDB@
+JEUCLID_CORE = @JEUCLID_CORE@
+JGRAPHX = @JGRAPHX@
+JHALL = @JHALL@
+JHDF5 = @JHDF5@
+JLATEXMATH = @JLATEXMATH@
+JOGL = @JOGL@
+JROSETTA_API = @JROSETTA_API@
+JROSETTA_ENGINE = @JROSETTA_ENGINE@
+LAPACK_LIBS = @LAPACK_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOOKS = @LOOKS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MATIO_CFLAGS = @MATIO_CFLAGS@
+MATIO_ENABLE = @MATIO_ENABLE@
+MATIO_LIBS = @MATIO_LIBS@
+MKDIR_P = @MKDIR_P@
+MPI_ENABLE = @MPI_ENABLE@
+MSGCAT = @MSGCAT@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OCAMLC = @OCAMLC@
+OCAMLDEP = @OCAMLDEP@
+OCAMLLEX = @OCAMLLEX@
+OCAMLOPT = @OCAMLOPT@
+OCAMLYACC = @OCAMLYACC@
+OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_LIBS = @OPENMPI_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CFLAGS = @PCRE_CFLAGS@
+PCRE_CONFIG = @PCRE_CONFIG@
+PCRE_LIBS = @PCRE_LIBS@
+PCRE_VERSION = @PCRE_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+POW_LIB = @POW_LIB@
+PVMGETARCH = @PVMGETARCH@
+PVM_ARCH = @PVM_ARCH@
+PVM_ENABLE = @PVM_ENABLE@
+PVM_INCLUDE = @PVM_INCLUDE@
+PVM_LIB = @PVM_LIB@
+PYTHON = @PYTHON@
+RANLIB = @RANLIB@
+RELOCATABLE = @RELOCATABLE@
+RT_LIB = @RT_LIB@
+SAXON = @SAXON@
+SCICOS_ENABLE = @SCICOS_ENABLE@
+SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SET_RELOCATABLE = @SET_RELOCATABLE@
+SHELL = @SHELL@
+SKINLF = @SKINLF@
+SPLINT = @SPLINT@
+STRIP = @STRIP@
+SWIG_BIN = @SWIG_BIN@
+SWIG_JAVA = @SWIG_JAVA@
+SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
+TCLTK_LIBS = @TCLTK_LIBS@
+TCL_INC_PATH = @TCL_INC_PATH@
+TK_INC_PATH = @TK_INC_PATH@
+UMFPACK_ENABLE = @UMFPACK_ENABLE@
+UMFPACK_LIB = @UMFPACK_LIB@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_OCAML = @WITH_OCAML@
+WITH_TKSCI = @WITH_TKSCI@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XMKMF = @XMKMF@
+XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
+XML_APIS_EXT = @XML_APIS_EXT@
+XML_CONFIG = @XML_CONFIG@
+XML_FLAGS = @XML_FLAGS@
+XML_LIBS = @XML_LIBS@
+XML_VERSION = @XML_VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cxx_present = @cxx_present@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MPI_TEST_EXE_SOURCES = src/c/mpitest.c
+mpitest_SOURCES = $(MPI_TEST_EXE_SOURCES)
+mpitest_LDFLAGS = $(OPENMPI_LIBS)
+MPI_PI_SOURCES = src/c/mpi_pi_send.c src/c/dboard.c
+mpi_pi_SOURCES = $(MPI_PI_SOURCES)
+mpi_pi_LDFLAGS = $(OPENMPI_LIBS)
+MPI_C_SOURCES = src/c/mappingScilabMPI.c
+
+# List of the gateway c files
+GATEWAY_C_SOURCES = sci_gateway/c/sci_mpi_init.c \
+sci_gateway/c/sci_mpi_finalize.c \
+sci_gateway/c/sci_mpi_comm_size.c \
+sci_gateway/c/sci_mpi_comm_rank.c \
+sci_gateway/c/gw_mpi.c \
+sci_gateway/c/sci_mpi_recv.c \
+sci_gateway/c/sci_mpi_send.c \
+src/c/build_buff_type.c \
+src/c/s_mpi_recv.c \
+src/c/s_mpi_send.c
+
+libscimpi_la_CFLAGS = -Iincludes/ \
+       -Isrc/c/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -DDEBUG
+
+libscimpi_la_LDFLAGS = $(OPENMPI_LIBS)
+# $(LAMPI_LDFLAGS)
+
+# Name of the future library (.la will be replace by .so, .a, etc regarding 
+# the system)
+pkglib_LTLIBRARIES = libscimpi.la
+
+# All the sources needed by libscimpi.la
+libscimpi_la_SOURCES = $(GATEWAY_C_SOURCES)  $(MPI_C_SOURCES)
+#$(GATEWAY_FORTRAN_SOURCES) $(MPI_FORTRAN_SOURCES)
+libscimpi_la_LIBADD = \
+       $(top_builddir)/modules/localization/libscilocalization.la \
+       $(top_builddir)/modules/core/libscicore.la
+
+#      $(top_builddir)/libs/MALLOC/libscimalloc.la
+
+#### Target ######
+
+#### mpi : Conf files ####
+libscimpi_la_rootdir = $(mydatadir)
+libscimpi_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
+
+#### mpi : init scripts #### 
+libscimpi_la_etcdir = $(mydatadir)/etc
+libscimpi_la_etc_DATA = etc/mpi.quit etc/mpi.start
+
+#### mpi : gateway declaration #### 
+libscimpi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscimpi_la_sci_gateway_DATA = sci_gateway/mpi_gateway.xml
+
+#### mpi : include files ####
+libscimpi_la_includedir = $(pkgincludedir)/mpi
+libscimpi_la_include_HEADERS = includes/gw_mpi.h
+
+# Where all the Scilab stuff is installed (macros, help, ...)
+mydatadir = $(pkgdatadir)/modules/$(modulename)
+
+# splint options
+SPLINT_OPTIONS = -weak -booltype BOOL
+
+########################### JAVA ######################################
+#### We are delegating java compilation to ant... Thanks to that
+#### the procedure will be the same with Microsoft Windows (C)
+#### and Linux/Unix
+#######################################################################
+TARGETS_ALL = $(am__append_1)
+
+################ MACROS ######################
+# Rule to build a macro
+# NOT USED  AT THE MOMENT
+SUFFIXES = .sci 
+
+########### INSTALL DOCUMENTATION ###################
+
+# Install documentation files into the right target
+# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
+# automake needs the html files to be present which is not the case when
+# we are building Scilab
+
+# Where it should be installed
+pkgdocdir = $(mydatadir)
+
+# What is the mask of the help source
+DOCMASKXML = *.xml
+
+# What is the mask of the MathML sources
+DOCMASKMML = *.mml
+
+########### INSTALL DATA ###################
+# Install macros, help & demos
+# Where it should be installed
+pkgmacrosdir = $(mydatadir)
+# Which directory we process
+MACRODIRS = macros/
+# Mask of the Scilab sources macros
+MACROMASK = *.sci
+# Mask of the Scilab executable sources macros
+MACROBUILDMASK = *.sce
+# Mask of the Scilab compiled macros
+MACROBINMASK = *.bin
+# List of the standard directory for tests
+TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
+# Where the demos should be installed
+pkgdemosdir = $(mydatadir)
+# List of the standard directory for demos
+DEMOS_DIR = demos
+# List of the standard directory for examples
+EXAMPLES_DIR = examples
+# Where to export JAVA archives (.jar)
+JARDIR = jar/
+# JAR files mask
+JARMASK = *.jar
+# Chapter file 
+HELP_CHAPTERDIR = help/
+HELP_CHAPTERFILE = addchapter.sce
+HELP_CHAPTERLANG = en_US fr_FR pt_BR
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .sci .bin .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+               && { if test -f $@; then exit 0; else break; fi; }; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/mpi/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign modules/mpi/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+       list2=; for p in $$list; do \
+         if test -f $$p; then \
+           list2="$$list2 $$p"; \
+         else :; fi; \
+       done; \
+       test -z "$$list2" || { \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+       }
+
+uninstall-pkglibLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+       done
+
+clean-pkglibLTLIBRARIES:
+       -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+       @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
+libscimpi.la: $(libscimpi_la_OBJECTS) $(libscimpi_la_DEPENDENCIES) 
+       $(libscimpi_la_LINK) -rpath $(pkglibdir) $(libscimpi_la_OBJECTS) $(libscimpi_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+       for p in $$list; do echo "$$p $$p"; done | \
+       sed 's/$(EXEEXT)$$//' | \
+       while read p p1; do if test -f $$p || test -f $$p1; \
+         then echo "$$p"; echo "$$p"; else :; fi; \
+       done | \
+       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+       sed 'N;N;N;s,\n, ,g' | \
+       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+           if ($$2 == $$4) files[d] = files[d] " " $$1; \
+           else { print "f", $$3 "/" $$4, $$1; } } \
+         END { for (d in files) print "f", d, files[d] }' | \
+       while read type dir files; do \
+           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+           test -z "$$files" || { \
+           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+           } \
+       ; done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+       files=`for p in $$list; do echo "$$p"; done | \
+         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+             -e 's/$$/$(EXEEXT)/' `; \
+       test -n "$$list" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+       @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+       echo " rm -f" $$list; \
+       rm -f $$list || exit $$?; \
+       test -n "$(EXEEXT)" || exit 0; \
+       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+       echo " rm -f" $$list; \
+       rm -f $$list
+mpi_pi$(EXEEXT): $(mpi_pi_OBJECTS) $(mpi_pi_DEPENDENCIES) 
+       @rm -f mpi_pi$(EXEEXT)
+       $(mpi_pi_LINK) $(mpi_pi_OBJECTS) $(mpi_pi_LDADD) $(LIBS)
+mpitest$(EXEEXT): $(mpitest_OBJECTS) $(mpitest_DEPENDENCIES) 
+       @rm -f mpitest$(EXEEXT)
+       $(mpitest_LINK) $(mpitest_OBJECTS) $(mpitest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dboard.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-build_buff_type.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-gw_mpi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-mappingScilabMPI.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-s_mpi_recv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-s_mpi_send.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_finalize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_recv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_send.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pi_send.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpitest.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
+
+libscimpi_la-sci_mpi_init.lo: sci_gateway/c/sci_mpi_init.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_init.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_init.Tpo -c -o libscimpi_la-sci_mpi_init.lo `test -f 'sci_gateway/c/sci_mpi_init.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_init.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_init.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_init.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mpi_init.c' object='libscimpi_la-sci_mpi_init.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_init.lo `test -f 'sci_gateway/c/sci_mpi_init.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_init.c
+
+libscimpi_la-sci_mpi_finalize.lo: sci_gateway/c/sci_mpi_finalize.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_finalize.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_finalize.Tpo -c -o libscimpi_la-sci_mpi_finalize.lo `test -f 'sci_gateway/c/sci_mpi_finalize.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_finalize.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_finalize.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_finalize.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mpi_finalize.c' object='libscimpi_la-sci_mpi_finalize.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_finalize.lo `test -f 'sci_gateway/c/sci_mpi_finalize.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_finalize.c
+
+libscimpi_la-sci_mpi_comm_size.lo: sci_gateway/c/sci_mpi_comm_size.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_comm_size.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Tpo -c -o libscimpi_la-sci_mpi_comm_size.lo `test -f 'sci_gateway/c/sci_mpi_comm_size.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_size.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mpi_comm_size.c' object='libscimpi_la-sci_mpi_comm_size.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_comm_size.lo `test -f 'sci_gateway/c/sci_mpi_comm_size.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_size.c
+
+libscimpi_la-sci_mpi_comm_rank.lo: sci_gateway/c/sci_mpi_comm_rank.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_comm_rank.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Tpo -c -o libscimpi_la-sci_mpi_comm_rank.lo `test -f 'sci_gateway/c/sci_mpi_comm_rank.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_rank.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mpi_comm_rank.c' object='libscimpi_la-sci_mpi_comm_rank.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_comm_rank.lo `test -f 'sci_gateway/c/sci_mpi_comm_rank.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_rank.c
+
+libscimpi_la-gw_mpi.lo: sci_gateway/c/gw_mpi.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-gw_mpi.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-gw_mpi.Tpo -c -o libscimpi_la-gw_mpi.lo `test -f 'sci_gateway/c/gw_mpi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_mpi.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-gw_mpi.Tpo $(DEPDIR)/libscimpi_la-gw_mpi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_mpi.c' object='libscimpi_la-gw_mpi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-gw_mpi.lo `test -f 'sci_gateway/c/gw_mpi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_mpi.c
+
+libscimpi_la-sci_mpi_recv.lo: sci_gateway/c/sci_mpi_recv.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_recv.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_recv.Tpo -c -o libscimpi_la-sci_mpi_recv.lo `test -f 'sci_gateway/c/sci_mpi_recv.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_recv.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_recv.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_recv.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mpi_recv.c' object='libscimpi_la-sci_mpi_recv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_recv.lo `test -f 'sci_gateway/c/sci_mpi_recv.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_recv.c
+
+libscimpi_la-sci_mpi_send.lo: sci_gateway/c/sci_mpi_send.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_send.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_send.Tpo -c -o libscimpi_la-sci_mpi_send.lo `test -f 'sci_gateway/c/sci_mpi_send.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_send.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_send.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_send.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mpi_send.c' object='libscimpi_la-sci_mpi_send.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_send.lo `test -f 'sci_gateway/c/sci_mpi_send.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_send.c
+
+libscimpi_la-build_buff_type.lo: src/c/build_buff_type.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-build_buff_type.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-build_buff_type.Tpo -c -o libscimpi_la-build_buff_type.lo `test -f 'src/c/build_buff_type.c' || echo '$(srcdir)/'`src/c/build_buff_type.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-build_buff_type.Tpo $(DEPDIR)/libscimpi_la-build_buff_type.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/build_buff_type.c' object='libscimpi_la-build_buff_type.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-build_buff_type.lo `test -f 'src/c/build_buff_type.c' || echo '$(srcdir)/'`src/c/build_buff_type.c
+
+libscimpi_la-s_mpi_recv.lo: src/c/s_mpi_recv.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-s_mpi_recv.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-s_mpi_recv.Tpo -c -o libscimpi_la-s_mpi_recv.lo `test -f 'src/c/s_mpi_recv.c' || echo '$(srcdir)/'`src/c/s_mpi_recv.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-s_mpi_recv.Tpo $(DEPDIR)/libscimpi_la-s_mpi_recv.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/s_mpi_recv.c' object='libscimpi_la-s_mpi_recv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-s_mpi_recv.lo `test -f 'src/c/s_mpi_recv.c' || echo '$(srcdir)/'`src/c/s_mpi_recv.c
+
+libscimpi_la-s_mpi_send.lo: src/c/s_mpi_send.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-s_mpi_send.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-s_mpi_send.Tpo -c -o libscimpi_la-s_mpi_send.lo `test -f 'src/c/s_mpi_send.c' || echo '$(srcdir)/'`src/c/s_mpi_send.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-s_mpi_send.Tpo $(DEPDIR)/libscimpi_la-s_mpi_send.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/s_mpi_send.c' object='libscimpi_la-s_mpi_send.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-s_mpi_send.lo `test -f 'src/c/s_mpi_send.c' || echo '$(srcdir)/'`src/c/s_mpi_send.c
+
+libscimpi_la-mappingScilabMPI.lo: src/c/mappingScilabMPI.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-mappingScilabMPI.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-mappingScilabMPI.Tpo -c -o libscimpi_la-mappingScilabMPI.lo `test -f 'src/c/mappingScilabMPI.c' || echo '$(srcdir)/'`src/c/mappingScilabMPI.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscimpi_la-mappingScilabMPI.Tpo $(DEPDIR)/libscimpi_la-mappingScilabMPI.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mappingScilabMPI.c' object='libscimpi_la-mappingScilabMPI.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-mappingScilabMPI.lo `test -f 'src/c/mappingScilabMPI.c' || echo '$(srcdir)/'`src/c/mappingScilabMPI.c
+
+mpi_pi_send.o: src/c/mpi_pi_send.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pi_send.o -MD -MP -MF $(DEPDIR)/mpi_pi_send.Tpo -c -o mpi_pi_send.o `test -f 'src/c/mpi_pi_send.c' || echo '$(srcdir)/'`src/c/mpi_pi_send.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/mpi_pi_send.Tpo $(DEPDIR)/mpi_pi_send.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mpi_pi_send.c' object='mpi_pi_send.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pi_send.o `test -f 'src/c/mpi_pi_send.c' || echo '$(srcdir)/'`src/c/mpi_pi_send.c
+
+mpi_pi_send.obj: src/c/mpi_pi_send.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpi_pi_send.obj -MD -MP -MF $(DEPDIR)/mpi_pi_send.Tpo -c -o mpi_pi_send.obj `if test -f 'src/c/mpi_pi_send.c'; then $(CYGPATH_W) 'src/c/mpi_pi_send.c'; else $(CYGPATH_W) '$(srcdir)/src/c/mpi_pi_send.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/mpi_pi_send.Tpo $(DEPDIR)/mpi_pi_send.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mpi_pi_send.c' object='mpi_pi_send.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpi_pi_send.obj `if test -f 'src/c/mpi_pi_send.c'; then $(CYGPATH_W) 'src/c/mpi_pi_send.c'; else $(CYGPATH_W) '$(srcdir)/src/c/mpi_pi_send.c'; fi`
+
+dboard.o: src/c/dboard.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dboard.o -MD -MP -MF $(DEPDIR)/dboard.Tpo -c -o dboard.o `test -f 'src/c/dboard.c' || echo '$(srcdir)/'`src/c/dboard.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/dboard.Tpo $(DEPDIR)/dboard.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/dboard.c' object='dboard.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dboard.o `test -f 'src/c/dboard.c' || echo '$(srcdir)/'`src/c/dboard.c
+
+dboard.obj: src/c/dboard.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dboard.obj -MD -MP -MF $(DEPDIR)/dboard.Tpo -c -o dboard.obj `if test -f 'src/c/dboard.c'; then $(CYGPATH_W) 'src/c/dboard.c'; else $(CYGPATH_W) '$(srcdir)/src/c/dboard.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/dboard.Tpo $(DEPDIR)/dboard.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/dboard.c' object='dboard.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dboard.obj `if test -f 'src/c/dboard.c'; then $(CYGPATH_W) 'src/c/dboard.c'; else $(CYGPATH_W) '$(srcdir)/src/c/dboard.c'; fi`
+
+mpitest.o: src/c/mpitest.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpitest.o -MD -MP -MF $(DEPDIR)/mpitest.Tpo -c -o mpitest.o `test -f 'src/c/mpitest.c' || echo '$(srcdir)/'`src/c/mpitest.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/mpitest.Tpo $(DEPDIR)/mpitest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mpitest.c' object='mpitest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpitest.o `test -f 'src/c/mpitest.c' || echo '$(srcdir)/'`src/c/mpitest.c
+
+mpitest.obj: src/c/mpitest.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpitest.obj -MD -MP -MF $(DEPDIR)/mpitest.Tpo -c -o mpitest.obj `if test -f 'src/c/mpitest.c'; then $(CYGPATH_W) 'src/c/mpitest.c'; else $(CYGPATH_W) '$(srcdir)/src/c/mpitest.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/mpitest.Tpo $(DEPDIR)/mpitest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mpitest.c' object='mpitest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpitest.obj `if test -f 'src/c/mpitest.c'; then $(CYGPATH_W) 'src/c/mpitest.c'; else $(CYGPATH_W) '$(srcdir)/src/c/mpitest.c'; fi`
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+install-libscimpi_la_etcDATA: $(libscimpi_la_etc_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(libscimpi_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscimpi_la_etcdir)"
+       @list='$(libscimpi_la_etc_DATA)'; test -n "$(libscimpi_la_etcdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscimpi_la_etcdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(libscimpi_la_etcdir)" || exit $$?; \
+       done
+
+uninstall-libscimpi_la_etcDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscimpi_la_etc_DATA)'; test -n "$(libscimpi_la_etcdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscimpi_la_etcdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscimpi_la_etcdir)" && rm -f $$files
+install-libscimpi_la_rootDATA: $(libscimpi_la_root_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(libscimpi_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscimpi_la_rootdir)"
+       @list='$(libscimpi_la_root_DATA)'; test -n "$(libscimpi_la_rootdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscimpi_la_rootdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(libscimpi_la_rootdir)" || exit $$?; \
+       done
+
+uninstall-libscimpi_la_rootDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscimpi_la_root_DATA)'; test -n "$(libscimpi_la_rootdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscimpi_la_rootdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscimpi_la_rootdir)" && rm -f $$files
+install-libscimpi_la_sci_gatewayDATA: $(libscimpi_la_sci_gateway_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(libscimpi_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscimpi_la_sci_gatewaydir)"
+       @list='$(libscimpi_la_sci_gateway_DATA)'; test -n "$(libscimpi_la_sci_gatewaydir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscimpi_la_sci_gatewaydir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(libscimpi_la_sci_gatewaydir)" || exit $$?; \
+       done
+
+uninstall-libscimpi_la_sci_gatewayDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscimpi_la_sci_gateway_DATA)'; test -n "$(libscimpi_la_sci_gatewaydir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscimpi_la_sci_gatewaydir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscimpi_la_sci_gatewaydir)" && rm -f $$files
+install-libscimpi_la_includeHEADERS: $(libscimpi_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(libscimpi_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscimpi_la_includedir)"
+       @list='$(libscimpi_la_include_HEADERS)'; test -n "$(libscimpi_la_includedir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscimpi_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscimpi_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libscimpi_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscimpi_la_include_HEADERS)'; test -n "$(libscimpi_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(libscimpi_la_includedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libscimpi_la_includedir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       set x; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$unique; \
+         fi; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+         else \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+       $(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
+               all-local
+installdirs:
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libscimpi_la_etcdir)" "$(DESTDIR)$(libscimpi_la_rootdir)" "$(DESTDIR)$(libscimpi_la_sci_gatewaydir)" "$(DESTDIR)$(libscimpi_la_includedir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
+       clean-pkglibLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-local distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local install-libscimpi_la_etcDATA \
+       install-libscimpi_la_includeHEADERS \
+       install-libscimpi_la_rootDATA \
+       install-libscimpi_la_sci_gatewayDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am: install-html-local
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-libscimpi_la_etcDATA \
+       uninstall-libscimpi_la_includeHEADERS \
+       uninstall-libscimpi_la_rootDATA \
+       uninstall-libscimpi_la_sci_gatewayDATA \
+       uninstall-pkglibLTLIBRARIES
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+       clean clean-binPROGRAMS clean-generic clean-libtool \
+       clean-local clean-pkglibLTLIBRARIES ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-local distclean-tags distdir dvi dvi-am html html-am \
+       info info-am install install-am install-binPROGRAMS \
+       install-data install-data-am install-data-local install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-html-local install-info \
+       install-info-am install-libscimpi_la_etcDATA \
+       install-libscimpi_la_includeHEADERS \
+       install-libscimpi_la_rootDATA \
+       install-libscimpi_la_sci_gatewayDATA install-man install-pdf \
+       install-pdf-am install-pkglibLTLIBRARIES install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am uninstall-binPROGRAMS \
+       uninstall-libscimpi_la_etcDATA \
+       uninstall-libscimpi_la_includeHEADERS \
+       uninstall-libscimpi_la_rootDATA \
+       uninstall-libscimpi_la_sci_gatewayDATA \
+       uninstall-pkglibLTLIBRARIES
+
+
+# This target enables tests for Scilab
+check-local: $(top_builddir)/scilab-bin
+       @COMMAND="test_run('$(modulename)');quit";\
+       export LANG=C;\
+       $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
+check-code:
+       if test -f build.xml; then \
+               $(ANT) checkstyle; \
+       fi
+       if test -x "$(SPLINT)"; then \
+               $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
+       fi
+@NEED_JAVA_TRUE@java:
+# Some configurations needs to export JAVA_HOME in the current env
+@NEED_JAVA_TRUE@       @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
+@NEED_JAVA_TRUE@       if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
+@NEED_JAVA_TRUE@       if test -f build.xml -a $$USEANT -eq 1; then \
+@NEED_JAVA_TRUE@               $(ANT); \
+@NEED_JAVA_TRUE@       fi
+
+@NEED_JAVA_TRUE@clean-java:
+# Some configurations needs to export JAVA_HOME in the current env
+@NEED_JAVA_TRUE@       @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
+@NEED_JAVA_TRUE@       if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
+@NEED_JAVA_TRUE@       if test -f build.xml -a $$USEANT -eq 1; then \
+@NEED_JAVA_TRUE@               $(ANT) clean; \
+@NEED_JAVA_TRUE@       fi;
+
+# If the user request for the SWIG generation of the wrappers Java => C/C++ 
+# We call the target swig-build on the variable SWIG_WRAPPERS
+
+@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
+@SWIG_TRUE@    @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
+@SWIG_TRUE@    SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
+@SWIG_TRUE@    if test -n "$(SWIG_WRAPPERS)"; then \
+@SWIG_TRUE@            for file in $(SWIG_WRAPPERS) ; do \
+@SWIG_TRUE@                    echo "Swig process of $$file ..."; \
+@SWIG_TRUE@                    $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
+@SWIG_TRUE@            done; \
+@SWIG_TRUE@    fi
+
+# If the user request for the SWIG generation of the wrappers Java => C/C++ 
+# We call the target swig-build on the variable SWIG_WRAPPERS
+
+@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
+@GIWS_TRUE@    @GIWS_OUTPUTDIR=src/jni/;\
+@GIWS_TRUE@    if test -n "$(GIWS_WRAPPERS)"; then \
+@GIWS_TRUE@            for file in $(GIWS_WRAPPERS) ; do \
+@GIWS_TRUE@                    echo "GIWS process of $$file ..."; \
+@GIWS_TRUE@                    $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
+@GIWS_TRUE@            done; \
+@GIWS_TRUE@    fi
+
+macros:
+       -@( if test ! -x $(top_builddir)/scilab-bin; then \
+               echo "Error : Cannot build $< : Scilab has not been built"; \
+       else \
+               $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
+       fi)
+
+# Removes the macros
+clean-macros:
+# Removes macros (*.bin generated from .sci)
+       @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
+               echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
+               rm -f $(builddir)/$$dir/$(MACROBINMASK); \
+       done
+
+all-local: $(TARGETS_ALL)
+
+.sci.bin:
+       -@( if test ! -x $(top_builddir)/scilab-bin; then \
+       echo "Error : Cannot build $< : Scilab has not been build"; \
+       else \
+       echo "Creating $@"; \
+       $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
+       fi )
+
+install-html-local:
+# If the user wants the help sources to be installed
+@INSTALL_HELP_XML_TRUE@        @echo "-------- Install of XML sources of help files --------"; \
+@INSTALL_HELP_XML_TRUE@        for lang in $(ALL_LINGUAS); do \
+@INSTALL_HELP_XML_TRUE@         if test -d $(srcdir)/help/$$lang; then \
+@INSTALL_HELP_XML_TRUE@          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
+@INSTALL_HELP_XML_TRUE@                if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
+@INSTALL_HELP_XML_TRUE@                  for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
+@INSTALL_HELP_XML_TRUE@                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
+@INSTALL_HELP_XML_TRUE@                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
+@INSTALL_HELP_XML_TRUE@                  done ; \
+@INSTALL_HELP_XML_TRUE@                fi; \
+@INSTALL_HELP_XML_TRUE@         fi; \
+@INSTALL_HELP_XML_TRUE@        done; \
+@INSTALL_HELP_XML_TRUE@        @echo "-------- Install of MathML sources --------"; \
+@INSTALL_HELP_XML_TRUE@         if test -d $(srcdir)/help/mml/; then \
+@INSTALL_HELP_XML_TRUE@          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
+@INSTALL_HELP_XML_TRUE@                if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
+@INSTALL_HELP_XML_TRUE@                  for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
+@INSTALL_HELP_XML_TRUE@                    echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
+@INSTALL_HELP_XML_TRUE@                $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
+@INSTALL_HELP_XML_TRUE@                  done ; \
+@INSTALL_HELP_XML_TRUE@                fi; \
+@INSTALL_HELP_XML_TRUE@        fi
+install-data-local:
+# Install the tests
+       @echo "-------- Install tests (if any) --------"; \
+       for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
+         if test -d $(srcdir)/$$dir/; then \
+           $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
+                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
+                   if test -d "$(srcdir)/$$dir/$$file"; then \
+                         echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
+                         $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
+                   else \
+                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
+                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
+                   fi \
+                 done; \
+         fi; \
+       done
+# Install the help chapter
+       @echo "-------- Install the help chapter (if any) --------"; \
+       for lang in $(HELP_CHAPTERLANG); do \
+               HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
+               if test -f $$HELPFILE; then \
+                       echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
+                       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
+                       echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
+                       $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
+               fi; \
+       done
+# Install the demos & examples
+       @echo "-------- Install demos & examples (if any) --------"; \
+       for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
+         if test -d $(srcdir)/$$dir/; then \
+           $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
+                 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
+                   if test -d "$(srcdir)/$$dir/$$file"; then \
+                         echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
+                         $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
+                   else \
+                     echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
+                 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
+                   fi \
+                 done; \
+         fi; \
+       done
+# Install the macros
+       @echo "-------- Install macros (if any) --------"; \
+       for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
+         $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
+               if test -d $(srcdir)/$$dir/; then \
+                       FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
+                       if test -n "$(MACROSSPECIALEXT)"; then \
+                               for specialExt in $(MACROSSPECIALEXT); do \
+                                       specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
+                               done; \
+                               FILELIST="$$FILELIST $$specialExtDir"; \
+                       fi; \
+                 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
+                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
+               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
+                 done; \
+               fi; \
+       done
+# Install java files (.jar)
+       @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
+       echo "-------- Install jar files --------"; \
+    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
+         for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
+                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
+               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
+         done ; \
+       fi
+
+########### CLEAN ###################
+# Clean macros and help (generated automatically by Scilab)
+@NEED_JAVA_TRUE@clean-local: clean-java clean-macros
+@NEED_JAVA_FALSE@clean-local: clean-macros
+
+distclean-local:
+       rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
+
+.PHONY: macros java swig giws
+
+# Provides macros compilation, Java compilation, cleaning
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/scilab/modules/mpi/TODO b/scilab/modules/mpi/TODO

new file mode 100644 (file)

index 0000000..bd6394a
--- /dev/null
+++ b/scilab/modules/mpi/TODO
@@ -0,0 +1,10 @@
+Mandatory functions :
+
+mpi_init
+MPI_Comm_rank
+MPI_Comm_size
+MPI_Send
+MPI_Recv
+
+MPI_Reduce
+MPI_Finalize
\ No newline at end of file
diff --git a/scilab/modules/mpi/VERSION b/scilab/modules/mpi/VERSION

new file mode 100644 (file)

index 0000000..49d5957
--- /dev/null
+++ b/scilab/modules/mpi/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/scilab/modules/mpi/changelog.txt b/scilab/modules/mpi/changelog.txt

new file mode 100644 (file)

index 0000000..4768956
--- /dev/null
+++ b/scilab/modules/mpi/changelog.txt
@@ -0,0 +1,6 @@
+module_skeleton (0.1-1) stable; urgency=medium
+
+  * First version of the module
+
+ -- Sylvestre Ledru <sylvestre.ledru@inria.fr>  Tue, 13 Mar 2007 13:37:08D +0200
+
diff --git a/scilab/modules/mpi/etc/mpi.quit b/scilab/modules/mpi/etc/mpi.quit

new file mode 100644 (file)

index 0000000..e69de29
diff --git a/scilab/modules/mpi/etc/mpi.start b/scilab/modules/mpi/etc/mpi.start

new file mode 100644 (file)

index 0000000..2a241a3
--- /dev/null
+++ b/scilab/modules/mpi/etc/mpi.start
@@ -0,0 +1,15 @@
+// ====================================================================
+// gui module initialisation file 
+// Copyright DIGITEO 2009
+// ====================================================================
+//Load  functions libraries
+load('SCI/modules/mpi/macros/lib');
+// ====================================================================
+//add help chapter
+//add_module_help_chapter('mpi');
+// ====================================================================
+//add demos
+//pathdemos = pathconvert(SCI+"/modules/mpi/demos/mpi.dem.gateway.sce",%f,%t);
+//add_demo(gettext("mpi"),pathdemos);
+clear pathdemos;
+// ====================================================================
diff --git a/scilab/modules/mpi/examples/foo.sci b/scilab/modules/mpi/examples/foo.sci

new file mode 100644 (file)

index 0000000..6276d4b
--- /dev/null
+++ b/scilab/modules/mpi/examples/foo.sci
@@ -0,0 +1,16 @@
+num = mpi_comm_rank()
+
+N =  mpi_comm_size()
+
+src  = modulo(num+N-1, N)
+
+dest = modulo(num+1, N)
+
+
+if ((modulo(num,2) == 0)) then 
+       mpi_send(num,dest,1001)
+       res = mpi_recv(src,1001)
+else 
+       res = mpi_recv(src,1001)
+       mpi_send(num,dest,1001)
+end
diff --git a/scilab/modules/mpi/includes/gw_mpi.h b/scilab/modules/mpi/includes/gw_mpi.h

new file mode 100644 (file)

index 0000000..bfb4c54
--- /dev/null
+++ b/scilab/modules/mpi/includes/gw_mpi.h
@@ -0,0 +1,45 @@
+/**
+ * Gateway header file (declaration of the "links" 
+ * between Scilab and the MPI "library"
+ * @author Sylvestre LEDRU INRIA 2007
+ */
+
+#ifndef __GW_MPI__
+#define __GW_MPI__
+
+#ifdef _MSC_VER
+  #include <windows.h>
+  #include <stdio.h>
+#endif
+
+#include <string.h>
+#include "machine.h"
+#include "stack-c.h"
+
+int gw_mpi(void);
+
+typedef int (*MPI_Interf) (char *fname,unsigned long l);
+
+typedef struct table_struct
+{
+  MPI_Interf f;    /** function **/
+  char *name;      /** its name **/
+} MPITable;
+
+// Declaration of all the profile function declared and 
+// used in sci_gateway/*/
+int C2F(sci_mpi_init) (char *fname,unsigned long fname_len);
+int C2F(sci_mpi_finalize) (char *fname,unsigned long fname_len);
+int C2F(sci_mpi_comm_size) (char *fname,unsigned long fname_len);
+int C2F(sci_mpi_comm_rank) (char *fname,unsigned long fname_len);
+int C2F(sci_mpi_recv) (char *fname,unsigned long fname_len);
+int C2F(sci_mpi_send) (char *fname,unsigned long fname_len);
+
+/*
+int intsmpi_comm_size (char *fname,unsigned long fname_len));
+
+int intsmpi_irecv (char *fname,unsigned long fname_len));
+int intsmpi_isend (char *fname,unsigned long fname_len));
+*/
+#endif /*  __GW_MPI__ */
+
diff --git a/scilab/modules/mpi/licence.txt b/scilab/modules/mpi/licence.txt

new file mode 100644 (file)

index 0000000..a9b14b9
--- /dev/null
+++ b/scilab/modules/mpi/licence.txt
@@ -0,0 +1 @@
+Licence File
diff --git a/scilab/modules/mpi/macros/MPIHelloWorld.sci b/scilab/modules/mpi/macros/MPIHelloWorld.sci

new file mode 100644 (file)

index 0000000..e24baa9
--- /dev/null
+++ b/scilab/modules/mpi/macros/MPIHelloWorld.sci
@@ -0,0 +1,39 @@
+function MPIHelloWorld()
+
+////////////
+// PARALLEL / initialization, include MPI_Init time in measurement
+////////////
+MPI_Init();                    // should have lambooted first
+rnk =  MPI_Comm_rank();        // let it abort if it fails
+sizeNodes =    MPI_Comm_size();
+
+    SLV = rnk;                 // handy shortcuts, master is rank 0
+    Master = ~ SLV;                    // slaves are all other
+
+if Master
+
+       disp("We have "+string(sizeNodes) + " processors")
+       for slaveId = 1:sizeNodes-1
+               MPI_Send("== FROM Master == MPI_Send",slaveId)
+       end
+
+       for slaveId = 1:sizeNodes-1
+               tag=0
+           valueBack=MPI_Recv(slaveId, tag)
+               disp("<=> VALUE BACK <=> "+valueBack+ " from " +string(slaveId))
+
+       end
+else
+// slave
+       disp("Processor "+string(rnk))
+       rankSource=0
+       tag=0
+    value=MPI_Recv(rankSource, tag)
+       value="(Modified by the slave) "+value
+       MPI_Send(value,0)
+
+end
+
+MPI_Finalize()
+
+endfunction
diff --git a/scilab/modules/mpi/macros/MPIPi.sci b/scilab/modules/mpi/macros/MPIPi.sci

new file mode 100644 (file)

index 0000000..53435aa
--- /dev/null
+++ b/scilab/modules/mpi/macros/MPIPi.sci
@@ -0,0 +1,106 @@
+function MPIPi(N,mod)
+// Pi_seq: Compute PI (sequential) by num.integr. of arctan(x) in [0..1]
+//
+//     Pi_seq [ (N) ]
+//
+//  N  [1E7]   #subdivisions of the [0, 1] interval
+// mod ['s']   communication modality:  (s)end (r)educe
+//  printed results struct contains
+//     pi      estimated pi value
+//     err     error
+//     time    from argument xmit to pi computed
+//
+// Examples:
+//
+//  octave:1> Pi_seq
+//  results =
+//  {
+//    pi =  3.1416
+//    err = -6.4837e-14
+//    time =  2.7761
+//  }
+//
+
+////////////////////
+// ArgChk //
+////////////////////
+if argn(2)<1,  N=1E7;  end
+if argn(2)<2,  mod='s';        end
+if argn(2)>2,  error("usage MPIPi(N,mod)"); end
+flag=0;
+[%H,%ierr] = evstr(string(N));
+flag=flag | size(N,"*")<>1 | %ierr<>0;
+flag=flag  |   fix(N)~=N   |           N<1;
+if flag,       error("usage MPIPi( <int> N>0, <char> mod==''s|r'' )"), end
+
+////////////////////////////////////
+// Results struct //
+////////////////////////////////////
+results.pi  =0;
+results.err =0;
+results.time=0;
+
+////////////
+// PARALLEL / initialization, include MPI_Init time in measurement
+////////////
+//  T=clock; /
+////////////
+               MPI_Init();                     // should have lambooted first
+   rnk =       MPI_Comm_rank();        // let it abort if it fails
+   siz =       MPI_Comm_size();
+
+    SLV = rnk;                 // handy shortcuts, master is rank 0
+    MST = ~ SLV;                       // slaves are all other
+
+if MST 
+disp("Master here")
+else
+disp("Slave here")
+end
+
+////////////
+// PARALLEL / computation (depends on rank/size)
+////////////                   // vectorized code, equivalent to
+  width=1/N; lsum=0;           // for i=rnk:siz:N-1
+  i=rnk:siz:N-1;               //   x=(i+0.5)*width;
+  x=(i+0.5)*width;             //   lsum=lsum+4/(1+x^2);
+  lsum=sum(4 ./(1+x.^2));      // end
+                               // mem-bound, N=1E7 => size(i)=8E7/siz (80MB!!!)
+////////////
+// PARALLEL / reduction and finish
+////////////
+select mod
+  case 's',                    TAG=7;  // Any tag would do
+    if SLV                             // All slaves send result back
+       MPI_Send(lsum,             0,TAG);
+    else                               // Here at master
+           Sum =lsum;                  // save local result
+      for slv=1:siz-1                  // collect in any order
+//     MPI_Recv(lsum,MPI_ANY_SOURCE,TAG,MPI_COMM_WORLD);
+               MPI_Recv(lsum,TAG);
+           Sum += lsum;                        // and accumulate
+      end                              // order: slv or MPI_ANY_SOURCE
+    end
+  case 'r',            Sum=0;          // reduction master = rank 0 @ WORLD
+        MPI_Reduce(lsum,Sum, MPI_SUM,  0,MPI_COMM_WORLD);
+end
+
+               MPI_Finalize;
+
+//////////////////////////////////////////////////////////////////
+//results.time = etime(clock,T);       //
+//////////////////////////////////////////////////////////////////
+results.err  = Sum-%pi;
+results.pi   = Sum // ;
+
+
+//////////////////////////////
+// FINAL CHECK //
+//////////////////////////////
+  if abs(results.err)>5E-10
+    warning("pretty nice pi value! go fix it")
+  end
+disp(results)
+endfunction
+
+
diff --git a/scilab/modules/mpi/macros/MPIPi_seq.sci b/scilab/modules/mpi/macros/MPIPi_seq.sci

new file mode 100644 (file)

index 0000000..4dbd38c
--- /dev/null
+++ b/scilab/modules/mpi/macros/MPIPi_seq.sci
@@ -0,0 +1,68 @@
+function MPIPi_seq(N)
+// Pi_seq: Compute PI (sequential) by num.integr. of arctan(x) in [0..1]
+//
+//     Pi_seq [ (N) ]
+//
+//  N  [1E7]   #subdivisions of the [0, 1] interval
+//
+//  printed results struct contains
+//     pi      estimated pi value
+//     err     error
+//     time    from argument xmit to pi computed
+//
+// Examples:
+//
+//  octave:1> Pi_seq
+//  results =
+//  {
+//    pi =  3.1416
+//    err = -6.4837e-14
+//    time =  2.7761
+//  }
+//
+
+////////////////////
+// ArgChk //
+////////////////////
+if argn(2)<1,  N=1E7;  end
+if argn(2)>1,  error("usage Pi_seq(N)"); end
+flag=0;
+[%H,%ierr] = evstr(string(N));
+flag=flag | size(N,"*")<>1 | %ierr<>0;
+flag=flag  |   fix(N)~=N   |           N<1;
+if flag,       error("usage Pi_seq( <int> N>0, <char> mod==''s|r'' )"), end
+
+////////////////////////////////////
+// Results struct //
+////////////////////////////////////
+results.pi  =0;
+results.err =0;
+results.time=0;
+
+////////////////////////////
+// SEQUENTIAL // code, vectorized
+////////////////////////////
+//    T=clock; //
+////////////////////////////                   // vectorized code, equivalent to
+    width=1/N; Sum=0;          // for i=0:N-1
+    i=0:N-1;                   //   x=(i+0.5)*width;
+    x=(i+0.5)*width;           //   Sum=Sum+4/(1+x^2);
+    Sum=sum(4 ./ (1+x.^2));    // end
+    Sum      = Sum/N ;         // 1/N better at end: don't loose resolution
+//////////////////////////////////////////////////////////////////
+//results.time = etime(clock,T);       //
+//////////////////////////////////////////////////////////////////
+results.err  = Sum-%pi;
+results.pi   = Sum // ;
+
+
+//////////////////////////////
+// FINAL CHECK //
+//////////////////////////////
+  if abs(results.err)>5E-10
+    warning("pretty nice pi value! go fix it")
+  end
+disp(results)
+endfunction
+
+
diff --git a/scilab/modules/mpi/macros/buildmacros.sce b/scilab/modules/mpi/macros/buildmacros.sce

new file mode 100644 (file)

index 0000000..a9cae7a
--- /dev/null
+++ b/scilab/modules/mpi/macros/buildmacros.sce
@@ -0,0 +1,6 @@
+if (isdef('genlib') == %f) then
+   exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
+end
+
+genlib('mpilib','SCI/modules/mpi/macros',%f,%t); 
+
diff --git a/scilab/modules/mpi/macros/mpi.sce b/scilab/modules/mpi/macros/mpi.sce

new file mode 100644 (file)

index 0000000..56d2132
--- /dev/null
+++ b/scilab/modules/mpi/macros/mpi.sce
@@ -0,0 +1,4 @@
+ifile=SCIP_ROOT+'/lib/intmpi_'+PVM_ARCH+'.o';
+ufiles=[SCIP_ROOT+'/lib/libintmpi_sci_'+PVM_ARCH+'.a', MPI_LIB]
+files=[ifile,ufiles]
+exec(SCIP_ROOT+'/src-intersci/intmpi.sce');
diff --git a/scilab/modules/mpi/readme.txt b/scilab/modules/mpi/readme.txt

new file mode 100644 (file)

index 0000000..e085433
--- /dev/null
+++ b/scilab/modules/mpi/readme.txt
@@ -0,0 +1,30 @@
+README File
+
+1. Description
+
+The Message Passing Interface (MPI) is a language-independent computer communications descriptive application programming interface (API) for message-passing on a parallel computer.
+
+See : http://en.wikipedia.org/wiki/Message_Passing_Interface
+
+
+
+
+
+2. MPI Functions available into Scilab 
+2.1  MPI_Init
+
+2.2 MPI_Comm_size
+
+2.3 MPI_Comm_rank
+
+2.4 MPI_Send
+
+2.5 MPI_Recv
+
+2.6 MPI_Finalize
+
+
+3. Example
+$ mpirun -c 5 scilab -q --eval "MPIPi(2E7,'r')"        # parallel run, 5 ranks
+
+$ mpirun -c 5 scilab -q -e "getf('SCI/modules/mpi/macros/MPIPi_seq.sci'); MPIPi_seq(2E7)"      # parallel run, 5 ranks
\ No newline at end of file
diff --git a/scilab/modules/mpi/sci_gateway/c/gw_mpi.c b/scilab/modules/mpi/sci_gateway/c/gw_mpi.c

new file mode 100644 (file)

index 0000000..94cd7b0
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/gw_mpi.c
@@ -0,0 +1,62 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#ifdef _MSC_VER
+#include <Windows.h>
+#include "ExceptionMessage.h"
+#endif
+#include "machine.h"
+/*-----------------------------------------------------------------------------------*/
+static MPITable Tab[]=
+{
+       {C2F(sci_mpi_init),"MPI_Init"},
+       {C2F(sci_mpi_finalize),"MPI_Finalize"},
+       {C2F(sci_mpi_comm_size),"MPI_Comm_size"},
+       {C2F(sci_mpi_comm_rank),"MPI_Comm_rank"},
+       {C2F(sci_mpi_recv),"MPI_Recv"},
+       {C2F(sci_mpi_send),"MPI_Send"}
+};
+/*static MPITable Tab[]=
+{
+       {intsmpi_send,"mpi_send"},
+       {intsmpi_recv,"mpi_recv"},
+       {intsmpi_isend,"mpi_isend"},
+       {intsmpi_irecv,"mpi_irecv"},
+       {intsmpi_init,"mpi_init"},
+       {intsmpi_finalize,"mpi_finalize"},
+       {intsmpi_comm_rank,"mpi_comm_rank"},
+       {intsmpi_comm_size,"mpi_comm_size"}
+};*/
+/*-----------------------------------------------------------------------------------*/
+int C2F(gw_mpi)(void)
+{  
+       Rhs = Max(0, Rhs);
+
+#ifdef _MSC_VER
+       #ifndef _DEBUG
+               _try
+               {
+                       (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
+               }
+               _except (EXCEPTION_EXECUTE_HANDLER)
+               {       
+                       ExceptionMessage(GetExceptionCode(),Tab[Fin-1].name);
+               }
+       #else
+               (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
+       #endif
+#else
+                       (*(Tab[Fin-1].f)) (Tab[Fin-1].name,strlen(Tab[Fin-1].name));
+#endif
+       return 0;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_rank.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_rank.c

new file mode 100644 (file)

index 0000000..eb13c89
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_rank.c
@@ -0,0 +1,36 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+
+/**
+ * SCILAB function : mpi_comm_rank, fin = 7
+ * This function returns the rank of a process within
+ * the specified communicator.
+ */
+
+int C2F(sci_mpi_comm_rank) (char *fname,unsigned long fname_len)
+{
+       int comm_rank;
+       int n1=1,m1=1,l1=0;
+       CheckRhs(0,0); // Check the parameters of the function ... Here 0
+       CheckLhs(1,1); // The output of the function (1 parameter)
+       MPI_Comm_rank(MPI_COMM_WORLD, &comm_rank);
+       
+       CreateVar(1, "d", &m1, &n1 ,&l1); // Create the space in the stack for comm_rank
+       *stk(l1)=(double)comm_rank; // Copy comm_size into the stack
+
+       LhsVar(1)= 1;
+       C2F(putlhsvar)();
+       return 0;
+}
+
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_size.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_size.c

new file mode 100644 (file)

index 0000000..f8499e4
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_size.c
@@ -0,0 +1,75 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+#include "stack-c.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include <stdio.h>
+/**
+ * SCILAB function : mpi_comm_size, fin = 3
+ * This function returns the rank of a process 
+ */
+int sci_mpi_comm_size(char *fname,unsigned long fname_len)
+{
+       int comm_size;
+       MPI_Comm comm=NULL;
+    int *piAddr         = NULL;
+    int iRows           = 1;
+    int iCols           = 1;
+    int iRows2           = 1;
+    int iCols2           = 1;
+    double* pdblReal    = NULL;
+
+       CheckRhs(0,1); // Check the parameters of the function ... Here 0 or 1
+       CheckLhs(1,1); // The output of the function (1 parameter)
+       if (Rhs==1)
+               {
+                       int typevar;
+                       getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
+
+                       getVarType(pvApiCtx, piAddr, &typevar);
+                       if (typevar == sci_matrix)
+                               {
+                                       //                                      GetRhsVar(1,"d",&m1,&n1,&l1);
+                                       getMatrixOfDouble(pvApiCtx, piAddr, &iRows, &iCols, &pdblReal);
+                                       comm=(MPI_Comm)(int) pdblReal;
+
+                                       //                                      comm=(MPI_Comm)(int)istk(l1);
+                               }else{
+                                       Scierror(999,"The first parameter should be an int");
+                               }
+               }
+       else
+               {
+                       comm=MPI_COMM_WORLD;
+               }
+       printf("comm : %d\n",comm);
+       MPI_Comm_size(comm, &comm_size);
+       printf("comm_size : %d\n",comm_size);
+
+    double *pdblReal1 = (double*)malloc(sizeof(double) * iRows2 * iCols2);
+       pdblReal1[0]=(double)comm_size;
+       
+       StrErr iRet = createMatrixOfDouble(pvApiCtx, Rhs + 1, iRows2, iCols2, pdblReal1);
+    if(iRet.iErr)
+    {
+               Scierror(999,"error in the creation of the variable");
+    }
+       free(pdblReal1);
+       //      CreateVar(1, "d", &m1, &n1 ,&l1); // Create the space in the stack for comm_size
+       //      *stk(l1)=(double)comm_size; // Copy comm_size into the stack
+
+       LhsVar(1)= Rhs + 1;
+       C2F(putlhsvar)();
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_finalize.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_finalize.c

new file mode 100644 (file)

index 0000000..9eff986
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_finalize.c
@@ -0,0 +1,30 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+
+/******************************************
+ * SCILAB function : mpi_finalize, fin = 2
+ ******************************************/
+
+int C2F(sci_mpi_finalize) (char *fname,unsigned long fname_len)
+{
+ CheckRhs(0,0);
+ CheckLhs(1,1);
+ MPI_Finalize();
+ // TODO: catch les erreurs
+ LhsVar(1)= 0;
+ C2F(putlhsvar)();
+
+ return 0;
+
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_init.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_init.c

new file mode 100644 (file)

index 0000000..1a2b017
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_init.c
@@ -0,0 +1,49 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include <stdio.h>
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+
+/**
+ * SCILAB function : mpi_init, fin = 1
+ * This function init the mpi env
+ */
+MPI_Errhandler errhdl;
+/* should be moved elsewhere */
+void MPIErrHandler(MPI_Comm *comm, int *errorcode, ...) {
+  char buffer[4096];
+  int resultlen;
+  MPI_Error_string(*errorcode,buffer,&resultlen);
+  buffer[resultlen] = 0;
+  printf("Erreur mpi : %s\n",buffer);
+}
+
+int C2F(sci_mpi_init) (char *fname,unsigned long fname_len)
+{
+       int flag;
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+
+       MPI_Initialized(&flag);
+       if (!flag) {
+               /* MPI Not yet initialized */
+               MPI_Init(NULL,NULL);
+
+               MPI_Comm_create_errhandler(MPIErrHandler,&errhdl);
+               //              MPI_Comm_set_errhandler(MPI_COMM_WORLD, errhdl);
+
+               printf("MPI_INIT : init done\n");
+       }
+       LhsVar(1)= 0;
+       C2F(putlhsvar)();
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_irecv.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_irecv.c

new file mode 100644 (file)

index 0000000..461ccec
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_irecv.c
@@ -0,0 +1,58 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+//#include "s_mpi_irecv.h"
+
+/******************************************
+ * SCILAB function : mpi_irecv, fin = 4
+ ******************************************/
+
+int intsmpi_irecv (char *fname,unsigned long fname_len)
+{
+       int nopt,iopos,m1,n1,l1,m2,n2,l2,m3,n3,l3,m4,n4,l4,un=1,l5,l6;
+       static rhs_opts opts[]={
+               {-1,"comm","i",0,0,0},
+               {-1,NULL,NULL,NULL,0,0}};
+       static int xdat0[]= {MPI_COMM_WORLD}, *dat0 = xdat0;
+       nopt=NumOpt();
+       CheckRhs(3,3+nopt);
+       CheckLhs(1,2);
+       /*  checking variable buff */
+       GetRhsVar(1,"c",&m1,&n1,&l1);
+       /*  checking variable source */
+       GetRhsVar(2,"i",&m2,&n2,&l2);
+       CheckScalar(2,m2,n2);
+       /*  checking variable tag */
+       GetRhsVar(3,"i",&m3,&n3,&l3);
+       CheckScalar(3,m3,n3);
+       iopos=Rhs;
+       if ( get_optionals(fname,opts) == 0) return 0;
+       /* default value to optional argument comm */
+       if ( opts[0].position == -1 ){
+               iopos++ ; opts[0].position = iopos;
+               opts[0].m = 1;opts[0].n = 1;
+               CreateVarFromPtr(opts[0].position,opts[0].type,&opts[0].m,&opts[0].n,&dat0);
+               opts[0].l = VarPtr(opts[0].position);
+       }
+       else { 
+               GetRhsVar(4,"i",&m4,&n4,&l4);
+               CheckScalar(4,m4,n4);
+       } 
+       /* cross variable size checking */
+       CreateVar(5,"i",&un,&un,&l5);/* named: request */
+       CreateVar(6,"i",&un,&un,&l6);/* named: res */
+       C2F(s_mpi_irecv)(cstk(l1),&m1,istk(l2),istk(l3),istk(opts[0].l),istk(l5),istk(l6));
+       LhsVar(1)= 5;
+       LhsVar(2)= 6;
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_isend.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_isend.c

new file mode 100644 (file)

index 0000000..28d0461
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_isend.c
@@ -0,0 +1,58 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+#include "s_mpi_isend.h"
+
+/******************************************
+ * SCILAB function : mpi_isend, fin = 3
+ ******************************************/
+
+int intsmpi_isend (char *fname,unsigned long fname_len)
+{
+       int nopt,iopos,m1,n1,l1,m2,n2,l2,m3,n3,l3,m4,n4,l4,un=1,l5,l6;
+       static rhs_opts opts[]={
+               {-1,"comm","i",0,0,0},
+               {-1,NULL,NULL,NULL,0,0}};
+       static int xdat0[]= {MPI_COMM_WORLD}, *dat0 = xdat0;
+       nopt=NumOpt();
+       CheckRhs(3,3+nopt);
+       CheckLhs(1,2);
+       /*  checking variable buff */
+       GetRhsVar(1,"d",&m1,&n1,&l1);
+       /*  checking variable dest */
+       GetRhsVar(2,"i",&m2,&n2,&l2);
+       CheckScalar(2,m2,n2);
+       /*  checking variable tag */
+       GetRhsVar(3,"i",&m3,&n3,&l3);
+       CheckScalar(3,m3,n3);
+       iopos=Rhs;
+       if ( get_optionals(fname,opts) == 0) return 0;
+       /* default value to optional argument comm */
+       if ( opts[0].position == -1 ){
+               iopos++ ; opts[0].position = iopos;
+               opts[0].m = 1;opts[0].n = 1;
+               CreateVarFromPtr(opts[0].position,opts[0].type,&opts[0].m,&opts[0].n,&dat0);
+               opts[0].l = VarPtr(opts[0].position);
+       }
+       else { 
+               GetRhsVar(4,"i",&m4,&n4,&l4);
+               CheckScalar(4,m4,n4);
+       } 
+       /* cross variable size checking */
+       CreateVar(5,"i",&un,&un,&l5);/* named: request */
+       CreateVar(6,"i",&un,&un,&l6);/* named: res */
+       C2F(s_mpi_isend)(stk(l1),&m1,&n1,istk(l2),istk(l3),istk(opts[0].l),istk(l5),istk(l6));
+       LhsVar(1)= 5;
+       LhsVar(2)= 6;
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c

new file mode 100644 (file)

index 0000000..61ac10a
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c
@@ -0,0 +1,61 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+#include "s_mpi_recv.h"
+#include "stackTypeVariable.h"
+#include "MALLOC.h"
+/******************************************
+ * SCILAB function : mpi_recv, fin = 2
+ ******************************************/
+
+int C2F(sci_mpi_recv) (char *fname,unsigned long fname_len)
+{
+       int nopt,iopos,m1,n1,l1,m2,n2,l2,m3,n3,l3,ne4,me4,nn4,un=1,mn4,l4,l5,lrs,mn;
+       static rhs_opts opts[]={
+               {-1,"comm","i",0,0,0},
+               {-1,NULL,NULL,NULL,0,0}};
+       static int xdat0[]= {MPI_COMM_WORLD}, *dat0 = xdat0;
+       double *le4;
+       int rankSource;
+       int tag;
+       char *stringToBeReceived=(char*)MALLOC((256)*sizeof(char));
+
+       CheckRhs(2,2);  
+       CheckLhs(1,1);
+
+       GetRhsVar(1, MATRIX_OF_DOUBLE_DATATYPE,&m1,&n1,&l1);
+       CheckScalar(1,m1,n1);
+       rankSource=(int) *stk(l1);
+
+       GetRhsVar(2, MATRIX_OF_DOUBLE_DATATYPE,&m2,&n2,&l2);
+       CheckScalar(2,m2,n2);
+       tag=(int) *stk(l2);
+
+       int msgsize;
+       MPI_Status status;
+       /* Freemat envoit d'abord le nombre de message puis le message ?! a voir si c'est obligatoire ou pas */
+       //      MPI_Recv(&msgsize,1,MPI_INT,rankSource,tag,MPI_COMM_WORLD,&status);
+       //      void *cp = malloc(msgsize);
+       MPI_Recv(stringToBeReceived,255,MPI_CHAR,rankSource,tag,MPI_COMM_WORLD,MPI_STATUS_IGNORE);
+       //      MPI_Recv(buff, BUFSIZE, MPI_CHAR, 0, TAG, MPI_COMM_WORLD, &stat);
+
+       m3=1;
+       n3=1;
+       CreateVarFromPtr( Rhs+1, "c",(m3=(int)strlen(stringToBeReceived), &m3),&n3,&stringToBeReceived);
+       
+       LhsVar(1) = Rhs+1;
+       C2F(putlhsvar)();       
+       FREE(stringToBeReceived);
+
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c.back b/scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c.back

new file mode 100644 (file)

index 0000000..570eaba
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c.back
@@ -0,0 +1,55 @@
+/**
+ * Function calling mpi_recv
+ * @author Sylvestre LEDRU INRIA
+ * @date 2007
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+#include "s_mpi_recv.h"
+#include "stackTypeVariable.h"
+
+/******************************************
+ * SCILAB function : mpi_recv, fin = 2
+ ******************************************/
+
+int C2F(sci_mpi_recv) _PARAMS((char *fname,unsigned long fname_len))
+{
+       int nopt,iopos,m1,n1,l1,m2,n2,l2,m3,n3,l3,ne4,me4,nn4,un=1,mn4,l4,l5,lrs,mn;
+       static rhs_opts opts[]={
+               {-1,"comm","i",0,0,0},
+               {-1,NULL,NULL,NULL,0,0}};
+       static int xdat0[]= {MPI_COMM_WORLD}, *dat0 = xdat0;
+       double *le4;
+       int rankSource;
+       int tag;
+       char stringToBeReceived[255];
+       CheckRhs(2,2);  
+       CheckLhs(1,1);
+
+       GetRhsVar(1, MATRIX_OF_DOUBLE_DATATYPE,&m1,&n1,&l1);
+       CheckScalar(1,m1,n1);
+       rankSource=(int) *stk(l1);
+
+       GetRhsVar(2, MATRIX_OF_DOUBLE_DATATYPE,&m2,&n2,&l2);
+       CheckScalar(2,m2,n2);
+       tag=(int) *stk(l2);
+
+       int msgsize;
+       MPI_Status status;
+       /* Freemat envoit d'abord le nombre de message puis le message ?! a voir si c'est obligatoire ou pas */
+       //      MPI_Recv(&msgsize,1,MPI_INT,rankSource,tag,MPI_COMM_WORLD,&status);
+       //      void *cp = malloc(msgsize);
+       MPI_Recv(stringToBeReceived,255,MPI_CHAR,rankSource,tag,MPI_COMM_WORLD,MPI_STATUS_IGNORE);
+       //      MPI_Recv(buff, BUFSIZE, MPI_CHAR, 0, TAG, MPI_COMM_WORLD, &stat);
+       
+       m3=1;
+       n3=1;
+       CreateVarFromPtr( Rhs+1, "c",(m3=(int)strlen(stringToBeReceived), &m3),&n3,&stringToBeReceived);
+       CreateVar(Rhs+1, CHAR_DATATYPE,&m3,&n3,&l3);
+       *cstk(l3) = (char*);
+       
+       LhsVar(1) = Rhs+1;
+
+       C2F(putlhsvar)();       
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c b/scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c

new file mode 100644 (file)

index 0000000..36dd59e
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c
@@ -0,0 +1,72 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+#include <mpi.h>
+#include "api_scilab.h"
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+#include "s_mpi_send.h"
+#include "mappingScilabMPI.h"
+
+/******************************************
+ * SCILAB function : mpi_send, fin = 1
+ ******************************52************/
+#define TAG 0
+int sci_mpi_send(char *fname,unsigned long fname_len)
+{
+       int nopt,iopos,m1,n1,l1,m2,n2,m3,n3,m4,n4,l4,un=1,l5;
+       static rhs_opts opts[]={
+               {-1,"comm","i",0,0,0},
+               {-1,NULL,NULL,NULL,0,0}};
+       static int xcomm_world[]= {MPI_COMM_WORLD}, *comm_world = xcomm_world;
+       char *stringToBeSend;
+       int nodeID;
+
+       int errorCode = 0;
+       mappinpScilabMPI mapping;
+
+       // Tag should be optionnal
+
+       CheckRhs(2,2);  
+       CheckLhs(1,1);
+       
+       /*
+       switch (typevar){
+               case sci_matrix:
+                       
+               
+       }
+       */      
+       //      GetRhsVar(1,STRING_DATATYPE,&m1,&n1,&l1);
+       //      CheckScalar(1,m1,n1);
+       //      stringToBeSend=cstk(l1);
+
+       mapping=getMPIDataStructure(1);
+       
+       getMatrixOfDouble(pvApiCtx, 2, &m2, &n2, &nodeID);
+       printf("To node %d\n", nodeID);
+       CheckScalar(2,m2,n2);
+
+       errorCode = MPI_Send(mapping.data, mapping.count, mapping.MPI, nodeID, TAG, MPI_COMM_WORLD);
+       //      errorCode = MPI_Send(stringToBeSend, strlen(stringToBeSend), MPI_CHAR, nodeID, TAG, MPI_COMM_WORLD);
+       
+       m3=1;
+       n3=1;
+
+       createMatrixOfDouble(pvApiCtx, Rhs + 1, &m3, &n3, &errorCode);
+                                                //     CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,&m3,&n3,&errorCode);
+       
+       LhsVar(1) = Rhs+1;
+
+       C2F(putlhsvar)();
+
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c.back b/scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c.back

new file mode 100644 (file)

index 0000000..ace32ec
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c.back
@@ -0,0 +1,58 @@
+/**
+ * Function calling mpi_send
+ * @author Sylvestre LEDRU INRIA
+ * @date 2007
+ */
+#include "gw_mpi.h"
+#include "sci_mpi.h"
+#include "s_mpi_send.h"
+#include "stackTypeVariable.h"
+
+/******************************************
+ * SCILAB function : mpi_send, fin = 1
+ ******************************************/
+
+int C2F(sci_mpi_send) _PARAMS((char *fname,unsigned long fname_len))
+{
+       int nopt,iopos,m1,n1,l1,m2,n2,l2,m3,n3,l3,m4,n4,l4,un=1,l5;
+       static rhs_opts opts[]={
+               {-1,"comm","i",0,0,0},
+               {-1,NULL,NULL,NULL,0,0}};
+       static int xcomm_world[]= {MPI_COMM_WORLD}, *comm_world = xcomm_world;
+       nopt=NumOpt();
+       CheckRhs(1,1);  
+       CheckLhs(1,1);
+
+       /*
+       CheckRhs(3,3+nopt);
+       CheckLhs(1,1);
+       /*  checking variable buff */
+       GetRhsVar(1,MATRIX_OF_DOUBLE_DATATYPE,&m1,&n1,&l1);
+       /*  checking variable dest */
+       GetRhsVar(2,MATRIX_OF_INTEGER_DATATYPE,&m2,&n2,&l2);
+       CheckScalar(2,m2,n2);
+       /*  checking variable tag */
+       GetRhsVar(3,MATRIX_OF_INTEGER_DATATYPE,&m3,&n3,&l3);
+       CheckScalar(3,m3,n3);
+       iopos=Rhs;
+       if ( get_optionals(fname,opts) == 0) return 0;
+       /* default value to optional argument comm */
+       if ( opts[0].position == -1 ){
+               iopos++ ; 
+               opts[0].position = iopos;
+               opts[0].m = 1;
+               opts[0].n = 1;
+               CreateVarFromPtr(opts[0].position,opts[0].type,&opts[0].m,&opts[0].n,&xcomm_world);
+               opts[0].l = VarPtr(opts[0].position);
+       }
+       else { 
+               GetRhsVar(4,MATRIX_OF_INTEGER_DATATYPE,&m4,&n4,&l4);
+               CheckScalar(4,m4,n4);
+       } 
+       /* cross variable size checking */
+       CreateVar(5,MATRIX_OF_INTEGER_DATATYPE,&un,&un,&l5);/* named: res */
+       C2F(s_mpi_send)(stk(l1),&m1,&n1,istk(l2),istk(l3),istk(opts[0].l),istk(l5));
+       LhsVar(1)= 5;
+       */
+       return 0;
+}
diff --git a/scilab/modules/mpi/sci_gateway/mpi b/scilab/modules/mpi/sci_gateway/mpi

new file mode 100644 (file)

index 0000000..bc79227
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/mpi
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
+
+<GATEWAY>
+
+<!-- =================== -->
+<!--
+ Scilab 
+ Sylvestre Ledru
+ INRIA 2007
+ ===================
+ Don't edit if you aren't sure
+-->
+<!-- =================== -->
+
+<PRIMITIVE>
+  <GATEWAY_ID>52</GATEWAY_ID>
+  <PRIMITIVE_ID>1</PRIMITIVE_ID>
+       <PRIMITIVE_NAME>mpi_init</PRIMITIVE_NAME>
+</PRIMITIVE>   
+
+<PRIMITIVE>
+  <GATEWAY_ID>52</GATEWAY_ID>
+  <PRIMITIVE_ID>2</PRIMITIVE_ID>
+       <PRIMITIVE_NAME>mpi_finalize</PRIMITIVE_NAME>
+</PRIMITIVE>   
+
+
+<PRIMITIVE>
+  <GATEWAY_ID>52</GATEWAY_ID>
+  <PRIMITIVE_ID>3</PRIMITIVE_ID>
+       <PRIMITIVE_NAME>mpi_comm_size</PRIMITIVE_NAME>
+</PRIMITIVE>   
+
+<!--
+;52 1 mpi_send
+;52 2 mpi_recv
+;52 3 mpi_isend
+;52 4 mpi_irecv
+;52 5 mpi_init
+;52 6 mpi_finalize
+;52 7 mpi_comm_rank
+-->
+
+</GATEWAY>
diff --git a/scilab/modules/mpi/sci_gateway/mpi_gateway.xml b/scilab/modules/mpi/sci_gateway/mpi_gateway.xml

new file mode 100644 (file)

index 0000000..01f8da5
--- /dev/null
+++ b/scilab/modules/mpi/sci_gateway/mpi_gateway.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
+<GATEWAY name="sylvestre">
+<!-- =================== -->
+<!--
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
+
+ gatewayId is the position in the hashtable 'Interfaces' defined in the
+ file SCI/modules/core/src/c/callinterf.h
+
+ primitiveId is the position in the hashtable '<module>Table Tab[]' defined
+ in the file modules/<module>/sci_gateway/c/gw_<module>.c
+
+ primitiveName is the name of the Scilab function
+
+ @author Allan CORNET
+ @author Sylvestre LEDRU
+ @date INRIA 2007
+ ===================
+ Don't touch if you do not know what you are doing
+-->
+<!-- =================== -->
+
+<PRIMITIVE gatewayId="63" primitiveId="1" primitiveName="MPI_Init" />
+<PRIMITIVE gatewayId="63" primitiveId="2" primitiveName="MPI_Finalize" />
+<PRIMITIVE gatewayId="63" primitiveId="3" primitiveName="MPI_Comm_size" />
+<PRIMITIVE gatewayId="63" primitiveId="4" primitiveName="MPI_Comm_rank" />
+
+<PRIMITIVE gatewayId="63" primitiveId="5" primitiveName="MPI_Recv" />
+<PRIMITIVE gatewayId="63" primitiveId="6" primitiveName="MPI_Send" />
+
+</GATEWAY>
diff --git a/scilab/modules/mpi/src/c/#s_mpi_send.c# b/scilab/modules/mpi/src/c/#s_mpi_send.c#

new file mode 100644 (file)

index 0000000..3db5c97
--- /dev/null
+++ b/scilab/modules/mpi/src/c/#s_mpi_send.c#
@@ -0,0 +1,113 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include "sci_mpi.h"
+#include "s_mpi_send.h"
+#include "build_buff_type.h"
+
+void C2F(s_mpi_send)(int *pack, int *n, double *buff, int *dest, int *tag, int *comm, int *res){
+  int errcode, errclass;       /* Error mgmt */
+  char error_msg[MPI_MAX_ERROR_STRING];
+  int error_msg_length;
+  int l;                       /* size of the buff to send in bytes */
+  
+  MPI_Datatype buff_type;
+
+  MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
+#ifdef DEBUG
+  if (debuglevel >= 5) {    
+    int *ptr_int = (int *)buff;
+    (void) fprintf(stderr, "MPI_SEND: %d:%d:%d:%d|%d:%d|%d:%d:%d:%d|%f:%f\n", 
+                  *n, *dest, *tag, *comm, 
+                  pack[0], pack[1], 
+                  ptr_int[0],ptr_int[1],
+                  ptr_int[2],ptr_int[3],
+                  buff[2],buff[3]);
+    (void) fflush (stderr);    
+  }
+#endif /* DEBUG */
+
+#ifdef DEBUG
+  if (debuglevel >= 10) {
+    int i;
+    (void) fprintf(stderr, "MPI_SEND: %d|", *n);       
+    for (i = 0; i < *n; ++i) {
+      (void) fprintf(stderr, "%d:", 
+                    pack[i]);
+    }
+    (void) fprintf(stderr, "\n");
+    (void) fflush(stderr);     
+  }    
+#endif /* DEBUG */
+  
+  errcode = build_buff_type(*n, pack, &buff_type, &l);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -build_buff_type-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  errcode = MPI_Type_commit(&buff_type);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Type_commit-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+    
+                               /* Send the packing vector. The recv
+                                  part must make a call to probe
+                                  firts to have its size. */
+  errcode = MPI_Send(pack, *n, MPI_INT, *dest, *tag, MPI_COMM_WORLD);  
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Send-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+                               /* Send the data... */
+  errcode = MPI_Send(buff, 1, buff_type, *dest, *tag, MPI_COMM_WORLD);  
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Send-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  
+#ifdef DEBUG
+  if (debuglevel >= 10) {
+    int i;
+    char *ptr = (char*) buff;
+    (void) fprintf(stderr, "SEND:");   
+    for (i = 0; i < l; ++i) {
+      (void) fprintf(stderr, "%d:",ptr[i]);
+    }
+    (void) fprintf(stderr, "\n");      
+    (void) fflush (stderr);    
+  }    
+#endif /* DEBUG */
+  errcode = MPI_Type_free(&buff_type);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Type_free-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  *res = MPI_SUCCESS;
+} 
diff --git a/scilab/modules/mpi/src/c/build_buff_type.c b/scilab/modules/mpi/src/c/build_buff_type.c

new file mode 100644 (file)

index 0000000..f6e65dd
--- /dev/null
+++ b/scilab/modules/mpi/src/c/build_buff_type.c
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) 1999 - INRIA Lorraine
+ * Copyright (c) 2007 - Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include "sci_mpi.h"
+#include "build_buff_type.h"
+
+int build_buff_type(int n, int const * const pack, 
+               MPI_Datatype * const buff_type, int * const size)
+/* Given a pack vector (i.e., |int|double|+)  the function builds the
+   corresponding MPI type */
+{
+  int *array_of_blocklenghts;  /* Virtual structure */
+  MPI_Aint *array_of_displacements;
+  MPI_Datatype *array_of_types;
+  int displacement = 0;
+  int errcode = MPI_SUCCESS;
+  int i;                       /* loop index */
+  int nb_blocks;               /* nb of blocks  */
+
+  *size = 0;
+  if ((array_of_blocklenghts = (int *) malloc(n * sizeof(int))) ==  NULL){
+    (void) fprintf(stderr, "Error malloc in mpi_send\n");
+    (void) fflush(stderr);
+    return MPI_ERR_OTHER;
+  }
+  if ((array_of_displacements = 
+       (MPI_Aint *) malloc(n * sizeof(MPI_Aint))) == NULL){
+    free(array_of_blocklenghts);
+    (void) fprintf(stderr, "Error malloc in mpi_send\n");
+    (void) fflush(stderr);
+    return MPI_ERR_OTHER;
+  }
+  if ((array_of_types = 
+       (MPI_Datatype *) malloc(n * sizeof(MPI_Datatype))) == NULL){
+    free(array_of_blocklenghts);
+    free(array_of_displacements);
+    (void) fprintf(stderr, "Error malloc in mpi_send\n");
+    (void) fflush(stderr);
+    return MPI_ERR_OTHER;
+  }
+
+  for (i = 0, nb_blocks = 0; i < n; i+=2) {
+    if (pack[i] > 0){          /* Have to pack some int */
+      array_of_displacements[nb_blocks] = displacement;
+      array_of_blocklenghts[nb_blocks] = pack[i];
+      array_of_types[nb_blocks] = MPI_INT;
+      nb_blocks++;
+      displacement  += (((pack[i]-1)/2 + 1) * sizeof(double));
+    }
+    if (pack[i + 1] > 0){              /* Have to pack some double */
+      array_of_displacements[nb_blocks] = displacement;
+      array_of_blocklenghts[nb_blocks] = pack[i+1];
+      array_of_types[nb_blocks] = MPI_DOUBLE;
+      nb_blocks++;
+      displacement += (pack[i+1] * sizeof(double));
+    }
+  }
+#ifdef DEBUG
+  if (debuglevel >= 10) {
+    int j;
+    (void) fprintf(stderr, "build_buff_type: %d|", displacement);      
+    for (j = 0; j < nb_blocks; ++j) {
+      (void) fprintf(stderr, "%d:%ld|", 
+                    array_of_blocklenghts[j],
+                    array_of_displacements[j]);
+    }
+    (void) fprintf(stderr, "\n");
+    (void) fflush (stderr);    
+  }    
+#endif /* DEBUG */
+
+  errcode = MPI_Type_struct(nb_blocks, 
+                           array_of_blocklenghts,
+                           array_of_displacements,
+                           array_of_types,
+                           buff_type);
+  *size = displacement;                /* taille en byte */
+  free(array_of_blocklenghts);  
+  free(array_of_displacements); 
+  free(array_of_types);   
+  return errcode;
+} /* build_buff_type */
diff --git a/scilab/modules/mpi/src/c/build_buff_type.h b/scilab/modules/mpi/src/c/build_buff_type.h

new file mode 100644 (file)

index 0000000..2620b17
--- /dev/null
+++ b/scilab/modules/mpi/src/c/build_buff_type.h
@@ -0,0 +1,13 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include <stdio.h>
+#include <stdlib.h>
+
+/**
+ * TODO : comment
+ *
+ *
+ */
+int build_buff_type(int n, int const * const pack, MPI_Datatype * const buff_type, int * const size);
diff --git a/scilab/modules/mpi/src/c/dboard.c b/scilab/modules/mpi/src/c/dboard.c

new file mode 100644 (file)

index 0000000..0c21fbe
--- /dev/null
+++ b/scilab/modules/mpi/src/c/dboard.c
@@ -0,0 +1,39 @@
+/* dboard.c
+   see pi_send.c and pi_reduce.c    */
+
+#include <stdlib.h>
+#define sqr(x) ((x)*(x))
+long random(void);
+
+double dboard(int darts)
+     {
+     double x_coord,       /* x coordinate, between -1 and 1  */
+            y_coord,       /* y coordinate, between -1 and 1  */
+            pi,            /* pi  */
+            r;             /* random number between 0 and 1  */
+     int score,            /* number of darts that hit circle */
+         n;
+     unsigned long cconst; /* used to convert integer random number */
+                           /* between 0 and 2^31 to double random number */
+                           /* between 0 and 1  */
+
+     cconst = 2 << (31 - 1);
+     score = 0;
+
+     /* "throw darts at board" */
+     for (n = 1; n <= darts; n++)  {
+          /* generate random numbers for x and y coordinates */
+          r = (double)random()/cconst;
+          x_coord = (2.0 * r) - 1.0;
+          r = (double)random()/cconst;
+          y_coord = (2.0 * r) - 1.0;
+
+          /* if dart lands in circle, increment score */
+          if ((sqr(x_coord) + sqr(y_coord)) <= 1.0)
+               score++;
+          }
+
+     /* calculate pi */
+     pi = 4.0 * (double)score/(double)darts;
+     return(pi);
+     } 
diff --git a/scilab/modules/mpi/src/c/mappingScilabMPI.c b/scilab/modules/mpi/src/c/mappingScilabMPI.c

new file mode 100644 (file)

index 0000000..920ad1f
--- /dev/null
+++ b/scilab/modules/mpi/src/c/mappingScilabMPI.c
@@ -0,0 +1,80 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2009 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include <mpi.h>
+#include "api_scilab.h"
+#include "mappingScilabMPI.h"
+
+
+static mappinpScilabMPI getMPIMapping(sci_types scilabType);
+
+mappinpScilabMPI getMPIDataStructure(int position){
+       int typevar;
+       mappinpScilabMPI mapping;
+       int iRows, iCols;
+       void *data;
+       getVarType(pvApiCtx, position, &typevar);
+
+       mapping=getMPIMapping((sci_types)typevar);
+
+       switch (typevar){
+               case sci_matrix:
+                       (*mapping.f)(pvApiCtx, position, &iRows, &iCols, &data);
+                       mapping.data=data;
+                       mapping.count=iRows*iCols;
+                       printf("plop %d\n",mapping.count);
+                       break;
+       }
+       return mapping;
+       }
+
+static mappinpScilabMPI getMPIMapping(sci_types scilabType){
+       mappinpScilabMPI mapping;
+       switch (scilabType){
+               case sci_matrix:
+                       mapping.MPI=MPI_DOUBLE;
+                       mapping.Scilab=scilabType;
+                       mapping.f=getMatrixOfDouble;
+                       /* @TODO: rajouter la gestion des pointeurs de fonction pour getmatrix */                               
+                       break;
+               case sci_strings:
+                       mapping.MPI=MPI_CHAR;
+                       mapping.Scilab=scilabType;
+                       //                      mapping.f=getMatrixOfDouble;
+                       //                      mapping.functionName=getMatrixOfDouble;
+               
+       }
+
+}
+
+
+/*
+  sci_matrix = 1 ,
+  sci_poly = 2 ,
+  sci_boolean = 4 ,
+  sci_sparse = 5  ,
+  sci_boolean_sparse = 6,
+  sci_matlab_sparse = 7, 
+  sci_ints = 8,
+  sci_handles =9,
+  sci_strings = 10,
+  sci_u_function = 11,
+  sci_c_function = 13 ,
+  sci_lib =  14,
+  sci_list = 15,
+  sci_tlist = 16,
+  sci_mlist = 17,
+  sci_pointer = 128, 
+  sci_implicit_poly = 129,
+  sci_intrinsic_function = 130
+*/
+
diff --git a/scilab/modules/mpi/src/c/mappingScilabMPI.h b/scilab/modules/mpi/src/c/mappingScilabMPI.h

new file mode 100644 (file)

index 0000000..861eda3
--- /dev/null
+++ b/scilab/modules/mpi/src/c/mappingScilabMPI.h
@@ -0,0 +1,13 @@
+#include <mpi.h>
+#include "stack-c.h"
+
+typedef int (*function_loadData)(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, void** _pdblReal);
+
+typedef struct mappinpScilabMPI_struct{
+       MPI_Datatype MPI;
+       sci_types Scilab;
+       void *data;
+       int count;  /* Number of elements sent */
+       function_loadData f;
+} mappinpScilabMPI;
+mappinpScilabMPI getMPIDataStructure(int position);
diff --git a/scilab/modules/mpi/src/c/mpi_pi_reduce.c b/scilab/modules/mpi/src/c/mpi_pi_reduce.c

new file mode 100644 (file)

index 0000000..d6ab1d4
--- /dev/null
+++ b/scilab/modules/mpi/src/c/mpi_pi_reduce.c
@@ -0,0 +1,89 @@
+/* ---------------------------------------------------------------
+ * MPI pi Calculation Example - C Version 
+ * Collective Communication example
+ * FILE: mpi_pi_reduce.c
+ * OTHER FILES: dboard.c
+ * DESCRIPTION:  MPI pi calculation example program.  C Version.
+ *   This program calculates pi using a "dartboard" algorithm.  See
+ *   Fox et al.(1988) Solving Problems on Concurrent Processors, vol.1
+ *   page 207.  All processes contribute to the calculation, with the
+ *   master averaging the values for pi.
+ *
+ *   SPMD version:  Conditional statements check if the process 
+ *   is the master or a worker. 
+ *
+ *   This version uses mpc_reduce to collect results
+ *
+ * AUTHOR: Roslyn Leibensperger. Converted to MPI: George L. Gusciora 
+ *   (1/25/95)
+ * LAST REVISED: 06/07/96 Blaise Barney
+ * --------------------------------------------------------------- */
+#include "mpi.h"
+#include <stdlib.h>
+#include <stdio.h>
+void srandom (unsigned seed);
+double dboard (int darts);
+#define DARTS 50000     /* number of throws at dartboard */
+#define ROUNDS 100      /* number of times "darts" is iterated */
+#define MASTER 0        /* task ID of master task */
+
+int main(argc,argv)
+int argc;
+char *argv[];
+{
+double homepi,         /* value of pi calculated by current task */
+       pisum,          /* sum of tasks' pi values */
+       pi,             /* average of pi after "darts" is thrown */
+       avepi;          /* average pi value for all iterations */
+int    taskid,         /* task ID - also used as seed number */
+       numtasks,       /* number of tasks */
+       rc,             /* return code */
+       i;
+MPI_Status status;
+
+   /* Obtain number of tasks and task ID */
+   rc = MPI_Init(&argc,&argv);
+   rc|= MPI_Comm_size(MPI_COMM_WORLD,&numtasks);
+   rc|= MPI_Comm_rank(MPI_COMM_WORLD,&taskid);
+   if (rc != MPI_SUCCESS)
+      printf ("error initializing MPI and obtaining task ID information\n");
+   else
+      printf ("task ID = %d\n", taskid);
+
+   /* Set seed for random number generator equal to task ID */
+   srandom (taskid);
+
+   avepi = 0;
+   for (i = 0; i < ROUNDS; i++)
+   {
+      /* All tasks calculate pi using dartboard algorithm */
+      homepi = dboard(DARTS);
+      /* Use MPI_Reduce to sum values of homepi across all tasks 
+       * Master will store the accumulated value in pisum 
+       * - homepi is the send buffer
+       * - pisum is the receive buffer (used by the receiving task only)
+       * - the size of the message is sizeof(double)
+       * - MASTER is the task that will receive the result of the reduction
+       *   operation
+       * - MPI_SUM is a pre-defined reduction function (double-precision
+       *   floating-point vector addition).  Must be declared extern.
+       * - MPI_COMM_WORLD is the group of tasks that will participate.
+       */
+
+      rc = MPI_Reduce(&homepi, &pisum, 1, MPI_DOUBLE, MPI_SUM,
+                         MASTER, MPI_COMM_WORLD);
+      if (rc != MPI_SUCCESS)
+         printf("%d: failure on mpc_reduce\n", taskid);
+
+      /* Master computes average for this iteration and all iterations */
+      if (taskid == MASTER)
+      {
+         pi = pisum/numtasks;
+         avepi = ((avepi * i) + pi)/(i + 1); 
+         printf("   After %3d throws, average value of pi = %10.8f\n",
+                   (DARTS * (i + 1)),avepi);
+      }    
+   } 
+   MPI_Finalize();
+   return 0;
+}
diff --git a/scilab/modules/mpi/src/c/mpi_pi_send.c b/scilab/modules/mpi/src/c/mpi_pi_send.c

new file mode 100644 (file)

index 0000000..953e1fa
--- /dev/null
+++ b/scilab/modules/mpi/src/c/mpi_pi_send.c
@@ -0,0 +1,103 @@
+/* ---------------------------------------------------------------
+ * MPI pi Calculation Example - C Version 
+ * Point-to-Point communications example
+ *
+ * FILE: mpi_pi_send.c
+ * OTHER FILES: dboard.c
+ * DESCRIPTION:  MPI pi calculation example program.  C Version.
+ *   This program calculates pi using a "dartboard" algorithm.  See
+ *   Fox et al.(1988) Solving Problems on Concurrent Processors, vol.1
+ *   page 207.  All processes contribute to the calculation, with the
+ *   master averaging the values for pi.
+ *
+ *   SPMD version:  Conditional statements check if the process 
+ *   is the master or a worker. 
+ *
+ *   This version uses low level sends and receives to collect results
+ *
+ * AUTHOR: Roslyn Leibensperger. Converted to MPI: George L. Gusciora (1/25/95)
+ * LAST REVISED: 12/14/95 Blaise Barney
+ * --------------------------------------------------------------- */
+#include "mpi.h"
+#include <stdlib.h>
+#include <stdio.h>
+void srandom (unsigned seed);
+double dboard (int darts);
+#define DARTS 5000      /* number of throws at dartboard */
+#define ROUNDS 100       /* number of times "darts" is iterated */
+#define MASTER 0        /* task ID of master task */
+
+int main(int argc,char *argv[])
+{
+       double  homepi,         /* value of pi calculated by current task */
+               pi,             /* average of pi after "darts" is thrown */
+               avepi,          /* average pi value for all iterations */
+               pirecv,         /* pi received from worker */
+               pisum;          /* sum of workers pi values */
+       int     taskid,         /* task ID - also used as seed number */
+               numtasks,       /* number of tasks */
+               source,         /* source of incoming message */ 
+               mtype,          /* message type */
+               rc,             /* return code */
+               i, n;
+       MPI_Status status;
+
+       /* Obtain number of tasks and task ID */
+       rc = MPI_Init(&argc,&argv);
+       rc = MPI_Comm_size(MPI_COMM_WORLD,&numtasks);
+       rc = MPI_Comm_rank(MPI_COMM_WORLD,&taskid);
+       printf("numtasks : %d\n",numtasks);
+       printf("taskid : %d\n",taskid);
+       /* Set seed for random number generator equal to task ID */
+       srandom (taskid);
+
+       avepi = 0;
+       for (i = 0; i < ROUNDS; i++)
+               {
+                       /* All tasks calculate pi using dartboard algorithm */
+                       homepi = dboard(DARTS);
+
+                       /* Workers send homepi to master */
+                       /* - Message type will be set to the iteration count */
+                       if (taskid != MASTER)
+                               {
+                                       printf("On the Slave, taskid : %d\n",taskid);
+                                       mtype = i;
+                                       rc = MPI_Send(&homepi, 1, MPI_DOUBLE,
+                                                                 MASTER, mtype, MPI_COMM_WORLD);
+                                       if (rc != MPI_SUCCESS)
+                                               printf("%d: Send failure on round %d\n", taskid, mtype);
+                               } else
+                                       {
+                                       printf("On the Master, taskid : %d\n",taskid);
+
+                                               /* Master receives messages from all workers */
+                                               /* - Message type will be set to the iteration count */
+                                               /* - Message source will be set to the wildcard DONTCARE: */
+                                               /*   a message can be received from any task, as long as the */
+                                               /*   message types match */
+                                               /* - The return code will be checked, and a message displayed */
+                                               /*   if a problem occurred */
+                                               mtype = i;
+                                               pisum = 0;
+                                               for (n = 1; n < numtasks; n++)
+                                                       {
+                                                               rc = MPI_Recv(&pirecv, 1, MPI_DOUBLE, MPI_ANY_SOURCE,
+                                                                                         mtype, MPI_COMM_WORLD, &status);
+                                                               if (rc != MPI_SUCCESS) 
+                                                                       printf("%d: Receive failure on round %d\n", taskid, mtype);
+                                                               /* keep running total of pi */
+                                                               pisum = pisum + pirecv;
+                                                       }
+                                               /* Master calculates the average value of pi for this iteration */
+                                               pi = (pisum + homepi)/numtasks;
+                                               /* Master calculates the average value of pi over all iterations */
+                                               avepi = ((avepi * i) + pi)/(i + 1); 
+                                               printf("   After %3d throws, average value of pi = %10.8f\n",
+                                                          (DARTS * (i + 1)),avepi);
+                                       }    
+               } 
+
+       MPI_Finalize();
+       return 0;
+}
diff --git a/scilab/modules/mpi/src/c/mpitest.c b/scilab/modules/mpi/src/c/mpitest.c

new file mode 100644 (file)

index 0000000..32cbc97
--- /dev/null
+++ b/scilab/modules/mpi/src/c/mpitest.c
@@ -0,0 +1,56 @@
+/*
+ "Hello World" Type MPI Test Program
+*/
+#include <mpi.h>
+#include <stdio.h>
+#include <string.h>
+
+#define BUFSIZE 128
+#define TAG 0
+
+int main(int argc, char *argv[])
+{
+  char idstr[32];
+  char buff[BUFSIZE];
+  char buffRecv[BUFSIZE];
+
+  int numprocs;
+  int myid;
+  int i;
+  MPI_Status stat; 
+ 
+  MPI_Init(&argc,&argv); /* all MPI programs start with MPI_Init; all 'N' processes exist thereafter */
+  MPI_Comm_size(MPI_COMM_WORLD,&numprocs); /* find out how big the SPMD world is */
+  MPI_Comm_rank(MPI_COMM_WORLD,&myid); /* and this processes' rank is */
+
+  /* At this point, all the programs are running equivalently, the rank is used to
+     distinguish the roles of the programs in the SPMD model, with rank 0 often used
+     specially... */
+  if(myid == 0)
+  {
+    printf("%d: We have %d processors\n", myid, numprocs);
+    for(i=1;i<numprocs;i++)
+    {
+      sprintf(buff, "Hello %d! ", i);
+      MPI_Send(buff, BUFSIZE, MPI_CHAR, i, TAG, MPI_COMM_WORLD);
+    }
+    for(i=1;i<numprocs;i++)
+    {
+      MPI_Recv(buff, BUFSIZE, MPI_CHAR, i, TAG, MPI_COMM_WORLD, &stat);
+      printf("%d: %s\n", myid, buff);
+    }
+  }
+  else
+  {
+    /* receive from rank 0: */
+    MPI_Recv(buffRecv, BUFSIZE, MPI_CHAR, 0, TAG, MPI_COMM_WORLD, &stat);
+    sprintf(idstr, "Processor %d ", myid);
+    strcat(buffRecv, idstr);
+    strcat(buffRecv, "reporting for duty\n");
+    /* send to rank 0: */
+    MPI_Send(buffRecv, BUFSIZE, MPI_CHAR, 0, TAG, MPI_COMM_WORLD);
+  }
+
+  MPI_Finalize(); /* MPI Programs end with MPI Finalize; this is a weak synchronization point */
+  return 0;
+}
diff --git a/scilab/modules/mpi/src/c/s_mpi_irecv.c b/scilab/modules/mpi/src/c/s_mpi_irecv.c

new file mode 100644 (file)

index 0000000..ab75559
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_irecv.c
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 1999 - INRIA Lorraine
+ * Copyright (c) 2007 - Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt
+ */
+
+#include "sci_mpi.h"
+#include "s_mpi_irecv.h"
+
+void C2F(s_mpi_irecv)(const int * const source,  /* INPUT */
+                const int * const tag,     /* INPUT */
+                const int * const comm,    /* INPUT */
+                int *request, int *res)    /* OUTPUT */
+{
+       *res = MPI_SUCCESS;
+} /* scimpiirecv */
diff --git a/scilab/modules/mpi/src/c/s_mpi_irecv.h b/scilab/modules/mpi/src/c/s_mpi_irecv.h

new file mode 100644 (file)

index 0000000..627823e
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_irecv.h
@@ -0,0 +1,15 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include <stdio.h>
+
+/**
+ * TODO : comment
+ *
+ *
+ */
+void C2F(s_mpi_irecv)(const int * const source,  /* INPUT */
+                const int * const tag,     /* INPUT */
+                const int * const comm,    /* INPUT */
+                int *request, int *res);    /* OUTPUT */
diff --git a/scilab/modules/mpi/src/c/s_mpi_isend.c b/scilab/modules/mpi/src/c/s_mpi_isend.c

new file mode 100644 (file)

index 0000000..98c7ef8
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_isend.c
@@ -0,0 +1,113 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include "sci_mpi.h"
+#include "s_mpi_isend.h"
+#include "build_buff_type.h"
+
+void  C2F(s_mpi_isend)(int *pack, int *n,
+                double *buff,
+                int *dest,
+                int *tag,
+                int *comm,
+                int *request,
+                int *res)
+{
+  int errcode, errclass;       /* Error mgmt */
+  char error_msg[MPI_MAX_ERROR_STRING];
+  int error_msg_length;
+  int entry = 0;
+  MPI_Datatype buff_type;
+  int l;                       /* size of the buff to send in bytes */
+
+                               /* Try to locate an entry in the
+                                  tab_req array */
+
+  *request = -1;
+  if (*n >= SCI_MPI_MAX_PACKING_VECT_SIZE){
+    (void) fprintf(stderr, "Error in mpi_isend: packing vector is too large\n");
+    (void) fflush(stderr);
+    *res = MPI_ERR_OTHER;
+    return;
+  }
+
+  while ((entry < SCI_MPI_MAX_PENDING_REQUESTS) &&
+        (tab_req[entry].ptr_header != NULL) &&
+        (tab_req[entry].ptr_body != NULL)) {
+    entry++;
+  }
+  if (entry == SCI_MPI_MAX_PENDING_REQUESTS){
+    (void) fprintf(stderr, "Error in mpi_isend: Too much pending requests\n");
+    (void) fflush(stderr);
+    *res = MPI_ERR_OTHER;
+    return;
+  }
+
+  errcode = build_buff_type(*n, pack, &buff_type, &l);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error in mpi_isend -build_buff_type-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  errcode = MPI_Type_commit(&buff_type);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Type_commit-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+                               /* Send the packing */
+  
+  errcode = MPI_Isend(pack, *n, MPI_INT, *dest, *tag, MPI_COMM_WORLD, 
+                     &tab_req[entry].req_header);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_ISend-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+                               /* Send the data... */
+  errcode = MPI_Isend(buff, 1, buff_type, *dest, *tag, MPI_COMM_WORLD, 
+                     &tab_req[entry].req_body);  
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_ISend-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+                               /* If ptr_header == &ptr_header the
+                                  entry is no free *** BUT *** you do 
+                               not have to free this ptr!!! just
+                               set them to the NULL value.*/
+  tab_req[entry].ptr_header = &tab_req[entry].ptr_header;
+  tab_req[entry].ptr_body =  &tab_req[entry].ptr_body;
+  
+  errcode = MPI_Type_free(&buff_type);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_isend -MPI_Type_free-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *request = entry;
+    *res = errcode;
+    return;
+  }
+
+  *request = entry;
+  *res = MPI_SUCCESS;
+} /* scimpiisend */
diff --git a/scilab/modules/mpi/src/c/s_mpi_isend.h b/scilab/modules/mpi/src/c/s_mpi_isend.h

new file mode 100644 (file)

index 0000000..dde11a4
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_isend.h
@@ -0,0 +1,14 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include <stdio.h>
+
+void 
+C2F(s_mpi_isend)(int *pack, int *n,
+                double *buff,
+                int *dest,
+                int *tag,
+                int *comm,
+                int *request,
+                                  int *res);
diff --git a/scilab/modules/mpi/src/c/s_mpi_recv.c b/scilab/modules/mpi/src/c/s_mpi_recv.c

new file mode 100644 (file)

index 0000000..3d0585d
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_recv.c
@@ -0,0 +1,195 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include "sci_mpi.h"
+#include "s_mpi_recv.h"
+
+
+void C2F(s_mpi_recv)(double * const beginvar,   /* I/O */
+               const int * const maxsize, /* INPUT */
+               int * const size,          /* OUTPUT */
+               const int * const source,  /* INPUT */
+               const int * const tag,     /* INPUT */
+               const int * const comm,    /* INPUT */
+               int stat[2], int *res)   /* OUTPUT */
+{
+  int errcode, errclass;       /* Error mgmt */
+  char error_msg[MPI_MAX_ERROR_STRING];
+  int error_msg_length;
+ 
+  MPI_Status status;
+  MPI_Datatype buff_type;
+
+  int n;                       /* size of the pack vector */
+  int *pack;                   /* the pack vector */
+  int l;                       /* size of the buff in bytes */
+
+#ifdef DEBUG
+  if (debuglevel >= 5) {
+    (void) fprintf(stderr, "MPI_RECV: |%f:%d|%d:%d:%d|\n", 
+                  beginvar[0], *maxsize, *source, *tag, *comm);        
+    (void) fflush (stderr);    
+  }    
+#endif /* DEBUG */
+
+  *size = 2;
+  if (*size <= *maxsize){              /* on retourne en cas d erreur une
+                                          matrice de taille vide */
+    int *ptr_int = (int*)beginvar;
+    
+    ptr_int[0] = 1;    /* scalar type */
+    ptr_int[1] = 0;    /* m */
+    ptr_int[2] = 0;    /* n */
+    ptr_int[3] = 0;    /* real */
+  } 
+  else {
+    (void) fprintf(stderr, "Error in mpi_recv: Not enough memory: available=%d:needed=%d\n", *maxsize, *size);
+    (void) fflush(stderr);
+    *res = MPI_ERR_OTHER;
+    return;
+  }
+  (void) fprintf(stderr, "Error ICI 1 \n");
+    (void) fflush(stderr);
+       // BUG ICI, VOIR PK CA MERDE LA ?
+       errcode = MPI_Probe(*source, *tag, MPI_COMM_WORLD, &status);
+  (void) fprintf(stderr, "Error ICI 2 \n");
+    (void) fflush(stderr);
+
+  if (errcode != MPI_SUCCESS){
+  (void) fprintf(stderr, "Error ICI 3 \n");
+    (void) fflush(stderr);
+
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_recv -MPI_Probe-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  (void) fprintf(stderr, "Error ICI 4 \n");
+    (void) fflush(stderr);
+
+  errcode = MPI_Get_count(&status, MPI_INT, &n);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_recv -MPI_Get_count-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+#ifdef DEBUG
+  if (debuglevel >= 10) {
+    int i;
+    (void) fprintf(stderr, "MPI_RECV: %d\n", n);       
+    (void) fflush(stderr);     
+  }    
+#endif /* DEBUG */  
+  if ((pack = (int *) malloc(n * sizeof(int))) == NULL){
+    (void) fprintf(stderr, "Error malloc in mpi_recv\n");
+    (void) fflush(stderr);
+    *res = MPI_ERR_OTHER;
+    return; 
+  }
+  (void) fprintf(stderr, "Error ICI 5 \n");
+    (void) fflush(stderr);
+
+  errcode = MPI_Recv(pack, n, MPI_INT, *source, *tag, 
+                    MPI_COMM_WORLD, &status);
+  (void) fprintf(stderr, "Error ICI 6 \n");
+    (void) fflush(stderr);
+
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_recv -MPI_Recv-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    free(pack);
+    return;
+  }
+#ifdef DEBUG
+  if (debuglevel >= 10) {
+    int i;
+    (void) fprintf(stderr, "MPI_RECV: ");      
+    for (i = 0; i < n; ++i) {
+      (void) fprintf(stderr, "%d:", 
+                    pack[i]);
+    }
+    (void) fprintf(stderr, "\n");
+    (void) fflush(stderr);     
+  }    
+#endif /* DEBUG */  
+  errcode = build_buff_type(n, pack, &buff_type, &l);
+  free(pack);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_recv -build_buff_type-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  if ((l/sizeof(double)) > *maxsize){ 
+    (void) fprintf(stderr, "Error in mpi_recv: Not enough memory: available=%d:needed=%d\n", *maxsize, *size);
+    (void) fflush(stderr);
+    *res = MPI_ERR_OTHER;
+    return;
+  }
+
+  errcode = MPI_Type_commit(&buff_type);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Type_commit-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  
+  errcode = MPI_Recv(beginvar, 1, buff_type, *source, *tag,
+                    MPI_COMM_WORLD, &status);
+  stat[0] = status.MPI_SOURCE;
+  stat[1] = status.MPI_TAG;
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_recv -MPI_Recv-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+#ifdef DEBUG
+  if (debuglevel >= 10) {
+    int i;
+    char *ptr = (char*) beginvar;
+    (void) fprintf(stderr, "SEND:");   
+    for (i = 0; i < l; ++i) {
+      (void) fprintf(stderr, "%d:", ptr[i]);
+    }
+    (void) fprintf(stderr, "\n");      
+    (void) fflush (stderr);    
+  }    
+#endif /* DEBUG */
+
+
+  errcode = MPI_Type_free(&buff_type);
+  if (errcode != MPI_SUCCESS){
+    MPI_Error_string(errcode, error_msg, &error_msg_length);
+    MPI_Error_class(errcode, &errclass);
+    (void) fprintf(stderr, "Error mpi_send -MPI_Type_free-: %d:%s\n", 
+                  errclass, error_msg);
+    (void) fflush(stderr);
+    *res = errcode;
+    return;
+  }
+  *size = l/sizeof(double);    
+  *res = errcode;
+} 
diff --git a/scilab/modules/mpi/src/c/s_mpi_recv.h b/scilab/modules/mpi/src/c/s_mpi_recv.h

new file mode 100644 (file)

index 0000000..29116df
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_recv.h
@@ -0,0 +1,19 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include "build_buff_type.h"
+/**
+ * TODO : comment
+ *
+ *
+ */
+void C2F(s_mpi_recv)(double * const beginvar,   /* I/O */
+               const int * const maxsize, /* INPUT */
+               int * const size,          /* OUTPUT */
+               const int * const source,  /* INPUT */
+               const int * const tag,     /* INPUT */
+               const int * const comm,    /* INPUT */
+               int stat[2], int *res);   /* OUTPUT */
diff --git a/scilab/modules/mpi/src/c/s_mpi_send.c b/scilab/modules/mpi/src/c/s_mpi_send.c

new file mode 100644 (file)

index 0000000..f08d807
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_send.c
@@ -0,0 +1,113 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include "sci_mpi.h"
+#include "s_mpi_send.h"
+#include "build_buff_type.h"
+
+void C2F(s_mpi_send)(int *pack, int *n, double *buff, int *dest, int *tag, int *comm, int *res){
+       int errcode, errclass;  /* Error mgmt */
+       char error_msg[MPI_MAX_ERROR_STRING];
+       int error_msg_length;
+       int l;                  /* size of the buff to send in bytes */
+  
+       MPI_Datatype buff_type;
+
+       MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
+#ifdef DEBUG
+       if (debuglevel >= 5) {    
+               int *ptr_int = (int *)buff;
+               (void) fprintf(stderr, "MPI_SEND: n : %d\ndest :%d\ntag : %d\ncomm : %d^npack[0] %d\npack[1] %d\nptr_int[0] %d\nptr_int[1] %d\nptr_int[2] %d\nptr_int[3] %d\nbuff[2] %f\nbuff[3] %f\n", 
+                                          *n, *dest, *tag, *comm, 
+                                          pack[0], pack[1], 
+                                          ptr_int[0],ptr_int[1],
+                                          ptr_int[2],ptr_int[3],
+                                          buff[2],buff[3]);
+               (void) fflush (stderr); 
+       }
+#endif /* DEBUG */
+
+#ifdef DEBUG
+       if (debuglevel >= 10) {
+               int i;
+               (void) fprintf(stderr, "MPI_SEND: %d|", *n);    
+               for (i = 0; i < *n; ++i) {
+                       (void) fprintf(stderr, "%d:", 
+                                                  pack[i]);
+               }
+               (void) fprintf(stderr, "\n");
+               (void) fflush(stderr);  
+       }       
+#endif /* DEBUG */
+  
+       errcode = build_buff_type(*n, pack, &buff_type, &l);
+       if (errcode != MPI_SUCCESS){
+               MPI_Error_string(errcode, error_msg, &error_msg_length);
+               MPI_Error_class(errcode, &errclass);
+               (void) fprintf(stderr, "Error mpi_send -build_buff_type-: %d:%s\n", 
+                                          errclass, error_msg);
+               (void) fflush(stderr);
+               *res = errcode;
+               return;
+       }
+       errcode = MPI_Type_commit(&buff_type);
+       if (errcode != MPI_SUCCESS){
+               MPI_Error_string(errcode, error_msg, &error_msg_length);
+               MPI_Error_class(errcode, &errclass);
+               (void) fprintf(stderr, "Error mpi_send -MPI_Type_commit-: %d:%s\n", 
+                                          errclass, error_msg);
+               (void) fflush(stderr);
+               *res = errcode;
+               return;
+       }
+    
+       /* Send the packing vector. The recv
+          part must make a call to probe
+          firts to have its size. */
+       errcode = MPI_Send(pack, *n, MPI_INT, *dest, *tag, MPI_COMM_WORLD);  
+       if (errcode != MPI_SUCCESS){
+               MPI_Error_string(errcode, error_msg, &error_msg_length);
+               MPI_Error_class(errcode, &errclass);
+               (void) fprintf(stderr, "Error mpi_send -MPI_Send-: %d:%s\n", 
+                                          errclass, error_msg);
+               (void) fflush(stderr);
+               *res = errcode;
+               return;
+       }
+       /* Send the data... */
+       errcode = MPI_Send(buff, 1, buff_type, *dest, *tag, MPI_COMM_WORLD);  
+       if (errcode != MPI_SUCCESS){
+               MPI_Error_string(errcode, error_msg, &error_msg_length);
+               MPI_Error_class(errcode, &errclass);
+               (void) fprintf(stderr, "Error mpi_send -MPI_Send-: %d:%s\n", 
+                                          errclass, error_msg);
+               (void) fflush(stderr);
+               *res = errcode;
+               return;
+       }
+  
+#ifdef DEBUG
+       if (debuglevel >= 10) {
+               int i;
+               char *ptr = (char*) buff;
+               (void) fprintf(stderr, "SEND:");        
+               for (i = 0; i < l; ++i) {
+                       (void) fprintf(stderr, "%d:",ptr[i]);
+               }
+               (void) fprintf(stderr, "\n");   
+               (void) fflush (stderr); 
+       }       
+#endif /* DEBUG */
+       errcode = MPI_Type_free(&buff_type);
+       if (errcode != MPI_SUCCESS){
+               MPI_Error_string(errcode, error_msg, &error_msg_length);
+               MPI_Error_class(errcode, &errclass);
+               (void) fprintf(stderr, "Error mpi_send -MPI_Type_free-: %d:%s\n", 
+                                          errclass, error_msg);
+               (void) fflush(stderr);
+               *res = errcode;
+               return;
+       }
+       *res = MPI_SUCCESS;
+} 
diff --git a/scilab/modules/mpi/src/c/s_mpi_send.h b/scilab/modules/mpi/src/c/s_mpi_send.h

new file mode 100644 (file)

index 0000000..d9dff62
--- /dev/null
+++ b/scilab/modules/mpi/src/c/s_mpi_send.h
@@ -0,0 +1,13 @@
+/**
+ * @author INRIA Lorraine - 1999
+ * @author Sylvestre LEDRU <sylvestre.ledru@inria.fr> INRIA Rocquencourt - 2007
+ */
+#include <stdio.h>
+
+
+void C2F(s_mpi_send)(int *pack, int *n,
+               double *buff,
+               int *dest,
+               int *tag,
+               int *comm,
+                                        int *res);
diff --git a/scilab/modules/mpi/src/c/sci_mpi.h b/scilab/modules/mpi/src/c/sci_mpi.h

new file mode 100644 (file)

index 0000000..80937e5
--- /dev/null
+++ b/scilab/modules/mpi/src/c/sci_mpi.h
@@ -0,0 +1,63 @@
+/* Copyright (c) 1999 by Inria Lorraine.  All Rights Reserved */
+
+/***
+       NAME 
+       MPI feature into Scilab
+   PURPOSE
+     provide point-to-point communication between MPI process.
+   NOTES
+
+   HISTORY
+     fleury - Mar 12, 1999: Created.
+     $Log: mpi_pp.c,v $
+     Revision 1.3  1999/10/19 06:42:32  fleury
+     Mise a jour de l archive du LORIA.
+     WARNING: modif de type inconnue....
+
+     Revision 1.2  1999/03/19 18:01:02  fleury
+     Send & Recv OK.
+     TODO: finalize.
+     TODO: prendre en compte les communicators
+     TODO: prendre en compte les status
+     TODO: error handler in MPI.
+     TODO: test sur #ex.
+     TODO: mpi_mp.c (-;
+
+     Revision 1.1  1999/03/19 11:07:51  fleury
+     Ajout de l interface MPI.
+     ceci est un premier ajout qui marche
+     TODO: pouvoir lancer des scilex avec/sans fenetre
+     TODO: gérer les Communicators
+
+***/
+
+#ifndef __SCIMPI
+#define __SCIMPI
+#include <stdlib.h>
+#include <mpi.h>
+//#include "mpi/mpi.h"
+#include "machine.h"
+
+#define SCI_MPI_MAX_COMMUNICATORS    256
+#define SCI_MPI_MAX_PENDING_REQUESTS 256
+#define SCI_MPI_MAX_PACKING_VECT_SIZE 1024
+
+typedef struct pending_req {
+  MPI_Request req_header;
+  MPI_Request req_body;
+  void* ptr_header;
+  void* ptr_body;
+} Pending_Req;
+
+extern int packing_vect[SCI_MPI_MAX_PACKING_VECT_SIZE];
+
+
+MPI_Comm tab_comm[SCI_MPI_MAX_COMMUNICATORS];
+//int current_comm = 0;
+
+Pending_Req tab_req[SCI_MPI_MAX_PENDING_REQUESTS];
+//int current_req = 0;
+
+#define debuglevel 10
+
+#endif /* __SCIMPI */
diff --git a/scilab/modules/mpi/src/c/testPDGEMM-MPI.c b/scilab/modules/mpi/src/c/testPDGEMM-MPI.c

new file mode 100644 (file)

index 0000000..9fddcbf
--- /dev/null
+++ b/scilab/modules/mpi/src/c/testPDGEMM-MPI.c
@@ -0,0 +1,87 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#define MMAX 1408
+
+double dclock()
+{
+   double time;
+   struct timeval t;
+
+   gettimeofday(&t,NULL);
+   time = (double)t.tv_sec + 1.0e-6*(double)t.tv_usec;
+   return(time);
+
+}
+
+void main(int argc, char*argv[]){
+  int
+M1,M2,M11,M21,R,MYPROW1,MYPCOL1,CTXT1,MYID,ICTXT,CTXT2,MYPROW2,MYPCOL2;
+  int MYPROW,MYPCOL,NPROW,NPCOL1,NPROW1,NPCOL2,NPROW2,NPCOL,INFO,NBP,
+I,J,k;
+  double tim1,tim2,timtot;
+  int twoone,onetwo;
+  int M,DEM;
+  double *A,*B,*C,*T,*T1,*T2;
+  double alpha=1.0,beta=0.0;
+  int DESCC1[9],DESCC2[9],DESCIC[9];
+  FILE *str, *dge,*win;
+
+  int zero=0,UN=1,TWO=2,FOUR=4;
+  char Ori='r',All='A',No='n';
+
+  NBP=4;
+  NPROW1=2;
+  NPCOL1=2;
+  NPROW2=2;
+  NPCOL2=2;
+  NPCOL=4;
+  CTXT1=-1;
+  CTXT2=-1;
+
+
+  blacs_pinfo_(&MYID, &NBP);
+  blacs_get_(&zero, &zero, &ICTXT);
+  blacs_gridinit_(&ICTXT,&Ori,&TWO,&TWO);
+  blacs_gridinfo_(&ICTXT,&NPROW,&NPCOL,&MYPROW,&MYPCOL);
+
+  A=(double*)malloc(MMAX*MMAX*sizeof(double)/4);
+  B=(double*)malloc(MMAX*MMAX*sizeof(double)/4);
+  C=(double*)malloc(MMAX*MMAX*sizeof(double)/4);
+/*   for (M=128;M<MMAX+1;M+=128) */
+/*     { */
+  M=MMAX;
+  DEM=M/2;
+  R=M/4;
+  descset_(&DESCC1,&M,&M,&R,&R,&zero,&zero,&ICTXT,&DEM);
+  blacs_barrier_(&ICTXT, &All);
+
+  for(J=0;J<DEM;J++)
+    for (I=0;I<DEM;I++)
+      {
+        A[I+(DEM*J)]=MYID+0.0;
+        B[I+(DEM*J)]=MYID+1.0;
+      }
+  blacs_barrier_(&ICTXT, &All);
+  /* **************** DEBUT DE PDGEMM ************* */
+  tim2=0.0;
+  for (k=0;k<10;k++)
+    {
+      tim1=dclock();
+
+pdgemm_(&No,&No,&M,&M,&M,&alpha,A,&UN,&UN,DESCC1,B,&UN,&UN,DESCC1,&beta,C,
+
+&UN,&UN,DESCC1);
+      tim1=dclock()-tim1;
+      blacs_barrier_(&ICTXT, &All);
+      tim2+=tim1;
+    }
+  if (MYID==0)
+    {
+      /*          fprintf(dge,"%d %lf\n",M,tim2/k); */
+      printf("dge, %d %lf\n",M,tim2/k);
+    }
+  /* **************** FIN DE PDGEMM ************* */
+  /*    }  */
+}
diff --git a/scilab/modules/mpi/src/fortran/intmpi.f b/scilab/modules/mpi/src/fortran/intmpi.f

new file mode 100644 (file)

index 0000000..3d9ba84
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intmpi.f
@@ -0,0 +1,46 @@
+c     $Log: INTMPI.f,v $
+c     Revision 1.4  1999/09/14 12:41:13  fleury
+c     Mise a jour pour la version de scilabp
+c      - macro de blacs_init: permet de demarrer une grille blacs a partir
+c     de la console scilex
+c      - script de demarage de scilabp: initialise les blacs et se met en
+c     mode recv/exec
+c
+c     Modif ds pvm
+c      - pvm_start prend en argument un fichier de config pvm
+c
+c     Modif des conversion de complexe
+c
+c     Modif des blacs
+c      - suppression des _ ds le nom des funct car ca fout la merde sous gcc
+c
+c     Modif ds l interface MPI
+c      - TODO: a reprendre pour le nom des function et pour le lancement des
+c     prg
+c
+
+c  interface function 
+c   ********************
+       subroutine intmpi
+       include 'stack.h'
+       rhs = max(0,rhs)
+c
+       goto (1,2,3,4,5,6,7,8) fin
+       return
+1      call intsmpi_send('mpi_send')
+       return
+2      call intsmpi_recv('mpi_recv')
+       return
+3      call intsmpi_isend('mpi_isend')
+       return
+4      call intsmpi_irecv('mpi_irecv')
+       return
+5      call intsmpi_init('mpi_init')
+       return
+6      call intsmpi_finalize('mpi_finalize')
+       return
+7      call intsmpi_comm_rank('mpi_comm_rank')
+       return
+8      call intsmpi_comm_size('mpi_comm_size')
+       return
+       end
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_comm_rank.f b/scilab/modules/mpi/src/fortran/intsmpi_comm_rank.f

new file mode 100644 (file)

index 0000000..a4e9851
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_comm_rank.f
@@ -0,0 +1,66 @@
+c SCILAB function : mpi_comm_rank, fin = 7
+       subroutine intsmpi_comm_rank(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       logical checkrhs,checklhs,cremat,getscalar
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,0,1)) return
+       if(.not.checklhs(fname,1,2)) return
+c       checking variable comm (number 1)
+c       
+       if(rhs .le. 0) then
+        top = top+1
+        rhs = rhs+1
+        if(.not.cremat(fname,top,0,1,1,lr1,lc1)) return
+        stk(lr1)= 0
+       endif
+       if(.not.getscalar(fname,top,top-rhs+1,lr1)) return
+c     
+c       cross variable size checking
+c     
+       call entier(1,stk(lr1),istk(iadr(lr1)))
+       if(.not.cremat(fname,top+1,0,1,1,lw2,loc2)) return
+       if(.not.cremat(fname,top+2,0,1,1,lw3,loc3)) return
+       call MPI_COMM_RANK(istk(iadr(lr1)),stk(lw2),stk(lw3))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+2
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: myid
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw2)),-1,stk(lrs),-1)
+       endif
+c     
+       if(lhs .ge. 2) then
+c       --------------output variable: res
+        top=topl+2
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw3)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       if(lhs .ge. 2) then
+        call copyobj(fname,topl+2,topk+2)
+       endif
+       top=topk+lhs
+       return
+       end
+c
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_comm_size.f b/scilab/modules/mpi/src/fortran/intsmpi_comm_size.f

new file mode 100644 (file)

index 0000000..4a8756b
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_comm_size.f
@@ -0,0 +1,66 @@
+c SCILAB function : mpi_comm_size, fin = 8
+       subroutine intsmpi_comm_size(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       logical checkrhs,checklhs,cremat,getscalar
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,0,1)) return
+       if(.not.checklhs(fname,1,2)) return
+c       checking variable comm (number 1)
+c       
+       if(rhs .le. 0) then
+        top = top+1
+        rhs = rhs+1
+        if(.not.cremat(fname,top,0,1,1,lr1,lc1)) return
+        stk(lr1)= 0
+       endif
+       if(.not.getscalar(fname,top,top-rhs+1,lr1)) return
+c     
+c       cross variable size checking
+c     
+       call entier(1,stk(lr1),istk(iadr(lr1)))
+       if(.not.cremat(fname,top+1,0,1,1,lw2,loc2)) return
+       if(.not.cremat(fname,top+2,0,1,1,lw3,loc3)) return
+       call MPI_COMM_SIZE(istk(iadr(lr1)),stk(lw2),stk(lw3))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+2
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: numprocs
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw2)),-1,stk(lrs),-1)
+       endif
+c     
+       if(lhs .ge. 2) then
+c       --------------output variable: res
+        top=topl+2
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw3)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       if(lhs .ge. 2) then
+        call copyobj(fname,topl+2,topk+2)
+       endif
+       top=topk+lhs
+       return
+       end
+c
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_finalize.f b/scilab/modules/mpi/src/fortran/intsmpi_finalize.f

new file mode 100644 (file)

index 0000000..2157e7f
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_finalize.f
@@ -0,0 +1,45 @@
+c SCILAB function : mpi_finalize, fin = 6
+       subroutine intsmpi_finalize(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       logical checkrhs,checklhs,cremat
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,0,0)) return
+       if(.not.checklhs(fname,1,1)) return
+c     
+c       cross variable size checking
+c     
+       if(.not.cremat(fname,top+1,0,1,1,lw1,loc1)) return
+       call MPI_FINALIZE(stk(lw1))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+1
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: res
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw1)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       top=topk+lhs
+       return
+       end
+c
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_init.f b/scilab/modules/mpi/src/fortran/intsmpi_init.f

new file mode 100644 (file)

index 0000000..73b82c8
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_init.f
@@ -0,0 +1,46 @@
+
+c SCILAB function : mpi_init, fin = 5
+       subroutine intsmpi_init(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       logical checkrhs,checklhs,cremat
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,0,0)) return
+       if(.not.checklhs(fname,1,1)) return
+c     
+c       cross variable size checking
+c     
+       if(.not.cremat(fname,top+1,0,1,1,lw1,loc1)) return
+       call MPI_INIT(stk(lw1))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+1
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: res
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw1)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       top=topk+lhs
+       return
+       end
+c
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_irecv.f b/scilab/modules/mpi/src/fortran/intsmpi_irecv.f

new file mode 100644 (file)

index 0000000..8fdcaa3
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_irecv.f
@@ -0,0 +1,74 @@
+c SCILAB function : mpi_irecv, fin = 4
+       subroutine intsmpi_irecv(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       logical checkrhs,checklhs,getscalar,cremat
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,2,3)) return
+       if(.not.checklhs(fname,1,2)) return
+c       checking variable source (number 1)
+c       
+       if(.not.getscalar(fname,top,top-rhs+1,lr1)) return
+c       checking variable tag (number 2)
+c       
+       if(.not.getscalar(fname,top,top-rhs+2,lr2)) return
+c       checking variable comm (number 3)
+c       
+       if(rhs .le. 2) then
+        top = top+1
+        rhs = rhs+1
+        if(.not.cremat(fname,top,0,1,1,lr3,lc3)) return
+        stk(lr3)= MPI_COMM_WORLD
+       endif
+       if(.not.getscalar(fname,top,top-rhs+3,lr3)) return
+c     
+c       cross variable size checking
+c     
+       call entier(1,stk(lr1),istk(iadr(lr1)))
+       call entier(1,stk(lr2),istk(iadr(lr2)))
+       call entier(1,stk(lr3),istk(iadr(lr3)))
+       if(.not.cremat(fname,top+1,0,1,1,lw4,loc4)) return
+       if(.not.cremat(fname,top+2,0,1,1,lw5,loc5)) return
+       call scimpiirecv(istk(iadr(lr1)),istk(iadr(lr2)),istk(iadr(lr3)),
+     $ stk(lw4),stk(lw5))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+2
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: request
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw4)),-1,stk(lrs),-1)
+       endif
+c     
+       if(lhs .ge. 2) then
+c       --------------output variable: res
+        top=topl+2
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw5)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       if(lhs .ge. 2) then
+        call copyobj(fname,topl+2,topk+2)
+       endif
+       top=topk+lhs
+       return
+       end
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_isend.f b/scilab/modules/mpi/src/fortran/intsmpi_isend.f

new file mode 100644 (file)

index 0000000..e053634
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_isend.f
@@ -0,0 +1,110 @@
+c SCILAB function : mpi_isend, fin = 3
+       subroutine intsmpi_isend(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       integer address, n
+       logical checkrhs,checklhs,getscalar,cremat
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,3,4)) return
+       if(.not.checklhs(fname,1,2)) return
+c       checking variable dest (number 2)
+c       
+       if(.not.getscalar(fname,top,top-rhs+2,lr2)) return
+c       checking variable tag (number 3)
+c       
+       if(.not.getscalar(fname,top,top-rhs+3,lr3)) return
+c       checking variable comm (number 4)
+c       
+       if(rhs .le. 3) then
+        top = top+1
+        rhs = rhs+1
+        if(.not.cremat(fname,top,0,1,1,lr4,lc4)) return
+        stk(lr4)= MPI_COMM_WORLD
+       endif
+       if(.not.getscalar(fname,top,top-rhs+4,lr4)) return
+c     construct the pack vector for the variable number 1
+c     set adress where to put the pack vector and its max
+c     allowable size
+       beginvar=lstk(top)
+       maxsize=lstk(bot) - beginvar
+       address = top-rhs+1
+c       write(*,*) 'call varpack'
+       call varpak(address,stk(beginvar),n,maxsize,ierr)
+c       write(*,*) 'callback varpack'
+       if(ierr .gt. 0) then 
+          buf = fname // ' Unknow type or not yet implemented' 
+          call error(999)
+          return
+       endif
+c
+c     Check if maxsize has been enough
+       if(n.gt.maxsize) then
+          err=n-maxsize
+          call error(17)
+          return
+       endif 
+c
+c     set correct size for the pack vect
+       lstk(top+1)=lstk(top)+n
+
+
+c     
+c       cross variable size checking
+c     
+       call entier(1,stk(lr2),istk(iadr(lr2)))
+       call entier(1,stk(lr3),istk(iadr(lr3)))
+c     WARNING: si on met la ligne en dessous, ce ECRASE la 5ieme case
+c       tableau varpack. 
+c     The question is WHY?????
+c       call entier(1,stk(lr4),istk(iadr(lr4)))
+       if(.not.cremat(fname,top+1,0,1,1,lw7,loc7)) return
+       if(.not.cremat(fname,top+2,0,1,1,lw8,loc8)) return
+       call scimpiisend(stk(beginvar),n,
+     $      stk(lstk(address)),
+     $      istk(iadr(lr2)),
+     $      istk(iadr(lr3)),
+     $      istk(iadr(lr4)),
+     $      stk(lw7),
+     $      stk(lw8))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+2
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: request
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw7)),-1,stk(lrs),-1)
+       endif
+c     
+       if(lhs .ge. 2) then
+c       --------------output variable: res
+        top=topl+2
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw8)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       if(lhs .ge. 2) then
+        call copyobj(fname,topl+2,topk+2)
+       endif
+       top=topk+lhs
+       return
+       end
+c
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_recv.f b/scilab/modules/mpi/src/fortran/intsmpi_recv.f

new file mode 100644 (file)

index 0000000..075f7df
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_recv.f
@@ -0,0 +1,88 @@
+c SCILAB function : mpi_recv, fin = 2
+       subroutine intsmpi_recv(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c      
+       integer iadr, sadr
+       integer beginvar, maxsize, n
+       integer source, tag, comm, status(2), result
+       integer topk,rhsk
+       logical checkrhs,checklhs,getscalar,cremat
+c     
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,2,3)) return
+       if(.not.checklhs(fname,1,3)) return
+c     checking variable source (number 1)
+c       
+       if(.not.getscalar(fname,top,top-rhs+1,lr1)) return
+       source = stk(lr1)       
+c     checking variable tag (number 2)
+c       
+       if(.not.getscalar(fname,top,top-rhs+2,lr2)) return
+       tag = stk(lr2)
+c     checking variable comm (number 3)
+c       
+       if(rhs .le. 2) then
+        top = top+1
+        rhs = rhs+1
+        if(.not.cremat(fname,top,0,1,1,lr3,lc3)) return
+        stk(lr3)= MPI_COMM_WORLD
+       endif
+       if(.not.getscalar(fname,top,top-rhs+3,lr3)) return
+       comm = stk(lr3)
+c
+c     free input variable at the top of the stack
+       top=top-rhs+1
+c
+c     set adress where to put the received variable and its max
+c     allowable size
+       beginvar=lstk(top)
+       maxsize=lstk(bot)-beginvar
+c
+c     receive the variable
+       call scimpirecv(stk(beginvar), maxsize, n,
+     $      source, tag, comm, status, result)
+c     ATTENTION scimpirecv ne doit pas ecrire plus de maxsize double
+c     dans stk(beginvar)
+       if(err .gt. 0) then 
+          buf = fname // ' Internal Error' 
+          call error(999)
+          return
+       endif
+c
+c     Check if maxsize has been enough
+       if(n.gt.maxsize) then
+          err=n-maxsize
+          call error(17)
+          return
+       endif 
+c
+c     set correct size for the received variable
+       lstk(top+1)=lstk(top)+n
+c     MA MODIF: j'incremente top ici et non pas apres la creation de
+c     la variable de retour...
+       top=top+1
+c
+c     
+c     create variable status at the top of the returned variables
+      if(.not.cremat(fname,top,0,1,7,lrs,lcs)) return
+c     set value of the status variable
+      call int2db(2,status,-1,stk(lrs),-1)
+      top=top+1
+c     create variable status at the top of the returned variables
+      if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+c     set value of the status variable
+      stk(lrs)=result
+c     clear res & status variable if lhs result 1
+      if(lhs.eq.1) top=top-2
+c     clear res variable if lhs result 2
+      if(lhs.eq.2) top=top-1
+      return
+      end
+c
diff --git a/scilab/modules/mpi/src/fortran/intsmpi_send.f b/scilab/modules/mpi/src/fortran/intsmpi_send.f

new file mode 100644 (file)

index 0000000..92e4adb
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/intsmpi_send.f
@@ -0,0 +1,101 @@
+c SCILAB function : mpi_send, fin = 1
+       subroutine intsmpi_send(fname)
+c
+       character*(*) fname
+       include 'stack.h'
+c
+       integer iadr, sadr
+       integer topk,rhsk,topl
+       integer address,n,beginvar
+       logical checkrhs,checklhs,getscalar,cremat
+       iadr(l)=l+l-1
+       sadr(l)=(l/2)+1
+       rhs = max(0,rhs)
+c
+       topk = top 
+       rhsk = rhs 
+       if(.not.checkrhs(fname,3,4)) return
+       if(.not.checklhs(fname,1,1)) return
+c       checking variable buff (number 1)
+c       
+c       if(.not.getmat(fname,top,top-rhs+1,it1,m1,n1,lr1,lc1)) return
+c       checking variable dest (number 2)
+c       
+       if(.not.getscalar(fname,top,top-rhs+2,lr2)) return
+c       checking variable tag (number 3)
+c       
+       if(.not.getscalar(fname,top,top-rhs+3,lr3)) return
+c       checking variable comm (number 4)
+c       
+       if(rhs .le. 3) then
+        top = top+1
+        rhs = rhs+1
+        if(.not.cremat(fname,top,0,1,1,lr4,lc4)) return
+        stk(lr4)= MPI_COMM_WORLD
+       endif
+       if(.not.getscalar(fname,top,top-rhs+4,lr4)) return
+
+c     construct the pack vector for the variable number 1
+c     set adress where to put the pack vector and its max
+c     allowable size
+       beginvar=lstk(top)
+       maxsize=lstk(bot) - beginvar
+       address = top-rhs+1
+c       write(*,*) 'call varpack'
+       call varpak(address,stk(beginvar),n,maxsize,ierr)
+c       write(*,*) 'callback varpack'
+       if(ierr .gt. 0) then 
+          buf = fname // ' Unknow type or not yet implemented' 
+          call error(999)
+          return
+       endif
+c
+c     Check if maxsize has been enough
+      if(n.gt.maxsize) then
+         err=n-maxsize
+         call error(17)
+         return
+      endif 
+c
+c     set correct size for the pack vect
+      lstk(top+1)=lstk(top)+n
+
+
+c     
+c       cross variable size checking
+c     
+c       call entier(1,stk(lr2),istk(iadr(lr2)))
+c       call entier(1,stk(lr3),istk(iadr(lr3)))
+c     WARNING: si on met la ligne en dessous, ce ECRASE la 5ieme case
+c       tableau varpack. 
+c     The question is WHY?????
+c       call entier(1,stk(lr4),istk(iadr(lr4)))
+       if(.not.cremat(fname,top+1,0,1,1,lw7,loc7)) return
+       call scimpisend(stk(beginvar),n,
+     $      stk(lstk(address)),
+     $      istk(iadr(lr2)),
+     $      istk(iadr(lr3)),
+     $      istk(iadr(lr4)),
+     $      stk(lw7))
+       if(err .gt. 0) then 
+        buf = fname // ' Internal Error' 
+        call error(999)
+        return
+       endif
+c
+       topk=top-rhs
+       topl=top+1
+c     
+       if(lhs .ge. 1) then
+c       --------------output variable: res
+        top=topl+1
+        if(.not.cremat(fname,top,0,1,1,lrs,lcs)) return
+        call int2db(1*1,istk(iadr(lw7)),-1,stk(lrs),-1)
+       endif
+c     Putting in order the stack
+       if(lhs .ge. 1) then
+        call copyobj(fname,topl+1,topk+1)
+       endif
+       top=topk+lhs
+       return
+       end
diff --git a/scilab/modules/mpi/src/fortran/mpi_init.f b/scilab/modules/mpi/src/fortran/mpi_init.f

new file mode 100644 (file)

index 0000000..32366a6
--- /dev/null
+++ b/scilab/modules/mpi/src/fortran/mpi_init.f
@@ -0,0 +1,16 @@
+      subroutine scimpiinit(ierr)
+      include "mpif.h"
+      call MPI_INIT(ierr)
+      end
+
+
+      subroutine scimpicommrank(comm, myid, ierr)
+      include "mpif.h"
+      call MPI_COMM_RANK(comm, myid, ierr)
+      end
+
+
+      subroutine scimpicommsize(comm, numprocs, ierr)
+      include "mpif.h"
+      call MPI_COMM_SIZE(comm, numprocs, ierr)
+  &nbs
scilab/Makefile.in		patch \| blob \| history
scilab/Makefile.incl.in		patch \| blob \| history
scilab/Version.incl		patch \| blob \| history
scilab/aclocal.m4		patch \| blob \| history
scilab/configure		patch \| blob \| history
scilab/configure.ac		patch \| blob \| history
scilab/contrib/Makefile.in		patch \| blob \| history
scilab/etc/modules.xml.in		patch \| blob \| history
scilab/libs/MALLOC/Makefile.in		patch \| blob \| history
scilab/libs/Makefile.in		patch \| blob \| history
scilab/libs/doublylinkedlist/Makefile.in		patch \| blob \| history
scilab/libs/dynamiclibrary/Makefile.in		patch \| blob \| history
scilab/libs/hashtable/Makefile.in		patch \| blob \| history
scilab/libs/libst/Makefile.in		patch \| blob \| history
scilab/m4/mpi.m4		patch \| blob \| history
scilab/modules/Makefile.in		patch \| blob \| history
scilab/modules/action_binding/Makefile.in		patch \| blob \| history
scilab/modules/api_scilab/Makefile.in		patch \| blob \| history
scilab/modules/api_scilab/help/en_US/string_reading_api.xml		patch \| blob \| history
scilab/modules/arnoldi/Makefile.in		patch \| blob \| history
scilab/modules/atoms/Makefile.in		patch \| blob \| history
scilab/modules/boolean/Makefile.in		patch \| blob \| history
scilab/modules/cacsd/Makefile.in		patch \| blob \| history
scilab/modules/call_scilab/Makefile.in		patch \| blob \| history
scilab/modules/compatibility_functions/Makefile.in		patch \| blob \| history
scilab/modules/completion/Makefile.in		patch \| blob \| history
scilab/modules/console/Makefile.in		patch \| blob \| history
scilab/modules/core/Makefile.in		patch \| blob \| history
scilab/modules/core/includes/version.h		patch \| blob \| history
scilab/modules/data_structures/Makefile.in		patch \| blob \| history
scilab/modules/demo_tools/Makefile.in		patch \| blob \| history
scilab/modules/development_tools/Makefile.in		patch \| blob \| history
scilab/modules/development_tools/src/fake/Makefile.in		patch \| blob \| history
scilab/modules/differential_equations/Makefile.in		patch \| blob \| history
scilab/modules/double/Makefile.in		patch \| blob \| history
scilab/modules/dynamic_link/Makefile.in		patch \| blob \| history
scilab/modules/elementary_functions/Makefile.in		patch \| blob \| history
scilab/modules/fftw/Makefile.in		patch \| blob \| history
scilab/modules/fileio/Makefile.in		patch \| blob \| history
scilab/modules/functions/Makefile.in		patch \| blob \| history
scilab/modules/genetic_algorithms/Makefile.in		patch \| blob \| history
scilab/modules/graphic_export/Makefile.in		patch \| blob \| history
scilab/modules/graphics/Makefile.in		patch \| blob \| history
scilab/modules/gui/Makefile.in		patch \| blob \| history
scilab/modules/hdf5/Makefile.in		patch \| blob \| history
scilab/modules/helptools/Makefile.in		patch \| blob \| history
scilab/modules/history_manager/Makefile.in		patch \| blob \| history
scilab/modules/integer/Makefile.in		patch \| blob \| history
scilab/modules/interpolation/Makefile.in		patch \| blob \| history
scilab/modules/intersci/Makefile.in		patch \| blob \| history
scilab/modules/io/Makefile.in		patch \| blob \| history
scilab/modules/javasci/Makefile.in		patch \| blob \| history
scilab/modules/jvm/Makefile.in		patch \| blob \| history
scilab/modules/linear_algebra/Makefile.in		patch \| blob \| history
scilab/modules/localization/Makefile.in		patch \| blob \| history
scilab/modules/m2sci/Makefile.in		patch \| blob \| history
scilab/modules/maple2scilab/Makefile.in		patch \| blob \| history
scilab/modules/matio/Makefile.in		patch \| blob \| history
scilab/modules/mexlib/Makefile.in		patch \| blob \| history
scilab/modules/mpi/Makefile.am	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/Makefile.in	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/TODO	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/VERSION	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/changelog.txt	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/etc/mpi.quit	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/etc/mpi.start	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/examples/foo.sci	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/includes/gw_mpi.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/licence.txt	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/macros/MPIHelloWorld.sci	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/macros/MPIPi.sci	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/macros/MPIPi_seq.sci	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/macros/buildmacros.sce	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/macros/mpi.sce	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/readme.txt	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/gw_mpi.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_rank.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_comm_size.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_finalize.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_init.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_irecv.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_isend.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_recv.c.back	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/c/sci_mpi_send.c.back	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/mpi	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/sci_gateway/mpi_gateway.xml	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/#s_mpi_send.c#	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/build_buff_type.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/build_buff_type.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/dboard.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/mappingScilabMPI.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/mappingScilabMPI.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/mpi_pi_reduce.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/mpi_pi_send.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/mpitest.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_irecv.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_irecv.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_isend.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_isend.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_recv.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_recv.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_send.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/s_mpi_send.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/sci_mpi.h	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/c/testPDGEMM-MPI.c	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intmpi.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_comm_rank.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_comm_size.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_finalize.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_init.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_irecv.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_isend.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_recv.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/intsmpi_send.f	[new file with mode: 0644]	patch \| blob
scilab/modules/mpi/src/fortran/mpi_init.f	[new file with mode: 0644]	patch \| blob
scilab/modules/optimization/Makefile.in		patch \| blob \| history
scilab/modules/output_stream/Makefile.in		patch \| blob \| history
scilab/modules/overloading/Makefile.in		patch \| blob \| history
scilab/modules/parameters/Makefile.in		patch \| blob \| history
scilab/modules/polynomials/Makefile.in		patch \| blob \| history
scilab/modules/pvm/Makefile.in		patch \| blob \| history
scilab/modules/randlib/Makefile.in		patch \| blob \| history
scilab/modules/renderer/Makefile.in		patch \| blob \| history
scilab/modules/scicos/Makefile.in		patch \| blob \| history
scilab/modules/scicos_blocks/Makefile.in		patch \| blob \| history
scilab/modules/shell/Makefile.in		patch \| blob \| history
scilab/modules/signal_processing/Makefile.in		patch \| blob \| history
scilab/modules/simulated_annealing/Makefile.in		patch \| blob \| history
scilab/modules/sound/Makefile.in		patch \| blob \| history
scilab/modules/sparse/Makefile.in		patch \| blob \| history
scilab/modules/special_functions/Makefile.in		patch \| blob \| history
scilab/modules/spreadsheet/Makefile.in		patch \| blob \| history
scilab/modules/statistics/Makefile.in		patch \| blob \| history
scilab/modules/string/Makefile.in		patch \| blob \| history
scilab/modules/symbolic/Makefile.in		patch \| blob \| history
scilab/modules/tclsci/Makefile.in		patch \| blob \| history
scilab/modules/texmacs/Makefile.in		patch \| blob \| history
scilab/modules/time/Makefile.in		patch \| blob \| history
scilab/modules/umfpack/Makefile.in		patch \| blob \| history
scilab/modules/windows_tools/Makefile.in		patch \| blob \| history
scilab/modules/xcos/Makefile.in		patch \| blob \| history
scilab/modules/xcos/sci_gateway/c/gw_xcos.c		patch \| blob \| history
scilab/modules/xpad/Makefile.in		patch \| blob \| history