summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernard HUGUENEY <bernard.hugueney@scilab.org>2010-05-26 10:01:04 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-05-27 11:57:14 +0200
commitdd47825c7d1ecff6a9518fc8e0e3e06aa1d8922a (patch)
treebfd7b0d40588231cf7878d0ccce54f95c067fc68
parentd102072bb419584ae6f3d03fc0da7943c174245f (diff)
downloadscilab-dd47825c7d1ecff6a9518fc8e0e3e06aa1d8922a.zip
scilab-dd47825c7d1ecff6a9518fc8e0e3e06aa1d8922a.tar.gz
module parallel gateway (dynamic load)
Change-Id: I85286ad19063c1db030ebb92b27933462976c74f
-rw-r--r--scilab/Makefile.in1
-rw-r--r--scilab/Scilab.sln18
-rw-r--r--scilab/Scilab_f2c.sln18
-rwxr-xr-xscilab/configure147
-rw-r--r--scilab/configure.ac36
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/etc/modules.xml.in1
-rw-r--r--scilab/etc/modules.xml.vc1
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/modules/Makefile.am8
-rw-r--r--scilab/modules/Makefile.in10
-rw-r--r--scilab/modules/action_binding/Makefile.in1
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in1
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/boolean/Makefile.in1
-rw-r--r--scilab/modules/cacsd/Makefile.in1
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in1
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/core/includes/callinterf.h2
-rw-r--r--scilab/modules/core/sci_gateway/core_gateway.xml1
-rw-r--r--scilab/modules/core/src/c/callinterf.c6
-rw-r--r--scilab/modules/core/src/c/dynamic_gateways.c19
-rw-r--r--scilab/modules/core/src/c/dynamic_gateways.h7
-rw-r--r--scilab/modules/data_structures/Makefile.in1
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in1
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/elementary_functions/Makefile.in1
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/functions/Makefile.in1
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graph/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in1
-rw-r--r--scilab/modules/graphics/Makefile.in1
-rw-r--r--scilab/modules/gui/Makefile.in1
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in1
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/javasci/Makefile.in1
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in1
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.in1
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in1
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/parallel/Makefile.am69
-rw-r--r--scilab/modules/parallel/Makefile.in1144
-rw-r--r--scilab/modules/parallel/etc/parallel.quit8
-rw-r--r--scilab/modules/parallel/etc/parallel.start8
-rw-r--r--scilab/modules/parallel/help/en_US/addchapter.sce11
-rw-r--r--scilab/modules/parallel/help/en_US/parallel_run.xml621
-rw-r--r--scilab/modules/parallel/help/fr_FR/addchapter.sce11
-rw-r--r--scilab/modules/parallel/help/pt_BR/addchapter.sce11
-rw-r--r--scilab/modules/parallel/includes/dynlib_parallel.h28
-rw-r--r--scilab/modules/parallel/includes/gw_parallel.h22
-rw-r--r--scilab/modules/parallel/license.txt9
-rw-r--r--scilab/modules/parallel/macros/buildmacros.bat11
-rw-r--r--scilab/modules/parallel/macros/buildmacros.sce17
-rw-r--r--scilab/modules/parallel/macros/cleanmacros.bat13
-rw-r--r--scilab/modules/parallel/parallel.iss43
-rw-r--r--scilab/modules/parallel/readme.txt1
-rw-r--r--scilab/modules/parallel/sci_gateway/c/gw_parallel.c38
-rw-r--r--scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp871
-rw-r--r--scilab/modules/parallel/sci_gateway/parallel_gateway.xml26
-rw-r--r--scilab/modules/parallel/src/c/DllmainParallel.c33
-rw-r--r--scilab/modules/parallel/src/c/LibScilab_Import.def18
-rw-r--r--scilab/modules/parallel/src/c/parallel.rc96
-rw-r--r--scilab/modules/parallel/src/c/parallel.vcproj443
-rw-r--r--scilab/modules/parallel/src/cpp/parallel_run.hxx345
-rw-r--r--scilab/modules/parallel/tests/unit_tests/parallel_run.dia.ref201
-rw-r--r--scilab/modules/parallel/tests/unit_tests/parallel_run.tst260
-rw-r--r--scilab/modules/parallel/version.xml11
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in1
-rw-r--r--scilab/modules/pvm/Makefile.in1
-rw-r--r--scilab/modules/randlib/Makefile.in1
-rw-r--r--scilab/modules/renderer/Makefile.in1
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in1
-rw-r--r--scilab/modules/sparse/Makefile.in1
-rw-r--r--scilab/modules/special_functions/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/statistics/Makefile.in1
-rw-r--r--scilab/modules/string/Makefile.in1
-rw-r--r--scilab/modules/symbolic/Makefile.in1
-rw-r--r--scilab/modules/tclsci/Makefile.in1
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/types/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/Makefile.in1
-rw-r--r--scilab/modules/xcos/Makefile.in1
-rw-r--r--scilab/modules/xpad/Makefile.in1
118 files changed, 4663 insertions, 58 deletions
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 70727e8..b4fb3ea 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -445,6 +445,7 @@ OCAMLDEP = @OCAMLDEP@
445OCAMLLEX = @OCAMLLEX@ 445OCAMLLEX = @OCAMLLEX@
446OCAMLOPT = @OCAMLOPT@ 446OCAMLOPT = @OCAMLOPT@
447OCAMLYACC = @OCAMLYACC@ 447OCAMLYACC = @OCAMLYACC@
448OPENMP_ENABLE = @OPENMP_ENABLE@
448OTOOL = @OTOOL@ 449OTOOL = @OTOOL@
449OTOOL64 = @OTOOL64@ 450OTOOL64 = @OTOOL64@
450PACKAGE = @PACKAGE@ 451PACKAGE = @PACKAGE@
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index c58b597..eb95357 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -1104,6 +1104,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parameters", "modules\param
1104 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} 1104 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
1105 EndProjectSection 1105 EndProjectSection
1106EndProject 1106EndProject
1107Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel", "modules\parallel\src\c\parallel.vcproj", "{56A2E2F3-26CF-45D5-BE7A-534C39CD7003}"
1108 ProjectSection(ProjectDependencies) = postProject
1109 {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
1110 {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
1111 {A09E8584-0713-48A5-97BA-ACED0F3728F8} = {A09E8584-0713-48A5-97BA-ACED0F3728F8}
1112 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
1113 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
1114 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
1115 EndProjectSection
1116EndProject
1107Global 1117Global
1108 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1118 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1109 Debug|Win32 = Debug|Win32 1119 Debug|Win32 = Debug|Win32
@@ -2224,6 +2234,14 @@ Global
2224 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|Win32.Build.0 = Release|Win32 2234 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|Win32.Build.0 = Release|Win32
2225 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.ActiveCfg = Release|x64 2235 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.ActiveCfg = Release|x64
2226 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.Build.0 = Release|x64 2236 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.Build.0 = Release|x64
2237 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.ActiveCfg = Debug|Win32
2238 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.Build.0 = Debug|Win32
2239 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.ActiveCfg = Debug|x64
2240 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.Build.0 = Debug|x64
2241 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.ActiveCfg = Release|Win32
2242 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.Build.0 = Release|Win32
2243 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
2244 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
2227 EndGlobalSection 2245 EndGlobalSection
2228 GlobalSection(SolutionProperties) = preSolution 2246 GlobalSection(SolutionProperties) = preSolution
2229 HideSolutionNode = FALSE 2247 HideSolutionNode = FALSE
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 24f29f9..b846495 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1105,6 +1105,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parameters", "modules\param
1105 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} 1105 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
1106 EndProjectSection 1106 EndProjectSection
1107EndProject 1107EndProject
1108Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel", "modules\parallel\src\c\parallel.vcproj", "{56A2E2F3-26CF-45D5-BE7A-534C39CD7003}"
1109 ProjectSection(ProjectDependencies) = postProject
1110 {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
1111 {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
1112 {A09E8584-0713-48A5-97BA-ACED0F3728F8} = {A09E8584-0713-48A5-97BA-ACED0F3728F8}
1113 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
1114 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
1115 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
1116 EndProjectSection
1117EndProject
1108Global 1118Global
1109 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1119 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1110 Debug|Win32 = Debug|Win32 1120 Debug|Win32 = Debug|Win32
@@ -2227,6 +2237,14 @@ Global
2227 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|Win32.Build.0 = Release|Win32 2237 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|Win32.Build.0 = Release|Win32
2228 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.ActiveCfg = Release|x64 2238 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.ActiveCfg = Release|x64
2229 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.Build.0 = Release|x64 2239 {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.Build.0 = Release|x64
2240 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.ActiveCfg = Debug|Win32
2241 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.Build.0 = Debug|Win32
2242 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.ActiveCfg = Debug|x64
2243 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.Build.0 = Debug|x64
2244 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.ActiveCfg = Release|Win32
2245 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.Build.0 = Release|Win32
2246 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
2247 {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
2230 EndGlobalSection 2248 EndGlobalSection
2231 GlobalSection(SolutionProperties) = preSolution 2249 GlobalSection(SolutionProperties) = preSolution
2232 HideSolutionNode = FALSE 2250 HideSolutionNode = FALSE
diff --git a/scilab/configure b/scilab/configure
index cae11dc..1205c87 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -674,6 +674,9 @@ XML_VERSION
674XML_LIBS 674XML_LIBS
675XML_FLAGS 675XML_FLAGS
676XML_CONFIG 676XML_CONFIG
677OPENMP_FALSE
678OPENMP_TRUE
679OPENMP_ENABLE
677PVM_FALSE 680PVM_FALSE
678PVM_TRUE 681PVM_TRUE
679PVM_ENABLE 682PVM_ENABLE
@@ -942,6 +945,7 @@ with_fftw_library
942with_pvm 945with_pvm
943with_pvm_include 946with_pvm_include
944with_pvm_library 947with_pvm_library
948with_openmp
945with_libxml2 949with_libxml2
946enable_build_localization 950enable_build_localization
947with_blas_library 951with_blas_library
@@ -1679,6 +1683,8 @@ Optional Packages:
1679 --without-pvm Disable the interface to the PVM library 1683 --without-pvm Disable the interface to the PVM library
1680 --with-pvm-include=DIR Set the path to the PVM headers 1684 --with-pvm-include=DIR Set the path to the PVM headers
1681 --with-pvm-library=DIR Set the path to the PVM library directory 1685 --with-pvm-library=DIR Set the path to the PVM library directory
1686 --without-openmp Disable the usage of OpenMP (parallelization of some
1687 algoritms)
1682 --with-libxml2=PREFIX Set the path to your libxml2 installation 1688 --with-libxml2=PREFIX Set the path to your libxml2 installation
1683 --with-blas-library=DIR set the path to the BLAS (refblas, Atlas, MKL...) 1689 --with-blas-library=DIR set the path to the BLAS (refblas, Atlas, MKL...)
1684 library 1690 library
@@ -9889,7 +9895,7 @@ $as_echo "$ac_java_classpath" >&6; }
9889$as_echo_n "checking to see if the java compiler works... " >&6; } 9895$as_echo_n "checking to see if the java compiler works... " >&6; }
9890 9896
9891 cat << \EOF > conftest.java 9897 cat << \EOF > conftest.java
9892// #line 9892 "configure" 9898// #line 9898 "configure"
9893 9899
9894 9900
9895public class conftest { 9901public class conftest {
@@ -9955,7 +9961,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9955 if test "x$ac_java_jvm_name" = "x" ; then 9961 if test "x$ac_java_jvm_name" = "x" ; then
9956 9962
9957 cat << \EOF > conftest.java 9963 cat << \EOF > conftest.java
9958// #line 9958 "configure" 9964// #line 9964 "configure"
9959import gnu.java.io.EncodingManager; 9965import gnu.java.io.EncodingManager;
9960 9966
9961public class conftest { 9967public class conftest {
@@ -10019,7 +10025,7 @@ $as_echo_n "checking java API version... " >&6; }
10019 10025
10020 10026
10021 cat << \EOF > conftest.java 10027 cat << \EOF > conftest.java
10022// #line 10022 "configure" 10028// #line 10028 "configure"
10023import java.nio.charset.Charset; 10029import java.nio.charset.Charset;
10024 10030
10025public class conftest { 10031public class conftest {
@@ -10064,7 +10070,7 @@ EOF
10064 10070
10065 10071
10066 cat << \EOF > conftest.java 10072 cat << \EOF > conftest.java
10067// #line 10067 "configure" 10073// #line 10073 "configure"
10068import java.lang.StringBuilder; 10074import java.lang.StringBuilder;
10069 10075
10070public class conftest { 10076public class conftest {
@@ -11323,7 +11329,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11323 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11329 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11324 11330
11325 cat << \EOF > conftest.java 11331 cat << \EOF > conftest.java
11326// #line 11326 "configure" 11332// #line 11332 "configure"
11327import com.mxgraph.model.mxCell; 11333import com.mxgraph.model.mxCell;
11328 11334
11329public class conftest { 11335public class conftest {
@@ -11416,7 +11422,7 @@ $as_echo_n "checking minimal version (1.4.0.2) of jgraphx... " >&6; }
11416 export ac_java_classpath="$JGRAPHX:$ac_java_classpath" 11422 export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
11417 11423
11418 cat << \EOF > conftest.java 11424 cat << \EOF > conftest.java
11419// #line 11419 "configure" 11425// #line 11425 "configure"
11420import com.mxgraph.view.mxGraph; 11426import com.mxgraph.view.mxGraph;
11421 11427
11422public class conftest { 11428public class conftest {
@@ -11488,7 +11494,7 @@ $as_echo_n "checking flexdock... " >&6; }
11488 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11494 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11489 11495
11490 cat << \EOF > conftest.java 11496 cat << \EOF > conftest.java
11491// #line 11491 "configure" 11497// #line 11497 "configure"
11492import org.flexdock.docking.DockingManager; 11498import org.flexdock.docking.DockingManager;
11493 11499
11494public class conftest { 11500public class conftest {
@@ -11595,7 +11601,7 @@ $as_echo_n "checking looks... " >&6; }
11595 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11601 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11596 11602
11597 cat << \EOF > conftest.java 11603 cat << \EOF > conftest.java
11598// #line 11598 "configure" 11604// #line 11604 "configure"
11599import com.jgoodies.looks.common.RenderingUtils; 11605import com.jgoodies.looks.common.RenderingUtils;
11600 11606
11601public class conftest { 11607public class conftest {
@@ -11702,7 +11708,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11702 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11708 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11703 11709
11704 cat << \EOF > conftest.java 11710 cat << \EOF > conftest.java
11705// #line 11705 "configure" 11711// #line 11711 "configure"
11706import com.jgoodies.looks.common.RenderingUtils; 11712import com.jgoodies.looks.common.RenderingUtils;
11707 11713
11708public class conftest { 11714public class conftest {
@@ -11810,7 +11816,7 @@ $as_echo_n "checking skinlf... " >&6; }
11810 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11816 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11811 11817
11812 cat << \EOF > conftest.java 11818 cat << \EOF > conftest.java
11813// #line 11813 "configure" 11819// #line 11819 "configure"
11814import com.l2fprod.util.AccessUtils; 11820import com.l2fprod.util.AccessUtils;
11815 11821
11816public class conftest { 11822public class conftest {
@@ -11917,7 +11923,7 @@ $as_echo_n "checking jogl... " >&6; }
11917 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11923 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11918 11924
11919 cat << \EOF > conftest.java 11925 cat << \EOF > conftest.java
11920// #line 11920 "configure" 11926// #line 11926 "configure"
11921import javax.media.opengl.glu.GLUnurbs; 11927import javax.media.opengl.glu.GLUnurbs;
11922 11928
11923public class conftest { 11929public class conftest {
@@ -12127,7 +12133,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12127 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12133 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12128 12134
12129 cat << \EOF > conftest.java 12135 cat << \EOF > conftest.java
12130// #line 12130 "configure" 12136// #line 12136 "configure"
12131import com.sun.gluegen.runtime.CPU; 12137import com.sun.gluegen.runtime.CPU;
12132 12138
12133public class conftest { 12139public class conftest {
@@ -12289,7 +12295,7 @@ $as_echo_n "checking jhall... " >&6; }
12289 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12295 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12290 12296
12291 cat << \EOF > conftest.java 12297 cat << \EOF > conftest.java
12292// #line 12292 "configure" 12298// #line 12298 "configure"
12293import javax.help.JHelp; 12299import javax.help.JHelp;
12294 12300
12295public class conftest { 12301public class conftest {
@@ -12396,7 +12402,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12396 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12402 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12397 12403
12398 cat << \EOF > conftest.java 12404 cat << \EOF > conftest.java
12399// #line 12399 "configure" 12405// #line 12405 "configure"
12400import javax.help.JHelp; 12406import javax.help.JHelp;
12401 12407
12402public class conftest { 12408public class conftest {
@@ -12504,7 +12510,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12504 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12510 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12505 12511
12506 cat << \EOF > conftest.java 12512 cat << \EOF > conftest.java
12507// #line 12507 "configure" 12513// #line 12513 "configure"
12508import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12514import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12509 12515
12510public class conftest { 12516public class conftest {
@@ -12611,7 +12617,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12611 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12617 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12612 12618
12613 cat << \EOF > conftest.java 12619 cat << \EOF > conftest.java
12614// #line 12614 "configure" 12620// #line 12620 "configure"
12615import com.artenum.rosetta.core.action.AbstractConsoleAction; 12621import com.artenum.rosetta.core.action.AbstractConsoleAction;
12616 12622
12617public class conftest { 12623public class conftest {
@@ -12720,7 +12726,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
12720 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12726 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12721 12727
12722 cat << \EOF > conftest.java 12728 cat << \EOF > conftest.java
12723// #line 12723 "configure" 12729// #line 12729 "configure"
12724import net.sourceforge.jeuclid.LayoutContext; 12730import net.sourceforge.jeuclid.LayoutContext;
12725 12731
12726public class conftest { 12732public class conftest {
@@ -12829,7 +12835,7 @@ $as_echo_n "checking fop... " >&6; }
12829 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12835 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12830 12836
12831 cat << \EOF > conftest.java 12837 cat << \EOF > conftest.java
12832// #line 12832 "configure" 12838// #line 12838 "configure"
12833import org.apache.fop.pdf.PDFInfo; 12839import org.apache.fop.pdf.PDFInfo;
12834 12840
12835public class conftest { 12841public class conftest {
@@ -12936,7 +12942,7 @@ $as_echo_n "checking batik-all... " >&6; }
12936 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12942 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12937 12943
12938 cat << \EOF > conftest.java 12944 cat << \EOF > conftest.java
12939// #line 12939 "configure" 12945// #line 12945 "configure"
12940import org.apache.batik.parser.Parser; 12946import org.apache.batik.parser.Parser;
12941 12947
12942public class conftest { 12948public class conftest {
@@ -13043,7 +13049,7 @@ $as_echo_n "checking batik... " >&6; }
13043 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13049 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13044 13050
13045 cat << \EOF > conftest.java 13051 cat << \EOF > conftest.java
13046// #line 13046 "configure" 13052// #line 13052 "configure"
13047import org.apache.batik.parser.Parser; 13053import org.apache.batik.parser.Parser;
13048 13054
13049public class conftest { 13055public class conftest {
@@ -13136,7 +13142,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
13136 export ac_java_classpath="$BATIK:$ac_java_classpath" 13142 export ac_java_classpath="$BATIK:$ac_java_classpath"
13137 13143
13138 cat << \EOF > conftest.java 13144 cat << \EOF > conftest.java
13139// #line 13139 "configure" 13145// #line 13145 "configure"
13140import org.apache.batik.Version; 13146import org.apache.batik.Version;
13141 13147
13142public class conftest { 13148public class conftest {
@@ -13208,7 +13214,7 @@ $as_echo_n "checking commons-io... " >&6; }
13208 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13214 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13209 13215
13210 cat << \EOF > conftest.java 13216 cat << \EOF > conftest.java
13211// #line 13211 "configure" 13217// #line 13217 "configure"
13212import org.apache.commons.io.output.CountingOutputStream; 13218import org.apache.commons.io.output.CountingOutputStream;
13213 13219
13214public class conftest { 13220public class conftest {
@@ -13315,7 +13321,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
13315 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13321 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13316 13322
13317 cat << \EOF > conftest.java 13323 cat << \EOF > conftest.java
13318// #line 13318 "configure" 13324// #line 13324 "configure"
13319import org.apache.xmlgraphics.util.Service; 13325import org.apache.xmlgraphics.util.Service;
13320 13326
13321public class conftest { 13327public class conftest {
@@ -13422,7 +13428,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
13422 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13428 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13423 13429
13424 cat << \EOF > conftest.java 13430 cat << \EOF > conftest.java
13425// #line 13425 "configure" 13431// #line 13431 "configure"
13426import org.apache.avalon.framework.configuration.ConfigurationException; 13432import org.apache.avalon.framework.configuration.ConfigurationException;
13427 13433
13428public class conftest { 13434public class conftest {
@@ -13529,7 +13535,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
13529 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13535 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13530 13536
13531 cat << \EOF > conftest.java 13537 cat << \EOF > conftest.java
13532// #line 13532 "configure" 13538// #line 13538 "configure"
13533import org.w3c.dom.svg.SVGDocument; 13539import org.w3c.dom.svg.SVGDocument;
13534 13540
13535public class conftest { 13541public class conftest {
@@ -13636,7 +13642,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
13636 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13642 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13637 13643
13638 cat << \EOF > conftest.java 13644 cat << \EOF > conftest.java
13639// #line 13639 "configure" 13645// #line 13645 "configure"
13640import org.w3c.dom.svg.SVGDocument; 13646import org.w3c.dom.svg.SVGDocument;
13641 13647
13642public class conftest { 13648public class conftest {
@@ -13747,7 +13753,7 @@ $as_echo_n "checking commons-logging... " >&6; }
13747 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13753 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13748 13754
13749 cat << \EOF > conftest.java 13755 cat << \EOF > conftest.java
13750// #line 13750 "configure" 13756// #line 13756 "configure"
13751import org.apache.commons.logging.LogFactory; 13757import org.apache.commons.logging.LogFactory;
13752 13758
13753public class conftest { 13759public class conftest {
@@ -13854,7 +13860,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
13854 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13860 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13855 13861
13856 cat << \EOF > conftest.java 13862 cat << \EOF > conftest.java
13857// #line 13857 "configure" 13863// #line 13863 "configure"
13858import org.scilab.forge.jlatexmath.TeXFormula; 13864import org.scilab.forge.jlatexmath.TeXFormula;
13859 13865
13860public class conftest { 13866public class conftest {
@@ -13947,7 +13953,7 @@ $as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
13947 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath" 13953 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
13948 13954
13949 cat << \EOF > conftest.java 13955 cat << \EOF > conftest.java
13950// #line 13950 "configure" 13956// #line 13956 "configure"
13951import org.scilab.forge.jlatexmath.TeXFormula; 13957import org.scilab.forge.jlatexmath.TeXFormula;
13952 13958
13953public class conftest { 13959public class conftest {
@@ -14025,7 +14031,7 @@ $as_echo_n "checking checkstyle... " >&6; }
14025 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14031 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14026 14032
14027 cat << \EOF > conftest.java 14033 cat << \EOF > conftest.java
14028// #line 14028 "configure" 14034// #line 14034 "configure"
14029import com.puppycrawl.tools.checkstyle.CheckStyleTask; 14035import com.puppycrawl.tools.checkstyle.CheckStyleTask;
14030 14036
14031public class conftest { 14037public class conftest {
@@ -14132,7 +14138,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
14132 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14138 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14133 14139
14134 cat << \EOF > conftest.java 14140 cat << \EOF > conftest.java
14135// #line 14135 "configure" 14141// #line 14141 "configure"
14136import org.apache.commons.beanutils.Converter; 14142import org.apache.commons.beanutils.Converter;
14137 14143
14138public class conftest { 14144public class conftest {
@@ -14239,7 +14245,7 @@ $as_echo_n "checking antlr... " >&6; }
14239 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14245 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14240 14246
14241 cat << \EOF > conftest.java 14247 cat << \EOF > conftest.java
14242// #line 14242 "configure" 14248// #line 14248 "configure"
14243import antlr.TokenStreamException; 14249import antlr.TokenStreamException;
14244 14250
14245public class conftest { 14251public class conftest {
@@ -14346,7 +14352,7 @@ $as_echo_n "checking testng... " >&6; }
14346 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14352 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14347 14353
14348 cat << \EOF > conftest.java 14354 cat << \EOF > conftest.java
14349// #line 14349 "configure" 14355// #line 14355 "configure"
14350import org.testng.TestNG; 14356import org.testng.TestNG;
14351 14357
14352public class conftest { 14358public class conftest {
@@ -14453,7 +14459,7 @@ $as_echo_n "checking qdox... " >&6; }
14453 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14459 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14454 14460
14455 cat << \EOF > conftest.java 14461 cat << \EOF > conftest.java
14456// #line 14456 "configure" 14462// #line 14462 "configure"
14457import com.thoughtworks.qdox.tools.QDoxTester; 14463import com.thoughtworks.qdox.tools.QDoxTester;
14458 14464
14459public class conftest { 14465public class conftest {
@@ -14560,7 +14566,7 @@ $as_echo_n "checking bsh... " >&6; }
14560 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14566 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14561 14567
14562 cat << \EOF > conftest.java 14568 cat << \EOF > conftest.java
14563// #line 14563 "configure" 14569// #line 14569 "configure"
14564import bsh.Console; 14570import bsh.Console;
14565 14571
14566public class conftest { 14572public class conftest {
@@ -14667,7 +14673,7 @@ $as_echo_n "checking junit... " >&6; }
14667 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14673 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14668 14674
14669 cat << \EOF > conftest.java 14675 cat << \EOF > conftest.java
14670// #line 14670 "configure" 14676// #line 14676 "configure"
14671import junit.framework.Assert; 14677import junit.framework.Assert;
14672 14678
14673public class conftest { 14679public class conftest {
@@ -18580,7 +18586,7 @@ $as_echo_n "checking jhdf5... " >&6; }
18580 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 18586 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18581 18587
18582 cat << \EOF > conftest.java 18588 cat << \EOF > conftest.java
18583// #line 18583 "configure" 18589// #line 18589 "configure"
18584import ncsa.hdf.hdf5lib.HDF5Constants; 18590import ncsa.hdf.hdf5lib.HDF5Constants;
18585 18591
18586public class conftest { 18592public class conftest {
@@ -18728,7 +18734,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
18728 export ac_java_classpath="$JHDF5:$ac_java_classpath" 18734 export ac_java_classpath="$JHDF5:$ac_java_classpath"
18729 18735
18730 cat << \EOF > conftest.java 18736 cat << \EOF > conftest.java
18731// #line 18731 "configure" 18737// #line 18737 "configure"
18732import ncsa.hdf.hdf5lib.H5; 18738import ncsa.hdf.hdf5lib.H5;
18733 18739
18734public class conftest { 18740public class conftest {
@@ -19751,6 +19757,41 @@ else
19751fi 19757fi
19752 19758
19753 19759
19760#################
19761## OpenMP
19762#################
19763
19764
19765# Check whether --with-openmp was given.
19766if test "${with_openmp+set}" = set; then :
19767 withval=$with_openmp;
19768fi
19769
19770
19771OPENMP_ENABLE=no
19772if test "$with_openmp" != no; then
19773# AC_OPENMP
19774 OPENMP_CFLAGS="-fopenmp"
19775 OPENMP_CXXFLAGS="-fopenmp"
19776 OPENMP_LIBS="-lgomp"
19777
19778 CFLAGS="$CFLAGS $OPENMP_CFLAGS"
19779 CXXFLAGS="$CXXFLAGS $OPENMP_CFLAGS"
19780 LIBS="$LIBS $OPENMP_LIBS"
19781 OPENMP_ENABLE=yes
19782fi
19783
19784
19785 if test "$with_openmp" != no; then
19786 OPENMP_TRUE=
19787 OPENMP_FALSE='#'
19788else
19789 OPENMP_TRUE='#'
19790 OPENMP_FALSE=
19791fi
19792
19793
19794
19754####################### 19795#######################
19755## Test for libxml 19796## Test for libxml
19756####################### 19797#######################
@@ -23262,7 +23303,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
23262{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 23303{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
23263$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 23304$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
23264cat > conftest.$ac_ext <<EOF 23305cat > conftest.$ac_ext <<EOF
23265#line 23265 "configure" 23306#line 23306 "configure"
23266#include "confdefs.h" 23307#include "confdefs.h"
23267 23308
23268#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 23309#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -23574,7 +23615,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
23574$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 23615$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
23575 23616
23576cat > conftest.$ac_ext <<EOF 23617cat > conftest.$ac_ext <<EOF
23577#line 23577 "configure" 23618#line 23618 "configure"
23578#include "confdefs.h" 23619#include "confdefs.h"
23579 23620
23580#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 23621#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -24158,7 +24199,7 @@ $as_echo_n "checking saxon... " >&6; }
24158 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24199 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
24159 24200
24160 cat << \EOF > conftest.java 24201 cat << \EOF > conftest.java
24161// #line 24161 "configure" 24202// #line 24202 "configure"
24162import com.icl.saxon.Loader; 24203import com.icl.saxon.Loader;
24163 24204
24164public class conftest { 24205public class conftest {
@@ -24265,7 +24306,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
24265 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24306 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
24266 24307
24267 cat << \EOF > conftest.java 24308 cat << \EOF > conftest.java
24268// #line 24268 "configure" 24309// #line 24309 "configure"
24269import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 24310import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
24270 24311
24271public class conftest { 24312public class conftest {
@@ -30566,7 +30607,7 @@ else
30566 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30607 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
30567 lt_status=$lt_dlunknown 30608 lt_status=$lt_dlunknown
30568 cat > conftest.$ac_ext <<_LT_EOF 30609 cat > conftest.$ac_ext <<_LT_EOF
30569#line 30569 "configure" 30610#line 30610 "configure"
30570#include "confdefs.h" 30611#include "confdefs.h"
30571 30612
30572#if HAVE_DLFCN_H 30613#if HAVE_DLFCN_H
@@ -30672,7 +30713,7 @@ else
30672 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30713 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
30673 lt_status=$lt_dlunknown 30714 lt_status=$lt_dlunknown
30674 cat > conftest.$ac_ext <<_LT_EOF 30715 cat > conftest.$ac_ext <<_LT_EOF
30675#line 30675 "configure" 30716#line 30716 "configure"
30676#include "confdefs.h" 30717#include "confdefs.h"
30677 30718
30678#if HAVE_DLFCN_H 30719#if HAVE_DLFCN_H
@@ -36694,7 +36735,7 @@ if test "$enable_stop_on_warning" = yes; then
36694 CPPFLAGS="$CPPFLAGS -Werror -O0" 36735 CPPFLAGS="$CPPFLAGS -Werror -O0"
36695fi 36736fi
36696 36737
36697ac_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/types/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/graph/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" 36738ac_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/types/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/graph/Makefile modules/parallel/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"
36698 36739
36699 36740
36700# Detection of the module for the future version of Scilab 6 36741# Detection of the module for the future version of Scilab 6
@@ -36923,6 +36964,10 @@ if test -z "${PVM_TRUE}" && test -z "${PVM_FALSE}"; then
36923 as_fn_error "conditional \"PVM\" was never defined. 36964 as_fn_error "conditional \"PVM\" was never defined.
36924Usually this means the macro was only invoked conditionally." "$LINENO" 5 36965Usually this means the macro was only invoked conditionally." "$LINENO" 5
36925fi 36966fi
36967if test -z "${OPENMP_TRUE}" && test -z "${OPENMP_FALSE}"; then
36968 as_fn_error "conditional \"OPENMP\" was never defined.
36969Usually this means the macro was only invoked conditionally." "$LINENO" 5
36970fi
36926if test -z "${GENERATE_LOCALIZATION_FILES_TRUE}" && test -z "${GENERATE_LOCALIZATION_FILES_FALSE}"; then 36971if test -z "${GENERATE_LOCALIZATION_FILES_TRUE}" && test -z "${GENERATE_LOCALIZATION_FILES_FALSE}"; then
36927 as_fn_error "conditional \"GENERATE_LOCALIZATION_FILES\" was never defined. 36972 as_fn_error "conditional \"GENERATE_LOCALIZATION_FILES\" was never defined.
36928Usually this means the macro was only invoked conditionally." "$LINENO" 5 36973Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -38091,6 +38136,7 @@ do
38091 "modules/xcos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xcos/Makefile" ;; 38136 "modules/xcos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xcos/Makefile" ;;
38092 "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;; 38137 "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;;
38093 "modules/graph/Makefile") CONFIG_FILES="$CONFIG_FILES modules/graph/Makefile" ;; 38138 "modules/graph/Makefile") CONFIG_FILES="$CONFIG_FILES modules/graph/Makefile" ;;
38139 "modules/parallel/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parallel/Makefile" ;;
38094 "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; 38140 "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
38095 "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; 38141 "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
38096 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 38142 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -39988,6 +40034,17 @@ fi
39988fi 40034fi
39989 40035
39990echo "" 40036echo ""
40037if test $OPENMP_ENABLE = yes; then
40038 echo "OpenMP Configuration:"
40039 echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
40040 echo "OpenMP CXXFLAGS .... = $OPENMP_CXXFLAGS"
40041 echo "OpenMP LIBS ........ = $OPENMP_LIBS"
40042 echo "OpenMP FFLAGS ...... = $OPENMP_LDFLAGS"
40043else
40044 echo "Not using OpenMP"
40045fi
40046
40047echo ""
39991if test $PVM_ENABLE = yes; then 40048if test $PVM_ENABLE = yes; then
39992 echo "PVM Configuration:" 40049 echo "PVM Configuration:"
39993 echo " PVM Architecture ... = $PVM_ARCH" 40050 echo " PVM Architecture ... = $PVM_ARCH"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 7d800af..8d646ee 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1252,6 +1252,30 @@ AC_SUBST(PVM_ENABLE)
1252 1252
1253AM_CONDITIONAL(PVM, test "$with_pvm" != no) 1253AM_CONDITIONAL(PVM, test "$with_pvm" != no)
1254 1254
1255#################
1256## OpenMP
1257#################
1258
1259AC_ARG_WITH(openmp,
1260 AC_HELP_STRING([--without-openmp],[Disable the usage of OpenMP (parallelization of some algoritms)]))
1261
1262OPENMP_ENABLE=no
1263if test "$with_openmp" != no; then
1264# AC_OPENMP
1265 OPENMP_CFLAGS="-fopenmp"
1266 OPENMP_CXXFLAGS="-fopenmp"
1267 OPENMP_LIBS="-lgomp"
1268
1269 CFLAGS="$CFLAGS $OPENMP_CFLAGS"
1270 CXXFLAGS="$CXXFLAGS $OPENMP_CFLAGS"
1271 LIBS="$LIBS $OPENMP_LIBS"
1272 OPENMP_ENABLE=yes
1273fi
1274AC_SUBST(OPENMP_ENABLE)
1275
1276AM_CONDITIONAL(OPENMP, test "$with_openmp" != no)
1277
1278
1255####################### 1279#######################
1256## Test for libxml 1280## Test for libxml
1257####################### 1281#######################
@@ -1681,6 +1705,7 @@ modules/atoms/Makefile
1681modules/xcos/Makefile 1705modules/xcos/Makefile
1682modules/xpad/Makefile 1706modules/xpad/Makefile
1683modules/graph/Makefile 1707modules/graph/Makefile
1708modules/parallel/Makefile
1684modules/Makefile 1709modules/Makefile
1685libs/Makefile 1710libs/Makefile
1686Makefile 1711Makefile
@@ -1818,6 +1843,17 @@ fi
1818fi 1843fi
1819 1844
1820echo "" 1845echo ""
1846if test $OPENMP_ENABLE = yes; then
1847 echo "OpenMP Configuration:"
1848 echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
1849 echo "OpenMP CXXFLAGS .... = $OPENMP_CXXFLAGS"
1850 echo "OpenMP LIBS ........ = $OPENMP_LIBS"
1851 echo "OpenMP FFLAGS ...... = $OPENMP_LDFLAGS"
1852else
1853 echo "Not using OpenMP"
1854fi
1855
1856echo ""
1821if test $PVM_ENABLE = yes; then 1857if test $PVM_ENABLE = yes; then
1822 echo "PVM Configuration:" 1858 echo "PVM Configuration:"
1823 echo " PVM Architecture ... = $PVM_ARCH" 1859 echo " PVM Architecture ... = $PVM_ARCH"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 8b7c76e..4e4ba0e 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -188,6 +188,7 @@ OCAMLDEP = @OCAMLDEP@
188OCAMLLEX = @OCAMLLEX@ 188OCAMLLEX = @OCAMLLEX@
189OCAMLOPT = @OCAMLOPT@ 189OCAMLOPT = @OCAMLOPT@
190OCAMLYACC = @OCAMLYACC@ 190OCAMLYACC = @OCAMLYACC@
191OPENMP_ENABLE = @OPENMP_ENABLE@
191OTOOL = @OTOOL@ 192OTOOL = @OTOOL@
192OTOOL64 = @OTOOL64@ 193OTOOL64 = @OTOOL64@
193PACKAGE = @PACKAGE@ 194PACKAGE = @PACKAGE@
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index 05ed51b..d03283c 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -85,5 +85,6 @@
85<module name="api_scilab" activate="yes"/> 85<module name="api_scilab" activate="yes"/>
86<module name="helptools" activate="@HELP_ENABLE@"/> 86<module name="helptools" activate="@HELP_ENABLE@"/>
87<module name="graph" activate="@JAVA_ENABLE@"/> 87<module name="graph" activate="@JAVA_ENABLE@"/>
88<module name="parallel" activate="yes"/>
88</modules> 89</modules>
89 90
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index 9af87d6..85f8fe1 100644
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -87,5 +87,6 @@
87<module name="api_scilab" activate="yes"/> 87<module name="api_scilab" activate="yes"/>
88<module name="helptools" activate="yes"/> 88<module name="helptools" activate="yes"/>
89<module name="graph" activate="yes"/> 89<module name="graph" activate="yes"/>
90<module name="parallel" activate="yes"/>
90<!-- comments --> 91<!-- comments -->
91</modules> 92</modules>
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 4048f37..7fb34e0 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -257,6 +257,7 @@ OCAMLDEP = @OCAMLDEP@
257OCAMLLEX = @OCAMLLEX@ 257OCAMLLEX = @OCAMLLEX@
258OCAMLOPT = @OCAMLOPT@ 258OCAMLOPT = @OCAMLOPT@
259OCAMLYACC = @OCAMLYACC@ 259OCAMLYACC = @OCAMLYACC@
260OPENMP_ENABLE = @OPENMP_ENABLE@
260OTOOL = @OTOOL@ 261OTOOL = @OTOOL@
261OTOOL64 = @OTOOL64@ 262OTOOL64 = @OTOOL64@
262PACKAGE = @PACKAGE@ 263PACKAGE = @PACKAGE@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index c89e0939..2948d35 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -226,6 +226,7 @@ OCAMLDEP = @OCAMLDEP@
226OCAMLLEX = @OCAMLLEX@ 226OCAMLLEX = @OCAMLLEX@
227OCAMLOPT = @OCAMLOPT@ 227OCAMLOPT = @OCAMLOPT@
228OCAMLYACC = @OCAMLYACC@ 228OCAMLYACC = @OCAMLYACC@
229OPENMP_ENABLE = @OPENMP_ENABLE@
229OTOOL = @OTOOL@ 230OTOOL = @OTOOL@
230OTOOL64 = @OTOOL64@ 231OTOOL64 = @OTOOL64@
231PACKAGE = @PACKAGE@ 232PACKAGE = @PACKAGE@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 3f0c5b4..9bbdc00 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -259,6 +259,7 @@ OCAMLDEP = @OCAMLDEP@
259OCAMLLEX = @OCAMLLEX@ 259OCAMLLEX = @OCAMLLEX@
260OCAMLOPT = @OCAMLOPT@ 260OCAMLOPT = @OCAMLOPT@
261OCAMLYACC = @OCAMLYACC@ 261OCAMLYACC = @OCAMLYACC@
262OPENMP_ENABLE = @OPENMP_ENABLE@
262OTOOL = @OTOOL@ 263OTOOL = @OTOOL@
263OTOOL64 = @OTOOL64@ 264OTOOL64 = @OTOOL64@
264PACKAGE = @PACKAGE@ 265PACKAGE = @PACKAGE@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 7dbadd8..71284e8 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -259,6 +259,7 @@ OCAMLDEP = @OCAMLDEP@
259OCAMLLEX = @OCAMLLEX@ 259OCAMLLEX = @OCAMLLEX@
260OCAMLOPT = @OCAMLOPT@ 260OCAMLOPT = @OCAMLOPT@
261OCAMLYACC = @OCAMLYACC@ 261OCAMLYACC = @OCAMLYACC@
262OPENMP_ENABLE = @OPENMP_ENABLE@
262OTOOL = @OTOOL@ 263OTOOL = @OTOOL@
263OTOOL64 = @OTOOL64@ 264OTOOL64 = @OTOOL64@
264PACKAGE = @PACKAGE@ 265PACKAGE = @PACKAGE@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index b8ff9a7..f1e0acf 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -257,6 +257,7 @@ OCAMLDEP = @OCAMLDEP@
257OCAMLLEX = @OCAMLLEX@ 257OCAMLLEX = @OCAMLLEX@
258OCAMLOPT = @OCAMLOPT@ 258OCAMLOPT = @OCAMLOPT@
259OCAMLYACC = @OCAMLYACC@ 259OCAMLYACC = @OCAMLYACC@
260OPENMP_ENABLE = @OPENMP_ENABLE@
260OTOOL = @OTOOL@ 261OTOOL = @OTOOL@
261OTOOL64 = @OTOOL64@ 262OTOOL64 = @OTOOL64@
262PACKAGE = @PACKAGE@ 263PACKAGE = @PACKAGE@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index da979f8..fe43586 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -253,6 +253,7 @@ OCAMLDEP = @OCAMLDEP@
253OCAMLLEX = @OCAMLLEX@ 253OCAMLLEX = @OCAMLLEX@
254OCAMLOPT = @OCAMLOPT@ 254OCAMLOPT = @OCAMLOPT@
255OCAMLYACC = @OCAMLYACC@ 255OCAMLYACC = @OCAMLYACC@
256OPENMP_ENABLE = @OPENMP_ENABLE@
256OTOOL = @OTOOL@ 257OTOOL = @OTOOL@
257OTOOL64 = @OTOOL64@ 258OTOOL64 = @OTOOL64@
258PACKAGE = @PACKAGE@ 259PACKAGE = @PACKAGE@
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index fbcc142..51773a7 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -84,7 +84,8 @@ types \
84hdf5 \ 84hdf5 \
85graph\ 85graph\
86xcos \ 86xcos \
87xpad 87xpad \
88parallel
88 89
89#umfpack 90#umfpack
90 91
@@ -184,7 +185,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
184 $(top_builddir)/modules/string/libscistring.la \ 185 $(top_builddir)/modules/string/libscistring.la \
185 $(top_builddir)/modules/fftw/libscifftw.la \ 186 $(top_builddir)/modules/fftw/libscifftw.la \
186 $(top_builddir)/modules/hdf5/libscihdf5.la \ 187 $(top_builddir)/modules/hdf5/libscihdf5.la \
187 $(top_builddir)/modules/functions/libscifunctions.la 188 $(top_builddir)/modules/functions/libscifunctions.la \
189 $(top_builddir)/modules/parallel/libsciparallel.la
188 190
189 191
190# These libraries are loaded dynamically from Scilab. 192# These libraries are loaded dynamically from Scilab.
@@ -203,7 +205,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
203 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \ 205 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
204 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 206 $(top_builddir)/modules/umfpack/libsciumfpack.la \
205 $(top_builddir)/modules/matio/libscimatio.la \ 207 $(top_builddir)/modules/matio/libscimatio.la \
206 $(top_builddir)/modules/helptools/libscihelptools.la 208 $(top_builddir)/modules/helptools/libscihelptools.la
207 209
208# Core modules 210# Core modules
209libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS) 211libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index bade7d9..31fbc98 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -162,7 +162,7 @@ DIST_SUBDIRS = core output_stream arnoldi elementary_functions string \
162 windows_tools functions overloading maple2scilab m2sci texmacs \ 162 windows_tools functions overloading maple2scilab m2sci texmacs \
163 development_tools compatibility_functions helptools fftw \ 163 development_tools compatibility_functions helptools fftw \
164 umfpack demo_tools genetic_algorithms simulated_annealing \ 164 umfpack demo_tools genetic_algorithms simulated_annealing \
165 parameters matio atoms types hdf5 graph xcos xpad \ 165 parameters matio atoms types hdf5 graph xcos xpad parallel \
166 scicos_blocks scicos . javasci 166 scicos_blocks scicos . javasci
167DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 167DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
168am__relativize = \ 168am__relativize = \
@@ -312,6 +312,7 @@ OCAMLDEP = @OCAMLDEP@
312OCAMLLEX = @OCAMLLEX@ 312OCAMLLEX = @OCAMLLEX@
313OCAMLOPT = @OCAMLOPT@ 313OCAMLOPT = @OCAMLOPT@
314OCAMLYACC = @OCAMLYACC@ 314OCAMLYACC = @OCAMLYACC@
315OPENMP_ENABLE = @OPENMP_ENABLE@
315OTOOL = @OTOOL@ 316OTOOL = @OTOOL@
316OTOOL64 = @OTOOL64@ 317OTOOL64 = @OTOOL64@
317PACKAGE = @PACKAGE@ 318PACKAGE = @PACKAGE@
@@ -445,7 +446,7 @@ SUBDIRS = core output_stream arnoldi elementary_functions string \
445 maple2scilab m2sci texmacs development_tools \ 446 maple2scilab m2sci texmacs development_tools \
446 compatibility_functions helptools fftw umfpack demo_tools \ 447 compatibility_functions helptools fftw umfpack demo_tools \
447 genetic_algorithms simulated_annealing parameters matio atoms \ 448 genetic_algorithms simulated_annealing parameters matio atoms \
448 types hdf5 graph xcos xpad $(am__append_1) scicos . \ 449 types hdf5 graph xcos xpad parallel $(am__append_1) scicos . \
449 $(am__append_2) 450 $(am__append_2)
450 451
451#### Basic files #### 452#### Basic files ####
@@ -515,7 +516,8 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
515 $(top_builddir)/modules/string/libscistring.la \ 516 $(top_builddir)/modules/string/libscistring.la \
516 $(top_builddir)/modules/fftw/libscifftw.la \ 517 $(top_builddir)/modules/fftw/libscifftw.la \
517 $(top_builddir)/modules/hdf5/libscihdf5.la \ 518 $(top_builddir)/modules/hdf5/libscihdf5.la \
518 $(top_builddir)/modules/functions/libscifunctions.la 519 $(top_builddir)/modules/functions/libscifunctions.la \
520 $(top_builddir)/modules/parallel/libsciparallel.la
519 521
520 522
521# These libraries are loaded dynamically from Scilab. 523# These libraries are loaded dynamically from Scilab.
@@ -534,7 +536,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
534 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \ 536 $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
535 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 537 $(top_builddir)/modules/umfpack/libsciumfpack.la \
536 $(top_builddir)/modules/matio/libscimatio.la \ 538 $(top_builddir)/modules/matio/libscimatio.la \
537 $(top_builddir)/modules/helptools/libscihelptools.la 539 $(top_builddir)/modules/helptools/libscihelptools.la
538 540
539 541
540# Core modules 542# Core modules
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index e3f6c89..32fca79 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -306,6 +306,7 @@ OCAMLDEP = @OCAMLDEP@
306OCAMLLEX = @OCAMLLEX@ 306OCAMLLEX = @OCAMLLEX@
307OCAMLOPT = @OCAMLOPT@ 307OCAMLOPT = @OCAMLOPT@
308OCAMLYACC = @OCAMLYACC@ 308OCAMLYACC = @OCAMLYACC@
309OPENMP_ENABLE = @OPENMP_ENABLE@
309OTOOL = @OTOOL@ 310OTOOL = @OTOOL@
310OTOOL64 = @OTOOL64@ 311OTOOL64 = @OTOOL64@
311PACKAGE = @PACKAGE@ 312PACKAGE = @PACKAGE@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index caa17e8..fdf0c70 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -274,6 +274,7 @@ OCAMLDEP = @OCAMLDEP@
274OCAMLLEX = @OCAMLLEX@ 274OCAMLLEX = @OCAMLLEX@
275OCAMLOPT = @OCAMLOPT@ 275OCAMLOPT = @OCAMLOPT@
276OCAMLYACC = @OCAMLYACC@ 276OCAMLYACC = @OCAMLYACC@
277OPENMP_ENABLE = @OPENMP_ENABLE@
277OTOOL = @OTOOL@ 278OTOOL = @OTOOL@
278OTOOL64 = @OTOOL64@ 279OTOOL64 = @OTOOL64@
279PACKAGE = @PACKAGE@ 280PACKAGE = @PACKAGE@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 0eaec30..90da16a 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -296,6 +296,7 @@ OCAMLDEP = @OCAMLDEP@
296OCAMLLEX = @OCAMLLEX@ 296OCAMLLEX = @OCAMLLEX@
297OCAMLOPT = @OCAMLOPT@ 297OCAMLOPT = @OCAMLOPT@
298OCAMLYACC = @OCAMLYACC@ 298OCAMLYACC = @OCAMLYACC@
299OPENMP_ENABLE = @OPENMP_ENABLE@
299OTOOL = @OTOOL@ 300OTOOL = @OTOOL@
300OTOOL64 = @OTOOL64@ 301OTOOL64 = @OTOOL64@
301PACKAGE = @PACKAGE@ 302PACKAGE = @PACKAGE@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 3721c77..71b0ab9 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -238,6 +238,7 @@ OCAMLDEP = @OCAMLDEP@
238OCAMLLEX = @OCAMLLEX@ 238OCAMLLEX = @OCAMLLEX@
239OCAMLOPT = @OCAMLOPT@ 239OCAMLOPT = @OCAMLOPT@
240OCAMLYACC = @OCAMLYACC@ 240OCAMLYACC = @OCAMLYACC@
241OPENMP_ENABLE = @OPENMP_ENABLE@
241OTOOL = @OTOOL@ 242OTOOL = @OTOOL@
242OTOOL64 = @OTOOL64@ 243OTOOL64 = @OTOOL64@
243PACKAGE = @PACKAGE@ 244PACKAGE = @PACKAGE@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 4d0f85a..27f1ed8 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -275,6 +275,7 @@ OCAMLDEP = @OCAMLDEP@
275OCAMLLEX = @OCAMLLEX@ 275OCAMLLEX = @OCAMLLEX@
276OCAMLOPT = @OCAMLOPT@ 276OCAMLOPT = @OCAMLOPT@
277OCAMLYACC = @OCAMLYACC@ 277OCAMLYACC = @OCAMLYACC@
278OPENMP_ENABLE = @OPENMP_ENABLE@
278OTOOL = @OTOOL@ 279OTOOL = @OTOOL@
279OTOOL64 = @OTOOL64@ 280OTOOL64 = @OTOOL64@
280PACKAGE = @PACKAGE@ 281PACKAGE = @PACKAGE@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index fc690662..7d5016a 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -370,6 +370,7 @@ OCAMLDEP = @OCAMLDEP@
370OCAMLLEX = @OCAMLLEX@ 370OCAMLLEX = @OCAMLLEX@
371OCAMLOPT = @OCAMLOPT@ 371OCAMLOPT = @OCAMLOPT@
372OCAMLYACC = @OCAMLYACC@ 372OCAMLYACC = @OCAMLYACC@
373OPENMP_ENABLE = @OPENMP_ENABLE@
373OTOOL = @OTOOL@ 374OTOOL = @OTOOL@
374OTOOL64 = @OTOOL64@ 375OTOOL64 = @OTOOL64@
375PACKAGE = @PACKAGE@ 376PACKAGE = @PACKAGE@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index cee9a13..7011c76 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -271,6 +271,7 @@ OCAMLDEP = @OCAMLDEP@
271OCAMLLEX = @OCAMLLEX@ 271OCAMLLEX = @OCAMLLEX@
272OCAMLOPT = @OCAMLOPT@ 272OCAMLOPT = @OCAMLOPT@
273OCAMLYACC = @OCAMLYACC@ 273OCAMLYACC = @OCAMLYACC@
274OPENMP_ENABLE = @OPENMP_ENABLE@
274OTOOL = @OTOOL@ 275OTOOL = @OTOOL@
275OTOOL64 = @OTOOL64@ 276OTOOL64 = @OTOOL64@
276PACKAGE = @PACKAGE@ 277PACKAGE = @PACKAGE@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index d36ce9c..800f7bc 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -235,6 +235,7 @@ OCAMLDEP = @OCAMLDEP@
235OCAMLLEX = @OCAMLLEX@ 235OCAMLLEX = @OCAMLLEX@
236OCAMLOPT = @OCAMLOPT@ 236OCAMLOPT = @OCAMLOPT@
237OCAMLYACC = @OCAMLYACC@ 237OCAMLYACC = @OCAMLYACC@
238OPENMP_ENABLE = @OPENMP_ENABLE@
238OTOOL = @OTOOL@ 239OTOOL = @OTOOL@
239OTOOL64 = @OTOOL64@ 240OTOOL64 = @OTOOL64@
240PACKAGE = @PACKAGE@ 241PACKAGE = @PACKAGE@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 7e2734a1..d3bc27b 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -297,6 +297,7 @@ OCAMLDEP = @OCAMLDEP@
297OCAMLLEX = @OCAMLLEX@ 297OCAMLLEX = @OCAMLLEX@
298OCAMLOPT = @OCAMLOPT@ 298OCAMLOPT = @OCAMLOPT@
299OCAMLYACC = @OCAMLYACC@ 299OCAMLYACC = @OCAMLYACC@
300OPENMP_ENABLE = @OPENMP_ENABLE@
300OTOOL = @OTOOL@ 301OTOOL = @OTOOL@
301OTOOL64 = @OTOOL64@ 302OTOOL64 = @OTOOL64@
302PACKAGE = @PACKAGE@ 303PACKAGE = @PACKAGE@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 8b4443a..7b1951a 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -309,6 +309,7 @@ OCAMLDEP = @OCAMLDEP@
309OCAMLLEX = @OCAMLLEX@ 309OCAMLLEX = @OCAMLLEX@
310OCAMLOPT = @OCAMLOPT@ 310OCAMLOPT = @OCAMLOPT@
311OCAMLYACC = @OCAMLYACC@ 311OCAMLYACC = @OCAMLYACC@
312OPENMP_ENABLE = @OPENMP_ENABLE@
312OTOOL = @OTOOL@ 313OTOOL = @OTOOL@
313OTOOL64 = @OTOOL64@ 314OTOOL64 = @OTOOL64@
314PACKAGE = @PACKAGE@ 315PACKAGE = @PACKAGE@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 5a3baf5..6a393a9 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -511,6 +511,7 @@ OCAMLDEP = @OCAMLDEP@
511OCAMLLEX = @OCAMLLEX@ 511OCAMLLEX = @OCAMLLEX@
512OCAMLOPT = @OCAMLOPT@ 512OCAMLOPT = @OCAMLOPT@
513OCAMLYACC = @OCAMLYACC@ 513OCAMLYACC = @OCAMLYACC@
514OPENMP_ENABLE = @OPENMP_ENABLE@
514OTOOL = @OTOOL@ 515OTOOL = @OTOOL@
515OTOOL64 = @OTOOL64@ 516OTOOL64 = @OTOOL64@
516PACKAGE = @PACKAGE@ 517PACKAGE = @PACKAGE@
diff --git a/scilab/modules/core/includes/callinterf.h b/scilab/modules/core/includes/callinterf.h
index 51377ce..7080ffe 100644
--- a/scilab/modules/core/includes/callinterf.h
+++ b/scilab/modules/core/includes/callinterf.h
@@ -87,6 +87,8 @@
87/* 63 */ #include "dynamic_gateways.h" /* xpad */ 87/* 63 */ #include "dynamic_gateways.h" /* xpad */
88/* 64 */ #include "dynamic_gateways.h" /* xcos */ 88/* 64 */ #include "dynamic_gateways.h" /* xcos */
89/* 65 */ #include "dynamic_gateways.h" /* action_binding */ 89/* 65 */ #include "dynamic_gateways.h" /* action_binding */
90/* 66 */ #include "dynamic_gateways.h" /* parallel */
91
90 92
91/*------------------------------------- 93/*-------------------------------------
92 * long jump to stop interface computation 94 * long jump to stop interface computation
diff --git a/scilab/modules/core/sci_gateway/core_gateway.xml b/scilab/modules/core/sci_gateway/core_gateway.xml
index b75a852..ce0cb6e 100644
--- a/scilab/modules/core/sci_gateway/core_gateway.xml
+++ b/scilab/modules/core/sci_gateway/core_gateway.xml
@@ -81,7 +81,6 @@
81 <PRIMITIVE gatewayId="13" primitiveId="51" primitiveName="getdebuginfo" /> 81 <PRIMITIVE gatewayId="13" primitiveId="51" primitiveName="getdebuginfo" />
82 <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="readgateway" /> 82 <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="readgateway" />
83 <PRIMITIVE gatewayId="13" primitiveId="53" primitiveName="exit" /> 83 <PRIMITIVE gatewayId="13" primitiveId="53" primitiveName="exit" />
84 <PRIMITIVE gatewayId="13" primitiveId="54" primitiveName="parallel_run" />
85 84
86 <PRIMITIVE gatewayId="14" primitiveId="1" primitiveName="user" /> 85 <PRIMITIVE gatewayId="14" primitiveId="1" primitiveName="user" />
87 86
diff --git a/scilab/modules/core/src/c/callinterf.c b/scilab/modules/core/src/c/callinterf.c
index 102e96f..810b461 100644
--- a/scilab/modules/core/src/c/callinterf.c
+++ b/scilab/modules/core/src/c/callinterf.c
@@ -33,7 +33,7 @@ static void sci_sigint_addinter(int n);
33 ** Watch out the positions are crutial !!! 33 ** Watch out the positions are crutial !!!
34 ** @TODO : Make this less crappy... 34 ** @TODO : Make this less crappy...
35 **/ 35 **/
36#define INTERFACES_MAX 65 36#define INTERFACES_MAX 66
37static OpTab Interfaces[INTERFACES_MAX] = { 37static OpTab Interfaces[INTERFACES_MAX] = {
38 /* 01 */ {gw_user}, /* free position may be used */ 38 /* 01 */ {gw_user}, /* free position may be used */
39 /* 02 */ {gw_linear_algebra}, 39 /* 02 */ {gw_linear_algebra},
@@ -99,7 +99,9 @@ static OpTab Interfaces[INTERFACES_MAX] = {
99 /* 62 */ {gw_dynamic_hdf5}, 99 /* 62 */ {gw_dynamic_hdf5},
100 /* 63 */ {gw_dynamic_xpad}, 100 /* 63 */ {gw_dynamic_xpad},
101 /* 64 */ {gw_dynamic_xcos}, 101 /* 64 */ {gw_dynamic_xcos},
102 /* 65 */ {gw_dynamic_action_binding} 102 /* 65 */ {gw_dynamic_action_binding},
103 /* 66 */ {gw_dynamic_parallel}
104
103}; 105};
104/*--------------------------------------------------------------------------*/ 106/*--------------------------------------------------------------------------*/
105static int sig_ok = 0; 107static int sig_ok = 0;
diff --git a/scilab/modules/core/src/c/dynamic_gateways.c b/scilab/modules/core/src/c/dynamic_gateways.c
index afa803b..fe2c7e4 100644
--- a/scilab/modules/core/src/c/dynamic_gateways.c
+++ b/scilab/modules/core/src/c/dynamic_gateways.c
@@ -361,7 +361,20 @@ int gw_dynamic_action_binding(void)
361 &ptr_gw_action_binding); 361 &ptr_gw_action_binding);
362} 362}
363/*--------------------------------------------------------------------------*/ 363/*--------------------------------------------------------------------------*/
364 364/* PARALLEL module */
365 365#define PARALLEL_MODULE_NAME "parallel"
366 366static DynLibHandle hParallelLib = NULL;
367static PROC_GATEWAY ptr_gw_parallel = NULL;
368static char* dynlibname_parallel = NULL;
369static char* gatewayname_parallel = NULL;
370/*--------------------------------------------------------------------------*/
371int gw_dynamic_parallel(void)
372{
373 return gw_dynamic_generic(PARALLEL_MODULE_NAME,
374 &dynlibname_parallel,
375 &gatewayname_parallel,
376 &hParallelLib,
377 &ptr_gw_parallel);
378}
379/*--------------------------------------------------------------------------*/
367 380
diff --git a/scilab/modules/core/src/c/dynamic_gateways.h b/scilab/modules/core/src/c/dynamic_gateways.h
index 5a9a581..14c6599 100644
--- a/scilab/modules/core/src/c/dynamic_gateways.h
+++ b/scilab/modules/core/src/c/dynamic_gateways.h
@@ -156,6 +156,13 @@ int gw_dynamic_graphic_export(void);
156*/ 156*/
157int gw_dynamic_action_binding(void); 157int gw_dynamic_action_binding(void);
158 158
159/*
160* parallel gateway
161* parallel is loaded dynamically at runtime
162* load gw_parallel in SCI/modules/parallel/sci_gateway/gw_parallel.c
163*/
164int gw_dynamic_parallel(void);
165
159#endif /* __DYNAMIC_GATEWAYS_H__ */ 166#endif /* __DYNAMIC_GATEWAYS_H__ */
160/*--------------------------------------------------------------------------*/ 167/*--------------------------------------------------------------------------*/
161 168
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 5f27e37..4cbaa58 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -306,6 +306,7 @@ OCAMLDEP = @OCAMLDEP@
306OCAMLLEX = @OCAMLLEX@ 306OCAMLLEX = @OCAMLLEX@
307OCAMLOPT = @OCAMLOPT@ 307OCAMLOPT = @OCAMLOPT@
308OCAMLYACC = @OCAMLYACC@ 308OCAMLYACC = @OCAMLYACC@
309OPENMP_ENABLE = @OPENMP_ENABLE@
309OTOOL = @OTOOL@ 310OTOOL = @OTOOL@
310OTOOL64 = @OTOOL64@ 311OTOOL64 = @OTOOL64@
311PACKAGE = @PACKAGE@ 312PACKAGE = @PACKAGE@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 7d42a86..65e5d06 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -234,6 +234,7 @@ OCAMLDEP = @OCAMLDEP@
234OCAMLLEX = @OCAMLLEX@ 234OCAMLLEX = @OCAMLLEX@
235OCAMLOPT = @OCAMLOPT@ 235OCAMLOPT = @OCAMLOPT@
236OCAMLYACC = @OCAMLYACC@ 236OCAMLYACC = @OCAMLYACC@
237OPENMP_ENABLE = @OPENMP_ENABLE@
237OTOOL = @OTOOL@ 238OTOOL = @OTOOL@
238OTOOL64 = @OTOOL64@ 239OTOOL64 = @OTOOL64@
239PACKAGE = @PACKAGE@ 240PACKAGE = @PACKAGE@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index cc1e69e..43bf4d5 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -233,6 +233,7 @@ OCAMLDEP = @OCAMLDEP@
233OCAMLLEX = @OCAMLLEX@ 233OCAMLLEX = @OCAMLLEX@
234OCAMLOPT = @OCAMLOPT@ 234OCAMLOPT = @OCAMLOPT@
235OCAMLYACC = @OCAMLYACC@ 235OCAMLYACC = @OCAMLYACC@
236OPENMP_ENABLE = @OPENMP_ENABLE@
236OTOOL = @OTOOL@ 237OTOOL = @OTOOL@
237OTOOL64 = @OTOOL64@ 238OTOOL64 = @OTOOL64@
238PACKAGE = @PACKAGE@ 239PACKAGE = @PACKAGE@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 3f3f9be..2e789af 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -181,6 +181,7 @@ OCAMLDEP = @OCAMLDEP@
181OCAMLLEX = @OCAMLLEX@ 181OCAMLLEX = @OCAMLLEX@
182OCAMLOPT = @OCAMLOPT@ 182OCAMLOPT = @OCAMLOPT@
183OCAMLYACC = @OCAMLYACC@ 183OCAMLYACC = @OCAMLYACC@
184OPENMP_ENABLE = @OPENMP_ENABLE@
184OTOOL = @OTOOL@ 185OTOOL = @OTOOL@
185OTOOL64 = @OTOOL64@ 186OTOOL64 = @OTOOL64@
186PACKAGE = @PACKAGE@ 187PACKAGE = @PACKAGE@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 884c227..575653c 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -317,6 +317,7 @@ OCAMLDEP = @OCAMLDEP@
317OCAMLLEX = @OCAMLLEX@ 317OCAMLLEX = @OCAMLLEX@
318OCAMLOPT = @OCAMLOPT@ 318OCAMLOPT = @OCAMLOPT@
319OCAMLYACC = @OCAMLYACC@ 319OCAMLYACC = @OCAMLYACC@
320OPENMP_ENABLE = @OPENMP_ENABLE@
320OTOOL = @OTOOL@ 321OTOOL = @OTOOL@
321OTOOL64 = @OTOOL64@ 322OTOOL64 = @OTOOL64@
322PACKAGE = @PACKAGE@ 323PACKAGE = @PACKAGE@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index f47ace3..6b5322d 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -275,6 +275,7 @@ OCAMLDEP = @OCAMLDEP@
275OCAMLLEX = @OCAMLLEX@ 275OCAMLLEX = @OCAMLLEX@
276OCAMLOPT = @OCAMLOPT@ 276OCAMLOPT = @OCAMLOPT@
277OCAMLYACC = @OCAMLYACC@ 277OCAMLYACC = @OCAMLYACC@
278OPENMP_ENABLE = @OPENMP_ENABLE@
278OTOOL = @OTOOL@ 279OTOOL = @OTOOL@
279OTOOL64 = @OTOOL64@ 280OTOOL64 = @OTOOL64@
280PACKAGE = @PACKAGE@ 281PACKAGE = @PACKAGE@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index e9128c1..e2d1a7a 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -292,6 +292,7 @@ OCAMLDEP = @OCAMLDEP@
292OCAMLLEX = @OCAMLLEX@ 292OCAMLLEX = @OCAMLLEX@
293OCAMLOPT = @OCAMLOPT@ 293OCAMLOPT = @OCAMLOPT@
294OCAMLYACC = @OCAMLYACC@ 294OCAMLYACC = @OCAMLYACC@
295OPENMP_ENABLE = @OPENMP_ENABLE@
295OTOOL = @OTOOL@ 296OTOOL = @OTOOL@
296OTOOL64 = @OTOOL64@ 297OTOOL64 = @OTOOL64@
297PACKAGE = @PACKAGE@ 298PACKAGE = @PACKAGE@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 59a6c4d..5a33ef6 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -641,6 +641,7 @@ OCAMLDEP = @OCAMLDEP@
641OCAMLLEX = @OCAMLLEX@ 641OCAMLLEX = @OCAMLLEX@
642OCAMLOPT = @OCAMLOPT@ 642OCAMLOPT = @OCAMLOPT@
643OCAMLYACC = @OCAMLYACC@ 643OCAMLYACC = @OCAMLYACC@
644OPENMP_ENABLE = @OPENMP_ENABLE@
644OTOOL = @OTOOL@ 645OTOOL = @OTOOL@
645OTOOL64 = @OTOOL64@ 646OTOOL64 = @OTOOL64@
646PACKAGE = @PACKAGE@ 647PACKAGE = @PACKAGE@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 4d26325..885bf49 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -294,6 +294,7 @@ OCAMLDEP = @OCAMLDEP@
294OCAMLLEX = @OCAMLLEX@ 294OCAMLLEX = @OCAMLLEX@
295OCAMLOPT = @OCAMLOPT@ 295OCAMLOPT = @OCAMLOPT@
296OCAMLYACC = @OCAMLYACC@ 296OCAMLYACC = @OCAMLYACC@
297OPENMP_ENABLE = @OPENMP_ENABLE@
297OTOOL = @OTOOL@ 298OTOOL = @OTOOL@
298OTOOL64 = @OTOOL64@ 299OTOOL64 = @OTOOL64@
299PACKAGE = @PACKAGE@ 300PACKAGE = @PACKAGE@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index a92d752..1b1e282 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -325,6 +325,7 @@ OCAMLDEP = @OCAMLDEP@
325OCAMLLEX = @OCAMLLEX@ 325OCAMLLEX = @OCAMLLEX@
326OCAMLOPT = @OCAMLOPT@ 326OCAMLOPT = @OCAMLOPT@
327OCAMLYACC = @OCAMLYACC@ 327OCAMLYACC = @OCAMLYACC@
328OPENMP_ENABLE = @OPENMP_ENABLE@
328OTOOL = @OTOOL@ 329OTOOL = @OTOOL@
329OTOOL64 = @OTOOL64@ 330OTOOL64 = @OTOOL64@
330PACKAGE = @PACKAGE@ 331PACKAGE = @PACKAGE@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index f00b28c..a298ec1 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -284,6 +284,7 @@ OCAMLDEP = @OCAMLDEP@
284OCAMLLEX = @OCAMLLEX@ 284OCAMLLEX = @OCAMLLEX@
285OCAMLOPT = @OCAMLOPT@ 285OCAMLOPT = @OCAMLOPT@
286OCAMLYACC = @OCAMLYACC@ 286OCAMLYACC = @OCAMLYACC@
287OPENMP_ENABLE = @OPENMP_ENABLE@
287OTOOL = @OTOOL@ 288OTOOL = @OTOOL@
288OTOOL64 = @OTOOL64@ 289OTOOL64 = @OTOOL64@
289PACKAGE = @PACKAGE@ 290PACKAGE = @PACKAGE@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index 7eff724..e51f08c 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -237,6 +237,7 @@ OCAMLDEP = @OCAMLDEP@
237OCAMLLEX = @OCAMLLEX@ 237OCAMLLEX = @OCAMLLEX@
238OCAMLOPT = @OCAMLOPT@ 238OCAMLOPT = @OCAMLOPT@
239OCAMLYACC = @OCAMLYACC@ 239OCAMLYACC = @OCAMLYACC@
240OPENMP_ENABLE = @OPENMP_ENABLE@
240OTOOL = @OTOOL@ 241OTOOL = @OTOOL@
241OTOOL64 = @OTOOL64@ 242OTOOL64 = @OTOOL64@
242PACKAGE = @PACKAGE@ 243PACKAGE = @PACKAGE@
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index e1618d0..b5d7089 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -274,6 +274,7 @@ OCAMLDEP = @OCAMLDEP@
274OCAMLLEX = @OCAMLLEX@ 274OCAMLLEX = @OCAMLLEX@
275OCAMLOPT = @OCAMLOPT@ 275OCAMLOPT = @OCAMLOPT@
276OCAMLYACC = @OCAMLYACC@ 276OCAMLYACC = @OCAMLYACC@
277OPENMP_ENABLE = @OPENMP_ENABLE@
277OTOOL = @OTOOL@ 278OTOOL = @OTOOL@
278OTOOL64 = @OTOOL64@ 279OTOOL64 = @OTOOL64@
279PACKAGE = @PACKAGE@ 280PACKAGE = @PACKAGE@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 7409aa5..aad4af5 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -311,6 +311,7 @@ OCAMLDEP = @OCAMLDEP@
311OCAMLLEX = @OCAMLLEX@ 311OCAMLLEX = @OCAMLLEX@
312OCAMLOPT = @OCAMLOPT@ 312OCAMLOPT = @OCAMLOPT@
313OCAMLYACC = @OCAMLYACC@ 313OCAMLYACC = @OCAMLYACC@
314OPENMP_ENABLE = @OPENMP_ENABLE@
314OTOOL = @OTOOL@ 315OTOOL = @OTOOL@
315OTOOL64 = @OTOOL64@ 316OTOOL64 = @OTOOL64@
316PACKAGE = @PACKAGE@ 317PACKAGE = @PACKAGE@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 838c4aa..95d945c 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -646,6 +646,7 @@ OCAMLDEP = @OCAMLDEP@
646OCAMLLEX = @OCAMLLEX@ 646OCAMLLEX = @OCAMLLEX@
647OCAMLOPT = @OCAMLOPT@ 647OCAMLOPT = @OCAMLOPT@
648OCAMLYACC = @OCAMLYACC@ 648OCAMLYACC = @OCAMLYACC@
649OPENMP_ENABLE = @OPENMP_ENABLE@
649OTOOL = @OTOOL@ 650OTOOL = @OTOOL@
650OTOOL64 = @OTOOL64@ 651OTOOL64 = @OTOOL64@
651PACKAGE = @PACKAGE@ 652PACKAGE = @PACKAGE@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 0791aeb..71b93cd 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -400,6 +400,7 @@ OCAMLDEP = @OCAMLDEP@
400OCAMLLEX = @OCAMLLEX@ 400OCAMLLEX = @OCAMLLEX@
401OCAMLOPT = @OCAMLOPT@ 401OCAMLOPT = @OCAMLOPT@
402OCAMLYACC = @OCAMLYACC@ 402OCAMLYACC = @OCAMLYACC@
403OPENMP_ENABLE = @OPENMP_ENABLE@
403OTOOL = @OTOOL@ 404OTOOL = @OTOOL@
404OTOOL64 = @OTOOL64@ 405OTOOL64 = @OTOOL64@
405PACKAGE = @PACKAGE@ 406PACKAGE = @PACKAGE@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 3d2644b..5cf9e14 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -326,6 +326,7 @@ OCAMLDEP = @OCAMLDEP@
326OCAMLLEX = @OCAMLLEX@ 326OCAMLLEX = @OCAMLLEX@
327OCAMLOPT = @OCAMLOPT@ 327OCAMLOPT = @OCAMLOPT@
328OCAMLYACC = @OCAMLYACC@ 328OCAMLYACC = @OCAMLYACC@
329OPENMP_ENABLE = @OPENMP_ENABLE@
329OTOOL = @OTOOL@ 330OTOOL = @OTOOL@
330OTOOL64 = @OTOOL64@ 331OTOOL64 = @OTOOL64@
331PACKAGE = @PACKAGE@ 332PACKAGE = @PACKAGE@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index f321c3c..21fe46d 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -299,6 +299,7 @@ OCAMLDEP = @OCAMLDEP@
299OCAMLLEX = @OCAMLLEX@ 299OCAMLLEX = @OCAMLLEX@
300OCAMLOPT = @OCAMLOPT@ 300OCAMLOPT = @OCAMLOPT@
301OCAMLYACC = @OCAMLYACC@ 301OCAMLYACC = @OCAMLYACC@
302OPENMP_ENABLE = @OPENMP_ENABLE@
302OTOOL = @OTOOL@ 303OTOOL = @OTOOL@
303OTOOL64 = @OTOOL64@ 304OTOOL64 = @OTOOL64@
304PACKAGE = @PACKAGE@ 305PACKAGE = @PACKAGE@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 18979f0..2a1a699 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -322,6 +322,7 @@ OCAMLDEP = @OCAMLDEP@
322OCAMLLEX = @OCAMLLEX@ 322OCAMLLEX = @OCAMLLEX@
323OCAMLOPT = @OCAMLOPT@ 323OCAMLOPT = @OCAMLOPT@
324OCAMLYACC = @OCAMLYACC@ 324OCAMLYACC = @OCAMLYACC@
325OPENMP_ENABLE = @OPENMP_ENABLE@
325OTOOL = @OTOOL@ 326OTOOL = @OTOOL@
326OTOOL64 = @OTOOL64@ 327OTOOL64 = @OTOOL64@
327PACKAGE = @PACKAGE@ 328PACKAGE = @PACKAGE@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index ac64c26..bc4e757 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -310,6 +310,7 @@ OCAMLDEP = @OCAMLDEP@
310OCAMLLEX = @OCAMLLEX@ 310OCAMLLEX = @OCAMLLEX@
311OCAMLOPT = @OCAMLOPT@ 311OCAMLOPT = @OCAMLOPT@
312OCAMLYACC = @OCAMLYACC@ 312OCAMLYACC = @OCAMLYACC@
313OPENMP_ENABLE = @OPENMP_ENABLE@
313OTOOL = @OTOOL@ 314OTOOL = @OTOOL@
314OTOOL64 = @OTOOL64@ 315OTOOL64 = @OTOOL64@
315PACKAGE = @PACKAGE@ 316PACKAGE = @PACKAGE@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 037284d..5ce0336 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -292,6 +292,7 @@ OCAMLDEP = @OCAMLDEP@
292OCAMLLEX = @OCAMLLEX@ 292OCAMLLEX = @OCAMLLEX@
293OCAMLOPT = @OCAMLOPT@ 293OCAMLOPT = @OCAMLOPT@
294OCAMLYACC = @OCAMLYACC@ 294OCAMLYACC = @OCAMLYACC@
295OPENMP_ENABLE = @OPENMP_ENABLE@
295OTOOL = @OTOOL@ 296OTOOL = @OTOOL@
296OTOOL64 = @OTOOL64@ 297OTOOL64 = @OTOOL64@
297PACKAGE = @PACKAGE@ 298PACKAGE = @PACKAGE@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 7bb481a..be5f9f4 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -275,6 +275,7 @@ OCAMLDEP = @OCAMLDEP@
275OCAMLLEX = @OCAMLLEX@ 275OCAMLLEX = @OCAMLLEX@
276OCAMLOPT = @OCAMLOPT@ 276OCAMLOPT = @OCAMLOPT@
277OCAMLYACC = @OCAMLYACC@ 277OCAMLYACC = @OCAMLYACC@
278OPENMP_ENABLE = @OPENMP_ENABLE@
278OTOOL = @OTOOL@ 279OTOOL = @OTOOL@
279OTOOL64 = @OTOOL64@ 280OTOOL64 = @OTOOL64@
280PACKAGE = @PACKAGE@ 281PACKAGE = @PACKAGE@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 0dacd5f..e79c219 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -289,6 +289,7 @@ OCAMLDEP = @OCAMLDEP@
289OCAMLLEX = @OCAMLLEX@ 289OCAMLLEX = @OCAMLLEX@
290OCAMLOPT = @OCAMLOPT@ 290OCAMLOPT = @OCAMLOPT@
291OCAMLYACC = @OCAMLYACC@ 291OCAMLYACC = @OCAMLYACC@
292OPENMP_ENABLE = @OPENMP_ENABLE@
292OTOOL = @OTOOL@ 293OTOOL = @OTOOL@
293OTOOL64 = @OTOOL64@ 294OTOOL64 = @OTOOL64@
294PACKAGE = @PACKAGE@ 295PACKAGE = @PACKAGE@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index d60b854..32be88f 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -287,6 +287,7 @@ OCAMLDEP = @OCAMLDEP@
287OCAMLLEX = @OCAMLLEX@ 287OCAMLLEX = @OCAMLLEX@
288OCAMLOPT = @OCAMLOPT@ 288OCAMLOPT = @OCAMLOPT@
289OCAMLYACC = @OCAMLYACC@ 289OCAMLYACC = @OCAMLYACC@
290OPENMP_ENABLE = @OPENMP_ENABLE@
290OTOOL = @OTOOL@ 291OTOOL = @OTOOL@
291OTOOL64 = @OTOOL64@ 292OTOOL64 = @OTOOL64@
292PACKAGE = @PACKAGE@ 293PACKAGE = @PACKAGE@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index 6276e06..ec2c5a9 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -303,6 +303,7 @@ OCAMLDEP = @OCAMLDEP@
303OCAMLLEX = @OCAMLLEX@ 303OCAMLLEX = @OCAMLLEX@
304OCAMLOPT = @OCAMLOPT@ 304OCAMLOPT = @OCAMLOPT@
305OCAMLYACC = @OCAMLYACC@ 305OCAMLYACC = @OCAMLYACC@
306OPENMP_ENABLE = @OPENMP_ENABLE@
306OTOOL = @OTOOL@ 307OTOOL = @OTOOL@
307OTOOL64 = @OTOOL64@ 308OTOOL64 = @OTOOL64@
308PACKAGE = @PACKAGE@ 309PACKAGE = @PACKAGE@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 80fff7f..779d888 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -312,6 +312,7 @@ OCAMLDEP = @OCAMLDEP@
312OCAMLLEX = @OCAMLLEX@ 312OCAMLLEX = @OCAMLLEX@
313OCAMLOPT = @OCAMLOPT@ 313OCAMLOPT = @OCAMLOPT@
314OCAMLYACC = @OCAMLYACC@ 314OCAMLYACC = @OCAMLYACC@
315OPENMP_ENABLE = @OPENMP_ENABLE@
315OTOOL = @OTOOL@ 316OTOOL = @OTOOL@
316OTOOL64 = @OTOOL64@ 317OTOOL64 = @OTOOL64@
317PACKAGE = @PACKAGE@ 318PACKAGE = @PACKAGE@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index 873b517..4b8cb23 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -299,6 +299,7 @@ OCAMLDEP = @OCAMLDEP@
299OCAMLLEX = @OCAMLLEX@ 299OCAMLLEX = @OCAMLLEX@
300OCAMLOPT = @OCAMLOPT@ 300OCAMLOPT = @OCAMLOPT@
301OCAMLYACC = @OCAMLYACC@ 301OCAMLYACC = @OCAMLYACC@
302OPENMP_ENABLE = @OPENMP_ENABLE@
302OTOOL = @OTOOL@ 303OTOOL = @OTOOL@
303OTOOL64 = @OTOOL64@ 304OTOOL64 = @OTOOL64@
304PACKAGE = @PACKAGE@ 305PACKAGE = @PACKAGE@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index e77bd19..1fc0a5a 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -232,6 +232,7 @@ OCAMLDEP = @OCAMLDEP@
232OCAMLLEX = @OCAMLLEX@ 232OCAMLLEX = @OCAMLLEX@
233OCAMLOPT = @OCAMLOPT@ 233OCAMLOPT = @OCAMLOPT@
234OCAMLYACC = @OCAMLYACC@ 234OCAMLYACC = @OCAMLYACC@
235OPENMP_ENABLE = @OPENMP_ENABLE@
235OTOOL = @OTOOL@ 236OTOOL = @OTOOL@
236OTOOL64 = @OTOOL64@ 237OTOOL64 = @OTOOL64@
237PACKAGE = @PACKAGE@ 238PACKAGE = @PACKAGE@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 06df179..1b31ee0 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -232,6 +232,7 @@ OCAMLDEP = @OCAMLDEP@
232OCAMLLEX = @OCAMLLEX@ 232OCAMLLEX = @OCAMLLEX@
233OCAMLOPT = @OCAMLOPT@ 233OCAMLOPT = @OCAMLOPT@
234OCAMLYACC = @OCAMLYACC@ 234OCAMLYACC = @OCAMLYACC@
235OPENMP_ENABLE = @OPENMP_ENABLE@
235OTOOL = @OTOOL@ 236OTOOL = @OTOOL@
236OTOOL64 = @OTOOL64@ 237OTOOL64 = @OTOOL64@
237PACKAGE = @PACKAGE@ 238PACKAGE = @PACKAGE@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index 1847819..773bec9 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -299,6 +299,7 @@ OCAMLDEP = @OCAMLDEP@
299OCAMLLEX = @OCAMLLEX@ 299OCAMLLEX = @OCAMLLEX@
300OCAMLOPT = @OCAMLOPT@ 300OCAMLOPT = @OCAMLOPT@
301OCAMLYACC = @OCAMLYACC@ 301OCAMLYACC = @OCAMLYACC@
302OPENMP_ENABLE = @OPENMP_ENABLE@
302OTOOL = @OTOOL@ 303OTOOL = @OTOOL@
303OTOOL64 = @OTOOL64@ 304OTOOL64 = @OTOOL64@
304PACKAGE = @PACKAGE@ 305PACKAGE = @PACKAGE@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index e90c304..b735403 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -276,6 +276,7 @@ OCAMLDEP = @OCAMLDEP@
276OCAMLLEX = @OCAMLLEX@ 276OCAMLLEX = @OCAMLLEX@
277OCAMLOPT = @OCAMLOPT@ 277OCAMLOPT = @OCAMLOPT@
278OCAMLYACC = @OCAMLYACC@ 278OCAMLYACC = @OCAMLYACC@
279OPENMP_ENABLE = @OPENMP_ENABLE@
279OTOOL = @OTOOL@ 280OTOOL = @OTOOL@
280OTOOL64 = @OTOOL64@ 281OTOOL64 = @OTOOL64@
281PACKAGE = @PACKAGE@ 282PACKAGE = @PACKAGE@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index c8fe543..5a245c0 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -303,6 +303,7 @@ OCAMLDEP = @OCAMLDEP@
303OCAMLLEX = @OCAMLLEX@ 303OCAMLLEX = @OCAMLLEX@
304OCAMLOPT = @OCAMLOPT@ 304OCAMLOPT = @OCAMLOPT@
305OCAMLYACC = @OCAMLYACC@ 305OCAMLYACC = @OCAMLYACC@
306OPENMP_ENABLE = @OPENMP_ENABLE@
306OTOOL = @OTOOL@ 307OTOOL = @OTOOL@
307OTOOL64 = @OTOOL64@ 308OTOOL64 = @OTOOL64@
308PACKAGE = @PACKAGE@ 309PACKAGE = @PACKAGE@
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index d1c35b6..5461700 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -316,6 +316,7 @@ OCAMLDEP = @OCAMLDEP@
316OCAMLLEX = @OCAMLLEX@ 316OCAMLLEX = @OCAMLLEX@
317OCAMLOPT = @OCAMLOPT@ 317OCAMLOPT = @OCAMLOPT@
318OCAMLYACC = @OCAMLYACC@ 318OCAMLYACC = @OCAMLYACC@
319OPENMP_ENABLE = @OPENMP_ENABLE@
319OTOOL = @OTOOL@ 320OTOOL = @OTOOL@
320OTOOL64 = @OTOOL64@ 321OTOOL64 = @OTOOL64@
321PACKAGE = @PACKAGE@ 322PACKAGE = @PACKAGE@
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index ba797b5..24b84f3 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -233,6 +233,7 @@ OCAMLDEP = @OCAMLDEP@
233OCAMLLEX = @OCAMLLEX@ 233OCAMLLEX = @OCAMLLEX@
234OCAMLOPT = @OCAMLOPT@ 234OCAMLOPT = @OCAMLOPT@
235OCAMLYACC = @OCAMLYACC@ 235OCAMLYACC = @OCAMLYACC@
236OPENMP_ENABLE = @OPENMP_ENABLE@
236OTOOL = @OTOOL@ 237OTOOL = @OTOOL@
237OTOOL64 = @OTOOL64@ 238OTOOL64 = @OTOOL64@
238PACKAGE = @PACKAGE@ 239PACKAGE = @PACKAGE@
diff --git a/scilab/modules/parallel/Makefile.am b/scilab/modules/parallel/Makefile.am
new file mode 100644
index 0000000..be9ff58
--- /dev/null
+++ b/scilab/modules/parallel/Makefile.am
@@ -0,0 +1,69 @@
1# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2# Copyright (C) 2010 - DIGITEO - Allan CORNET
3#
4# This file must be used under the terms of the CeCILL.
5# This source file is licensed as described in the file COPYING, which
6# you should have received as part of this distribution. The terms
7# are also available at
8# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10PARALLEL_CPP_SOURCES =
11
12GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_parallel_run.cpp
13
14PARALLEL_C_SOURCES =
15
16GATEWAY_C_SOURCES = sci_gateway/c/gw_parallel.c
17
18
19libsciparallel_la_CFLAGS= -I$(top_srcdir)/libs/MALLOC/includes/ \
20-I$(srcdir)/includes/ \
21-I$(top_srcdir)/modules/core/includes \
22-I$(srcdir)/src/c/ \
23-I$(top_srcdir)/modules/api_scilab/includes \
24-I$(top_srcdir)/modules/string/includes
25
26libsciparallel_la_CPPFLAGS= -I$(top_srcdir)/libs/MALLOC/includes/ \
27-I$(srcdir)/includes/ \
28-I$(top_srcdir)/modules/core/includes \
29-I$(srcdir)/src/cpp/ \
30-I$(srcdir)/src/c/ \
31-I$(top_srcdir)/modules/api_scilab/includes \
32-I$(top_srcdir)/modules/output_stream/includes \
33-I$(top_srcdir)/modules/parameters/includes \
34-I$(top_srcdir)/modules/dynamic_link/includes
35
36
37pkglib_LTLIBRARIES = libsciparallel.la
38
39libsciparallel_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
40
41libsciparallel_la_SOURCES = $(PARALLEL_C_SOURCES) $(PARALLEL_CPP_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
42
43# For the code check (splint)
44CHECK_SRC= $(PARALLEL_C_SOURCES) $(GATEWAY_C_SOURCES)
45INCLUDE_FLAGS = $(libsciparallel_la_CFLAGS)
46
47#### Target ######
48modulename=parallel
49
50#### parallel : Conf files ####
51libsciparallel_la_rootdir = $(mydatadir)
52libsciparallel_la_root_DATA = license.txt readme.txt version.xml
53
54
55#### parallel : init scripts ####
56libsciparallel_la_etcdir = $(mydatadir)/etc
57libsciparallel_la_etc_DATA = etc/parallel.quit etc/parallel.start
58
59#### parallel : gateway declaration ####
60libsciparallel_la_sci_gatewaydir = $(mydatadir)/sci_gateway
61libsciparallel_la_sci_gateway_DATA = sci_gateway/parallel_gateway.xml
62
63#### parallel : include files ####
64libsciparallel_la_includedir=$(pkgincludedir)
65libsciparallel_la_include_HEADERS =
66
67include $(top_srcdir)/Makefile.incl.am
68
69
diff --git a/scilab/modules/parallel/Makefile.in b/scilab/modules/parallel/Makefile.in
new file mode 100644
index 0000000..0f28d2c
--- /dev/null
+++ b/scilab/modules/parallel/Makefile.in
@@ -0,0 +1,1144 @@
1# Makefile.in generated by automake 1.11.1 from Makefile.am.
2# @configure_input@
3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6# Inc.
7# This Makefile.in is free software; the Free Software Foundation
8# gives unlimited permission to copy and/or distribute it,
9# with or without modifications, as long as this notice is preserved.
10
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
13# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
14# PARTICULAR PURPOSE.
15
16@SET_MAKE@
17
18# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
19# Copyright (C) 2010 - DIGITEO - Allan CORNET
20#
21# This file must be used under the terms of the CeCILL.
22# This source file is licensed as described in the file COPYING, which
23# you should have received as part of this distribution. The terms
24# are also available at
25# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
26
27# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
28# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
29# Copyright (C) 2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
30#
31# This file must be used under the terms of the CeCILL.
32# This source file is licensed as described in the file COPYING, which
33# you should have received as part of this distribution. The terms
34# are also available at
35# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
36#
37
38##########
39### Makefile included stuff
40### Target, variable, suffixes which are supposed to be usefull in every makefile.am
41##########
42
43
44
45VPATH = @srcdir@
46pkgdatadir = $(datadir)/@PACKAGE@
47pkgincludedir = $(includedir)/@PACKAGE@
48pkglibdir = $(libdir)/@PACKAGE@
49pkglibexecdir = $(libexecdir)/@PACKAGE@
50am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
51install_sh_DATA = $(install_sh) -c -m 644
52install_sh_PROGRAM = $(install_sh) -c
53install_sh_SCRIPT = $(install_sh) -c
54INSTALL_HEADER = $(INSTALL_DATA)
55transform = $(program_transform_name)
56NORMAL_INSTALL = :
57PRE_INSTALL = :
58POST_INSTALL = :
59NORMAL_UNINSTALL = :
60PRE_UNINSTALL = :
61POST_UNINSTALL = :
62build_triplet = @build@
63host_triplet = @host@
64DIST_COMMON = $(libsciparallel_la_include_HEADERS) \
65 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
66 $(top_srcdir)/Makefile.incl.am
67@NEED_JAVA_TRUE@am__append_1 = java
68
69# With --enable-compilation-tests, launch java unitary tests
70@COMPILATION_TESTS_TRUE@am__append_2 = test
71subdir = modules/parallel
72ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
73am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
74 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
75 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
76 $(top_srcdir)/m4/intel_compiler.m4 \
77 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
78 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
79 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
80 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
81 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
82 $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
83 $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
84 $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
85 $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
86 $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
87am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
88 $(ACLOCAL_M4)
89mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
90CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
91CONFIG_CLEAN_FILES =
92CONFIG_CLEAN_VPATH_FILES =
93am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
94am__vpath_adj = case $$p in \
95 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
96 *) f=$$p;; \
97 esac;
98am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
99am__install_max = 40
100am__nobase_strip_setup = \
101 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
102am__nobase_strip = \
103 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
104am__nobase_list = $(am__nobase_strip_setup); \
105 for p in $$list; do echo "$$p $$p"; done | \
106 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
107 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
108 if (++n[$$2] == $(am__install_max)) \
109 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
110 END { for (dir in files) print dir, files[dir] }'
111am__base_list = \
112 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
113 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
114am__installdirs = "$(DESTDIR)$(pkglibdir)" \
115 "$(DESTDIR)$(libsciparallel_la_etcdir)" \
116 "$(DESTDIR)$(libsciparallel_la_rootdir)" \
117 "$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)" \
118 "$(DESTDIR)$(libsciparallel_la_includedir)"
119LTLIBRARIES = $(pkglib_LTLIBRARIES)
120libsciparallel_la_LIBADD =
121am__objects_1 =
122am__objects_2 = libsciparallel_la-gw_parallel.lo
123am__objects_3 = libsciparallel_la-sci_parallel_run.lo
124am_libsciparallel_la_OBJECTS = $(am__objects_1) $(am__objects_1) \
125 $(am__objects_2) $(am__objects_3)
126libsciparallel_la_OBJECTS = $(am_libsciparallel_la_OBJECTS)
127libsciparallel_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
128 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
129 $(CXXFLAGS) $(libsciparallel_la_LDFLAGS) $(LDFLAGS) -o $@
130DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
131depcomp = $(SHELL) $(top_srcdir)/config/depcomp
132am__depfiles_maybe = depfiles
133am__mv = mv -f
134COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
135 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
136LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
137 --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
138 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
139CCLD = $(CC)
140LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
141 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
142 $(LDFLAGS) -o $@
143CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
144 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
145LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
146 --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
147 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
148CXXLD = $(CXX)
149CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
150 --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
151 $(LDFLAGS) -o $@
152SOURCES = $(libsciparallel_la_SOURCES)
153DIST_SOURCES = $(libsciparallel_la_SOURCES)
154DATA = $(libsciparallel_la_etc_DATA) $(libsciparallel_la_root_DATA) \
155 $(libsciparallel_la_sci_gateway_DATA)
156HEADERS = $(libsciparallel_la_include_HEADERS)
157ETAGS = etags
158CTAGS = ctags
159DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
160ACLOCAL = @ACLOCAL@
161ALL_LINGUAS = @ALL_LINGUAS@
162AMTAR = @AMTAR@
163ANT = @ANT@
164ANTLR = @ANTLR@
165AR = @AR@
166AUTOCONF = @AUTOCONF@
167AUTOHEADER = @AUTOHEADER@
168AUTOMAKE = @AUTOMAKE@
169AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
170AWK = @AWK@
171BATIK = @BATIK@
172BLAS_LIBS = @BLAS_LIBS@
173BSH = @BSH@
174CC = @CC@
175CCDEPMODE = @CCDEPMODE@
176CFLAGS = @CFLAGS@
177CHECKSTYLE = @CHECKSTYLE@
178COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
179COMMONS_IO = @COMMONS_IO@
180COMMONS_LOGGING = @COMMONS_LOGGING@
181CPP = @CPP@
182CPPFLAGS = @CPPFLAGS@
183CXX = @CXX@
184CXXCPP = @CXXCPP@
185CXXDEPMODE = @CXXDEPMODE@
186CXXFLAGS = @CXXFLAGS@
187CYGPATH_W = @CYGPATH_W@
188DEFS = @DEFS@
189DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
190DEPDIR = @DEPDIR@
191DOCBOOK_ROOT = @DOCBOOK_ROOT@
192DSYMUTIL = @DSYMUTIL@
193DUMPBIN = @DUMPBIN@
194ECHO_C = @ECHO_C@
195ECHO_N = @ECHO_N@
196ECHO_T = @ECHO_T@
197EGREP = @EGREP@
198EXEEXT = @EXEEXT@
199F77 = @F77@
200FFLAGS = @FFLAGS@
201FFTW3_LIB = @FFTW3_LIB@
202FFTW_ENABLE = @FFTW_ENABLE@
203FGREP = @FGREP@
204FLEXDOCK = @FLEXDOCK@
205FLIBS = @FLIBS@
206FOP = @FOP@
207GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
208GIWS_BIN = @GIWS_BIN@
209GLUEGEN_RT = @GLUEGEN_RT@
210GMSGFMT = @GMSGFMT@
211GMSGFMT_015 = @GMSGFMT_015@
212GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
213GREP = @GREP@
214GUI_ENABLE = @GUI_ENABLE@
215HDF5_CFLAGS = @HDF5_CFLAGS@
216HDF5_ENABLE = @HDF5_ENABLE@
217HDF5_LIBS = @HDF5_LIBS@
218HELP_ENABLE = @HELP_ENABLE@
219INSTALL = @INSTALL@
220INSTALL_DATA = @INSTALL_DATA@
221INSTALL_PROGRAM = @INSTALL_PROGRAM@
222INSTALL_SCRIPT = @INSTALL_SCRIPT@
223INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
224INTLLIBS = @INTLLIBS@
225INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
226JAR = @JAR@
227JAVA = @JAVA@
228JAVAC = @JAVAC@
229JAVAH = @JAVAH@
230JAVASCI_ENABLE = @JAVASCI_ENABLE@
231JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
232JAVA_ENABLE = @JAVA_ENABLE@
233JAVA_G = @JAVA_G@
234JAVA_HOME = @JAVA_HOME@
235JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
236JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
237JDB = @JDB@
238JEUCLID_CORE = @JEUCLID_CORE@
239JGRAPHX = @JGRAPHX@
240JHALL = @JHALL@
241JHDF5 = @JHDF5@
242JLATEXMATH = @JLATEXMATH@
243JLATEXMATH_FOP = @JLATEXMATH_FOP@
244JOGL = @JOGL@
245JROSETTA_API = @JROSETTA_API@
246JROSETTA_ENGINE = @JROSETTA_ENGINE@
247JUNIT = @JUNIT@
248LAPACK_LIBS = @LAPACK_LIBS@
249LD = @LD@
250LDFLAGS = @LDFLAGS@
251LIBICONV = @LIBICONV@
252LIBINTL = @LIBINTL@
253LIBM = @LIBM@
254LIBOBJS = @LIBOBJS@
255LIBS = @LIBS@
256LIBTOOL = @LIBTOOL@
257LIPO = @LIPO@
258LN_S = @LN_S@
259LOOKS = @LOOKS@
260LTLIBICONV = @LTLIBICONV@
261LTLIBINTL = @LTLIBINTL@
262LTLIBOBJS = @LTLIBOBJS@
263MAINT = @MAINT@
264MAKEINFO = @MAKEINFO@
265MATIO_CFLAGS = @MATIO_CFLAGS@
266MATIO_ENABLE = @MATIO_ENABLE@
267MATIO_LIBS = @MATIO_LIBS@
268MKDIR_P = @MKDIR_P@
269MSGCAT = @MSGCAT@
270MSGFMT = @MSGFMT@
271MSGFMT_015 = @MSGFMT_015@
272MSGMERGE = @MSGMERGE@
273NM = @NM@
274NMEDIT = @NMEDIT@
275OBJDUMP = @OBJDUMP@
276OBJEXT = @OBJEXT@
277OCAMLC = @OCAMLC@
278OCAMLDEP = @OCAMLDEP@
279OCAMLLEX = @OCAMLLEX@
280OCAMLOPT = @OCAMLOPT@
281OCAMLYACC = @OCAMLYACC@
282OPENMP_ENABLE = @OPENMP_ENABLE@
283OTOOL = @OTOOL@
284OTOOL64 = @OTOOL64@
285PACKAGE = @PACKAGE@
286PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
287PACKAGE_NAME = @PACKAGE_NAME@
288PACKAGE_STRING = @PACKAGE_STRING@
289PACKAGE_TARNAME = @PACKAGE_TARNAME@
290PACKAGE_URL = @PACKAGE_URL@
291PACKAGE_VERSION = @PACKAGE_VERSION@
292PATH_SEPARATOR = @PATH_SEPARATOR@
293PCRE_CFLAGS = @PCRE_CFLAGS@
294PCRE_CONFIG = @PCRE_CONFIG@
295PCRE_LIBS = @PCRE_LIBS@
296PCRE_VERSION = @PCRE_VERSION@
297PKG_CONFIG = @PKG_CONFIG@
298POSUB = @POSUB@
299POW_LIB = @POW_LIB@
300PVMGETARCH = @PVMGETARCH@
301PVM_ARCH = @PVM_ARCH@
302PVM_ENABLE = @PVM_ENABLE@
303PVM_INCLUDE = @PVM_INCLUDE@
304PVM_LIB = @PVM_LIB@
305PYTHON = @PYTHON@
306QDOX = @QDOX@
307RANLIB = @RANLIB@
308RELOCATABLE = @RELOCATABLE@
309RT_LIB = @RT_LIB@
310SAXON = @SAXON@
311SCICOS_ENABLE = @SCICOS_ENABLE@
312SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
313SED = @SED@
314SET_MAKE = @SET_MAKE@
315SET_RELOCATABLE = @SET_RELOCATABLE@
316SHELL = @SHELL@
317SKINLF = @SKINLF@
318SPLINT = @SPLINT@
319STRIP = @STRIP@
320SWIG_BIN = @SWIG_BIN@
321SWIG_JAVA = @SWIG_JAVA@
322SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
323TCLTK_LIBS = @TCLTK_LIBS@
324TCL_INC_PATH = @TCL_INC_PATH@
325TESTNG = @TESTNG@
326TK_INC_PATH = @TK_INC_PATH@
327UMFPACK_ENABLE = @UMFPACK_ENABLE@
328UMFPACK_LIB = @UMFPACK_LIB@
329USE_NLS = @USE_NLS@
330VERSION = @VERSION@
331WITH_OCAML = @WITH_OCAML@
332WITH_TKSCI = @WITH_TKSCI@
333XGETTEXT = @XGETTEXT@
334XGETTEXT_015 = @XGETTEXT_015@
335XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
336XMKMF = @XMKMF@
337XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
338XML_APIS_EXT = @XML_APIS_EXT@
339XML_CONFIG = @XML_CONFIG@
340XML_FLAGS = @XML_FLAGS@
341XML_LIBS = @XML_LIBS@
342XML_VERSION = @XML_VERSION@
343X_CFLAGS = @X_CFLAGS@
344X_EXTRA_LIBS = @X_EXTRA_LIBS@
345X_LIBS = @X_LIBS@
346X_PRE_LIBS = @X_PRE_LIBS@
347abs_builddir = @abs_builddir@
348abs_srcdir = @abs_srcdir@
349abs_top_builddir = @abs_top_builddir@
350abs_top_srcdir = @abs_top_srcdir@
351ac_ct_CC = @ac_ct_CC@
352ac_ct_CXX = @ac_ct_CXX@
353ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
354ac_ct_F77 = @ac_ct_F77@
355am__include = @am__include@
356am__leading_dot = @am__leading_dot@
357am__quote = @am__quote@
358am__tar = @am__tar@
359am__untar = @am__untar@
360bindir = @bindir@
361build = @build@
362build_alias = @build_alias@
363build_cpu = @build_cpu@
364build_os = @build_os@
365build_vendor = @build_vendor@
366builddir = @builddir@
367cxx_present = @cxx_present@
368datadir = @datadir@
369datarootdir = @datarootdir@
370docdir = @docdir@
371dvidir = @dvidir@
372exec_prefix = @exec_prefix@
373host = @host@
374host_alias = @host_alias@
375host_cpu = @host_cpu@
376host_os = @host_os@
377host_vendor = @host_vendor@
378htmldir = @htmldir@
379includedir = @includedir@
380infodir = @infodir@
381install_sh = @install_sh@
382libdir = @libdir@
383libexecdir = @libexecdir@
384localedir = @localedir@
385localstatedir = @localstatedir@
386mandir = @mandir@
387mkdir_p = @mkdir_p@
388oldincludedir = @oldincludedir@
389pdfdir = @pdfdir@
390prefix = @prefix@
391program_transform_name = @program_transform_name@
392psdir = @psdir@
393sbindir = @sbindir@
394sharedstatedir = @sharedstatedir@
395srcdir = @srcdir@
396sysconfdir = @sysconfdir@
397target_alias = @target_alias@
398top_build_prefix = @top_build_prefix@
399top_builddir = @top_builddir@
400top_srcdir = @top_srcdir@
401PARALLEL_CPP_SOURCES =
402GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_parallel_run.cpp
403PARALLEL_C_SOURCES =
404GATEWAY_C_SOURCES = sci_gateway/c/gw_parallel.c
405libsciparallel_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
406-I$(srcdir)/includes/ \
407-I$(top_srcdir)/modules/core/includes \
408-I$(srcdir)/src/c/ \
409-I$(top_srcdir)/modules/api_scilab/includes \
410-I$(top_srcdir)/modules/string/includes
411
412libsciparallel_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
413-I$(srcdir)/includes/ \
414-I$(top_srcdir)/modules/core/includes \
415-I$(srcdir)/src/cpp/ \
416-I$(srcdir)/src/c/ \
417-I$(top_srcdir)/modules/api_scilab/includes \
418-I$(top_srcdir)/modules/output_stream/includes \
419-I$(top_srcdir)/modules/parameters/includes \
420-I$(top_srcdir)/modules/dynamic_link/includes
421
422pkglib_LTLIBRARIES = libsciparallel.la
423libsciparallel_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
424libsciparallel_la_SOURCES = $(PARALLEL_C_SOURCES) $(PARALLEL_CPP_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
425
426# For the code check (splint)
427CHECK_SRC = $(PARALLEL_C_SOURCES) $(GATEWAY_C_SOURCES)
428INCLUDE_FLAGS = $(libsciparallel_la_CFLAGS)
429
430#### Target ######
431modulename = parallel
432
433#### parallel : Conf files ####
434libsciparallel_la_rootdir = $(mydatadir)
435libsciparallel_la_root_DATA = license.txt readme.txt version.xml
436
437#### parallel : init scripts ####
438libsciparallel_la_etcdir = $(mydatadir)/etc
439libsciparallel_la_etc_DATA = etc/parallel.quit etc/parallel.start
440
441#### parallel : gateway declaration ####
442libsciparallel_la_sci_gatewaydir = $(mydatadir)/sci_gateway
443libsciparallel_la_sci_gateway_DATA = sci_gateway/parallel_gateway.xml
444
445#### parallel : include files ####
446libsciparallel_la_includedir = $(pkgincludedir)
447libsciparallel_la_include_HEADERS =
448
449# Where all the Scilab stuff is installed (macros, help, ...)
450mydatadir = $(pkgdatadir)/modules/$(modulename)
451
452# splint options
453SPLINT_OPTIONS = -weak -booltype BOOL
454
455########################### JAVA ######################################
456#### We are delegating java compilation to ant... Thanks to that
457#### the procedure will be the same with Microsoft Windows (C)
458#### and Linux/Unix
459#######################################################################
460TARGETS_ALL = $(am__append_1) $(am__append_2)
461
462################ MACROS ######################
463# Rule to build a macro
464# NOT USED AT THE MOMENT
465SUFFIXES = .sci
466
467########### INSTALL DOCUMENTATION ###################
468
469# Install documentation files into the right target
470# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
471# automake needs the html files to be present which is not the case when
472# we are building Scilab
473
474# Where it should be installed
475pkgdocdir = $(mydatadir)
476
477# What is the mask of the help source
478DOCMASKXML = *.xml
479
480# What is the mask of the MathML sources
481DOCMASKMML = *.mml
482
483########### INSTALL DATA ###################
484# Install macros, help & demos
485# Where it should be installed
486pkgmacrosdir = $(mydatadir)
487# Which directory we process
488MACRODIRS = macros/
489# Mask of the Scilab sources macros
490MACROMASK = *.sci
491# Mask of the Scilab executable sources macros
492MACROBUILDMASK = *.sce
493# Mask of the Scilab compiled macros
494MACROBINMASK = *.bin
495# List of the standard directory for tests
496TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
497# Where the demos should be installed
498pkgdemosdir = $(mydatadir)
499# List of the standard directory for demos
500DEMOS_DIR = demos
501# List of the standard directory for examples
502EXAMPLES_DIR = examples
503# Where to export JAVA archives (.jar)
504JARDIR = jar/
505# JAR files mask
506JARMASK = *.jar
507# Chapter file
508HELP_CHAPTERDIR = help/
509HELP_CHAPTERFILE = addchapter.sce
510HELP_CHAPTERLANG = en_US fr_FR pt_BR
511all: all-am
512
513.SUFFIXES:
514.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
515$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
516 @for dep in $?; do \
517 case '$(am__configure_deps)' in \
518 *$$dep*) \
519 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
520 && { if test -f $@; then exit 0; else break; fi; }; \
521 exit 1;; \
522 esac; \
523 done; \
524 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/parallel/Makefile'; \
525 $(am__cd) $(top_srcdir) && \
526 $(AUTOMAKE) --foreign modules/parallel/Makefile
527.PRECIOUS: Makefile
528Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
529 @case '$?' in \
530 *config.status*) \
531 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
532 *) \
533 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
534 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
535 esac;
536
537$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
538 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
539
540$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
541 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
542$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
543 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
544$(am__aclocal_m4_deps):
545install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
546 @$(NORMAL_INSTALL)
547 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
548 @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
549 list2=; for p in $$list; do \
550 if test -f $$p; then \
551 list2="$$list2 $$p"; \
552 else :; fi; \
553 done; \
554 test -z "$$list2" || { \
555 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
556 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
557 }
558
559uninstall-pkglibLTLIBRARIES:
560 @$(NORMAL_UNINSTALL)
561 @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
562 for p in $$list; do \
563 $(am__strip_dir) \
564 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
565 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
566 done
567
568clean-pkglibLTLIBRARIES:
569 -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
570 @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
571 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
572 test "$$dir" != "$$p" || dir=.; \
573 echo "rm -f \"$${dir}/so_locations\""; \
574 rm -f "$${dir}/so_locations"; \
575 done
576libsciparallel.la: $(libsciparallel_la_OBJECTS) $(libsciparallel_la_DEPENDENCIES)
577 $(libsciparallel_la_LINK) -rpath $(pkglibdir) $(libsciparallel_la_OBJECTS) $(libsciparallel_la_LIBADD) $(LIBS)
578
579mostlyclean-compile:
580 -rm -f *.$(OBJEXT)
581
582distclean-compile:
583 -rm -f *.tab.c
584
585@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciparallel_la-gw_parallel.Plo@am__quote@
586@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciparallel_la-sci_parallel_run.Plo@am__quote@
587
588.c.o:
589@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
590@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
591@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
592@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
593@am__fastdepCC_FALSE@ $(COMPILE) -c $<
594
595.c.obj:
596@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
597@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
598@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
599@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
600@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
601
602.c.lo:
603@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
604@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
605@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
606@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
607@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
608
609libsciparallel_la-gw_parallel.lo: sci_gateway/c/gw_parallel.c
610@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(libsciparallel_la_CFLAGS) $(CFLAGS) -MT libsciparallel_la-gw_parallel.lo -MD -MP -MF $(DEPDIR)/libsciparallel_la-gw_parallel.Tpo -c -o libsciparallel_la-gw_parallel.lo `test -f 'sci_gateway/c/gw_parallel.c' || echo '$(srcdir)/'`sci_gateway/c/gw_parallel.c
611@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciparallel_la-gw_parallel.Tpo $(DEPDIR)/libsciparallel_la-gw_parallel.Plo
612@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sci_gateway/c/gw_parallel.c' object='libsciparallel_la-gw_parallel.lo' libtool=yes @AMDEPBACKSLASH@
613@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
614@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(libsciparallel_la_CFLAGS) $(CFLAGS) -c -o libsciparallel_la-gw_parallel.lo `test -f 'sci_gateway/c/gw_parallel.c' || echo '$(srcdir)/'`sci_gateway/c/gw_parallel.c
615
616.cpp.o:
617@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
618@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
619@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
620@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
621@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
622
623.cpp.obj:
624@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
625@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
626@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
627@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
628@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
629
630.cpp.lo:
631@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
632@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
633@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
634@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
635@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
636
637libsciparallel_la-sci_parallel_run.lo: sci_gateway/cpp/sci_parallel_run.cpp
638@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciparallel_la-sci_parallel_run.lo -MD -MP -MF $(DEPDIR)/libsciparallel_la-sci_parallel_run.Tpo -c -o libsciparallel_la-sci_parallel_run.lo `test -f 'sci_gateway/cpp/sci_parallel_run.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_parallel_run.cpp
639@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciparallel_la-sci_parallel_run.Tpo $(DEPDIR)/libsciparallel_la-sci_parallel_run.Plo
640@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_parallel_run.cpp' object='libsciparallel_la-sci_parallel_run.lo' libtool=yes @AMDEPBACKSLASH@
641@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
642@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciparallel_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciparallel_la-sci_parallel_run.lo `test -f 'sci_gateway/cpp/sci_parallel_run.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_parallel_run.cpp
643
644mostlyclean-libtool:
645 -rm -f *.lo
646
647clean-libtool:
648 -rm -rf .libs _libs
649install-libsciparallel_la_etcDATA: $(libsciparallel_la_etc_DATA)
650 @$(NORMAL_INSTALL)
651 test -z "$(libsciparallel_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciparallel_la_etcdir)"
652 @list='$(libsciparallel_la_etc_DATA)'; test -n "$(libsciparallel_la_etcdir)" || list=; \
653 for p in $$list; do \
654 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
655 echo "$$d$$p"; \
656 done | $(am__base_list) | \
657 while read files; do \
658 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciparallel_la_etcdir)'"; \
659 $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciparallel_la_etcdir)" || exit $$?; \
660 done
661
662uninstall-libsciparallel_la_etcDATA:
663 @$(NORMAL_UNINSTALL)
664 @list='$(libsciparallel_la_etc_DATA)'; test -n "$(libsciparallel_la_etcdir)" || list=; \
665 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
666 test -n "$$files" || exit 0; \
667 echo " ( cd '$(DESTDIR)$(libsciparallel_la_etcdir)' && rm -f" $$files ")"; \
668 cd "$(DESTDIR)$(libsciparallel_la_etcdir)" && rm -f $$files
669install-libsciparallel_la_rootDATA: $(libsciparallel_la_root_DATA)
670 @$(NORMAL_INSTALL)
671 test -z "$(libsciparallel_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciparallel_la_rootdir)"
672 @list='$(libsciparallel_la_root_DATA)'; test -n "$(libsciparallel_la_rootdir)" || list=; \
673 for p in $$list; do \
674 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
675 echo "$$d$$p"; \
676 done | $(am__base_list) | \
677 while read files; do \
678 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciparallel_la_rootdir)'"; \
679 $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciparallel_la_rootdir)" || exit $$?; \
680 done
681
682uninstall-libsciparallel_la_rootDATA:
683 @$(NORMAL_UNINSTALL)
684 @list='$(libsciparallel_la_root_DATA)'; test -n "$(libsciparallel_la_rootdir)" || list=; \
685 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
686 test -n "$$files" || exit 0; \
687 echo " ( cd '$(DESTDIR)$(libsciparallel_la_rootdir)' && rm -f" $$files ")"; \
688 cd "$(DESTDIR)$(libsciparallel_la_rootdir)" && rm -f $$files
689install-libsciparallel_la_sci_gatewayDATA: $(libsciparallel_la_sci_gateway_DATA)
690 @$(NORMAL_INSTALL)
691 test -z "$(libsciparallel_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)"
692 @list='$(libsciparallel_la_sci_gateway_DATA)'; test -n "$(libsciparallel_la_sci_gatewaydir)" || list=; \
693 for p in $$list; do \
694 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
695 echo "$$d$$p"; \
696 done | $(am__base_list) | \
697 while read files; do \
698 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)'"; \
699 $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)" || exit $$?; \
700 done
701
702uninstall-libsciparallel_la_sci_gatewayDATA:
703 @$(NORMAL_UNINSTALL)
704 @list='$(libsciparallel_la_sci_gateway_DATA)'; test -n "$(libsciparallel_la_sci_gatewaydir)" || list=; \
705 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
706 test -n "$$files" || exit 0; \
707 echo " ( cd '$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)' && rm -f" $$files ")"; \
708 cd "$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)" && rm -f $$files
709install-libsciparallel_la_includeHEADERS: $(libsciparallel_la_include_HEADERS)
710 @$(NORMAL_INSTALL)
711 test -z "$(libsciparallel_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciparallel_la_includedir)"
712 @list='$(libsciparallel_la_include_HEADERS)'; test -n "$(libsciparallel_la_includedir)" || list=; \
713 for p in $$list; do \
714 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
715 echo "$$d$$p"; \
716 done | $(am__base_list) | \
717 while read files; do \
718 echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciparallel_la_includedir)'"; \
719 $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciparallel_la_includedir)" || exit $$?; \
720 done
721
722uninstall-libsciparallel_la_includeHEADERS:
723 @$(NORMAL_UNINSTALL)
724 @list='$(libsciparallel_la_include_HEADERS)'; test -n "$(libsciparallel_la_includedir)" || list=; \
725 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
726 test -n "$$files" || exit 0; \
727 echo " ( cd '$(DESTDIR)$(libsciparallel_la_includedir)' && rm -f" $$files ")"; \
728 cd "$(DESTDIR)$(libsciparallel_la_includedir)" && rm -f $$files
729
730ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
731 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
732 unique=`for i in $$list; do \
733 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
734 done | \
735 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
736 END { if (nonempty) { for (i in files) print i; }; }'`; \
737 mkid -fID $$unique
738tags: TAGS
739
740TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
741 $(TAGS_FILES) $(LISP)
742 set x; \
743 here=`pwd`; \
744 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
745 unique=`for i in $$list; do \
746 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
747 done | \
748 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
749 END { if (nonempty) { for (i in files) print i; }; }'`; \
750 shift; \
751 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
752 test -n "$$unique" || unique=$$empty_fix; \
753 if test $$# -gt 0; then \
754 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
755 "$$@" $$unique; \
756 else \
757 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
758 $$unique; \
759 fi; \
760 fi
761ctags: CTAGS
762CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
763 $(TAGS_FILES) $(LISP)
764 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
765 unique=`for i in $$list; do \
766 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
767 done | \
768 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
769 END { if (nonempty) { for (i in files) print i; }; }'`; \
770 test -z "$(CTAGS_ARGS)$$unique" \
771 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
772 $$unique
773
774GTAGS:
775 here=`$(am__cd) $(top_builddir) && pwd` \
776 && $(am__cd) $(top_srcdir) \
777 && gtags -i $(GTAGS_ARGS) "$$here"
778
779distclean-tags:
780 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
781
782distdir: $(DISTFILES)
783 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
784 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
785 list='$(DISTFILES)'; \
786 dist_files=`for file in $$list; do echo $$file; done | \
787 sed -e "s|^$$srcdirstrip/||;t" \
788 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
789 case $$dist_files in \
790 */*) $(MKDIR_P) `echo "$$dist_files" | \
791 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
792 sort -u` ;; \
793 esac; \
794 for file in $$dist_files; do \
795 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
796 if test -d $$d/$$file; then \
797 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
798 if test -d "$(distdir)/$$file"; then \
799 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
800 fi; \
801 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
802 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
803 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
804 fi; \
805 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
806 else \
807 test -f "$(distdir)/$$file" \
808 || cp -p $$d/$$file "$(distdir)/$$file" \
809 || exit 1; \
810 fi; \
811 done
812check-am: all-am
813 $(MAKE) $(AM_MAKEFLAGS) check-local
814check: check-am
815all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
816installdirs:
817 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciparallel_la_etcdir)" "$(DESTDIR)$(libsciparallel_la_rootdir)" "$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)" "$(DESTDIR)$(libsciparallel_la_includedir)"; do \
818 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
819 done
820install: install-am
821install-exec: install-exec-am
822install-data: install-data-am
823uninstall: uninstall-am
824
825install-am: all-am
826 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
827
828installcheck: installcheck-am
829install-strip:
830 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
831 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
832 `test -z '$(STRIP)' || \
833 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
834mostlyclean-generic:
835
836clean-generic:
837
838distclean-generic:
839 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
840 -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
841
842maintainer-clean-generic:
843 @echo "This command is intended for maintainers to use"
844 @echo "it deletes files that may require special tools to rebuild."
845clean: clean-am
846
847clean-am: clean-generic clean-libtool clean-local \
848 clean-pkglibLTLIBRARIES mostlyclean-am
849
850distclean: distclean-am
851 -rm -rf ./$(DEPDIR)
852 -rm -f Makefile
853distclean-am: clean-am distclean-compile distclean-generic \
854 distclean-local distclean-tags
855
856dvi: dvi-am
857
858dvi-am:
859
860html: html-am
861
862html-am:
863
864info: info-am
865
866info-am:
867
868install-data-am: install-data-local install-libsciparallel_la_etcDATA \
869 install-libsciparallel_la_includeHEADERS \
870 install-libsciparallel_la_rootDATA \
871 install-libsciparallel_la_sci_gatewayDATA
872
873install-dvi: install-dvi-am
874
875install-dvi-am:
876
877install-exec-am: install-pkglibLTLIBRARIES
878
879install-html: install-html-am
880
881install-html-am: install-html-local
882
883install-info: install-info-am
884
885install-info-am:
886
887install-man:
888
889install-pdf: install-pdf-am
890
891install-pdf-am:
892
893install-ps: install-ps-am
894
895install-ps-am:
896
897installcheck-am:
898
899maintainer-clean: maintainer-clean-am
900 -rm -rf ./$(DEPDIR)
901 -rm -f Makefile
902maintainer-clean-am: distclean-am maintainer-clean-generic
903
904mostlyclean: mostlyclean-am
905
906mostlyclean-am: mostlyclean-compile mostlyclean-generic \
907 mostlyclean-libtool
908
909pdf: pdf-am
910
911pdf-am:
912
913ps: ps-am
914
915ps-am:
916
917uninstall-am: uninstall-libsciparallel_la_etcDATA \
918 uninstall-libsciparallel_la_includeHEADERS \
919 uninstall-libsciparallel_la_rootDATA \
920 uninstall-libsciparallel_la_sci_gatewayDATA \
921 uninstall-pkglibLTLIBRARIES
922
923.MAKE: check-am install-am install-strip
924
925.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
926 clean clean-generic clean-libtool clean-local \
927 clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
928 distclean-generic distclean-libtool distclean-local \
929 distclean-tags distdir dvi dvi-am html html-am info info-am \
930 install install-am install-data install-data-am \
931 install-data-local install-dvi install-dvi-am install-exec \
932 install-exec-am install-html install-html-am \
933 install-html-local install-info install-info-am \
934 install-libsciparallel_la_etcDATA \
935 install-libsciparallel_la_includeHEADERS \
936 install-libsciparallel_la_rootDATA \
937 install-libsciparallel_la_sci_gatewayDATA install-man \
938 install-pdf install-pdf-am install-pkglibLTLIBRARIES \
939 install-ps install-ps-am install-strip installcheck \
940 installcheck-am installdirs maintainer-clean \
941 maintainer-clean-generic mostlyclean mostlyclean-compile \
942 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
943 tags uninstall uninstall-am \
944 uninstall-libsciparallel_la_etcDATA \
945 uninstall-libsciparallel_la_includeHEADERS \
946 uninstall-libsciparallel_la_rootDATA \
947 uninstall-libsciparallel_la_sci_gatewayDATA \
948 uninstall-pkglibLTLIBRARIES
949
950
951# This target enables tests for Scilab
952check-local: $(top_builddir)/scilab-bin test
953 @COMMAND="test_run('$(modulename)');quit";\
954 export LANG=C;\
955 $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
956check-code:
957 if test -f build.xml; then \
958 $(ANT) checkstyle; \
959 fi
960 if test -x "$(SPLINT)"; then \
961 $(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); \
962 fi
963@NEED_JAVA_TRUE@java:
964# Some configurations needs to export JAVA_HOME in the current env
965@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
966@NEED_JAVA_TRUE@ if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
967@NEED_JAVA_TRUE@ if test -f build.xml -a $$USEANT -eq 1; then \
968@NEED_JAVA_TRUE@ $(ANT); \
969@NEED_JAVA_TRUE@ fi
970
971@NEED_JAVA_TRUE@clean-java:
972# Some configurations needs to export JAVA_HOME in the current env
973@NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
974@NEED_JAVA_TRUE@ if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
975@NEED_JAVA_TRUE@ if test -f build.xml -a $$USEANT -eq 1; then \
976@NEED_JAVA_TRUE@ $(ANT) clean; \
977@NEED_JAVA_TRUE@ fi;
978
979# If the user request for the SWIG generation of the wrappers Java => C/C++
980# We call the target swig-build on the variable SWIG_WRAPPERS
981
982@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
983@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
984@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
985@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
986@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
987@SWIG_TRUE@ echo "Swig process of $$file ..."; \
988@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
989@SWIG_TRUE@ done; \
990@SWIG_TRUE@ fi
991
992# If the user request for the SWIG generation of the wrappers Java => C/C++
993# We call the target swig-build on the variable SWIG_WRAPPERS
994
995@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
996@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
997@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
998@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
999@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1000@GIWS_TRUE@ $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
1001@GIWS_TRUE@ done; \
1002@GIWS_TRUE@ fi
1003
1004macros:
1005 -@( if test ! -x $(top_builddir)/scilab-bin; then \
1006 echo "Error : Cannot build $< : Scilab has not been built"; \
1007 else \
1008 $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
1009 fi)
1010
1011# Removes the macros
1012clean-macros:
1013# Removes macros (*.bin generated from .sci)
1014 @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
1015 echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
1016 rm -f $(builddir)/$$dir/$(MACROBINMASK); \
1017 done
1018
1019test:
1020# More tests could be added here
1021 @if test -f build.xml; then \
1022 $(ANT) test; \
1023 fi
1024
1025all-local: $(TARGETS_ALL)
1026
1027.sci.bin:
1028 -@( if test ! -x $(top_builddir)/scilab-bin; then \
1029 echo "Error : Cannot build $< : Scilab has not been build"; \
1030 else \
1031 echo "Creating $@"; \
1032 $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
1033 fi )
1034
1035install-html-local:
1036# If the user wants the help sources to be installed
1037@INSTALL_HELP_XML_TRUE@ @echo "-------- Install of XML sources of help files --------"; \
1038@INSTALL_HELP_XML_TRUE@ for lang in $(ALL_LINGUAS); do \
1039@INSTALL_HELP_XML_TRUE@ if test -d $(srcdir)/help/$$lang; then \
1040@INSTALL_HELP_XML_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
1041@INSTALL_HELP_XML_TRUE@ if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
1042@INSTALL_HELP_XML_TRUE@ for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
1043@INSTALL_HELP_XML_TRUE@ echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
1044@INSTALL_HELP_XML_TRUE@ $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
1045@INSTALL_HELP_XML_TRUE@ done ; \
1046@INSTALL_HELP_XML_TRUE@ fi; \
1047@INSTALL_HELP_XML_TRUE@ fi; \
1048@INSTALL_HELP_XML_TRUE@ done; \
1049@INSTALL_HELP_XML_TRUE@ @echo "-------- Install of MathML sources --------"; \
1050@INSTALL_HELP_XML_TRUE@ if test -d $(srcdir)/help/mml/; then \
1051@INSTALL_HELP_XML_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
1052@INSTALL_HELP_XML_TRUE@ if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
1053@INSTALL_HELP_XML_TRUE@ for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
1054@INSTALL_HELP_XML_TRUE@ echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
1055@INSTALL_HELP_XML_TRUE@ $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
1056@INSTALL_HELP_XML_TRUE@ done ; \
1057@INSTALL_HELP_XML_TRUE@ fi; \
1058@INSTALL_HELP_XML_TRUE@ fi
1059install-data-local:
1060# Install the tests
1061 @echo "-------- Install tests (if any) --------"; \
1062 for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
1063 if test -d $(srcdir)/$$dir/; then \
1064 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1065 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
1066 if test -d "$(srcdir)/$$dir/$$file"; then \
1067 echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
1068 $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
1069 else \
1070 echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
1071 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
1072 fi \
1073 done; \
1074 fi; \
1075 done
1076# Install the help chapter
1077 @echo "-------- Install the help chapter (if any) --------"; \
1078 for lang in $(HELP_CHAPTERLANG); do \
1079 HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
1080 if test -f $$HELPFILE; then \
1081 echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
1082 $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
1083 echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
1084 $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
1085 fi; \
1086 done
1087# Install the demos & examples
1088 @echo "-------- Install demos & examples (if any) --------"; \
1089 for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
1090 if test -d $(srcdir)/$$dir/; then \
1091 $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
1092 for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
1093 if test -d "$(srcdir)/$$dir/$$file"; then \
1094 echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
1095 $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
1096 else \
1097 echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
1098 $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
1099 fi \
1100 done; \
1101 fi; \
1102 done
1103# Install the macros
1104 @echo "-------- Install macros (if any) --------"; \
1105 for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
1106 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1107 if test -d $(srcdir)/$$dir/; then \
1108 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1109 if test -n "$(MACROSSPECIALEXT)"; then \
1110 specialExtDir=""; \
1111 for specialExt in $(MACROSSPECIALEXT); do \
1112 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1113 done; \
1114 FILELIST="$$FILELIST $$specialExtDir"; \
1115 fi; \
1116 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1117 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1118 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
1119 done; \
1120 fi; \
1121 done
1122# Install java files (.jar)
1123 @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
1124 echo "-------- Install jar files --------"; \
1125 $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
1126 for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
1127 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
1128 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
1129 done ; \
1130 fi
1131
1132########### CLEAN ###################
1133# Clean macros and help (generated automatically by Scilab)
1134@NEED_JAVA_TRUE@clean-local: clean-java clean-macros
1135@NEED_JAVA_FALSE@clean-local: clean-macros
1136
1137distclean-local:
1138 rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
1139
1140.PHONY: macros java swig giws
1141
1142# Tell versions [3.59,3.63) of GNU make to not export all variables.
1143# Otherwise a system limit (for SysV at least) may be exceeded.
1144.NOEXPORT:
diff --git a/scilab/modules/parallel/etc/parallel.quit b/scilab/modules/parallel/etc/parallel.quit
new file mode 100644
index 0000000..870ee1f
--- /dev/null
+++ b/scilab/modules/parallel/etc/parallel.quit
@@ -0,0 +1,8 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2010 - DIGITEO - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
diff --git a/scilab/modules/parallel/etc/parallel.start b/scilab/modules/parallel/etc/parallel.start
new file mode 100644
index 0000000..870ee1f
--- /dev/null
+++ b/scilab/modules/parallel/etc/parallel.start
@@ -0,0 +1,8 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2010 - DIGITEO - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
diff --git a/scilab/modules/parallel/help/en_US/addchapter.sce b/scilab/modules/parallel/help/en_US/addchapter.sce
new file mode 100644
index 0000000..f23a242
--- /dev/null
+++ b/scilab/modules/parallel/help/en_US/addchapter.sce
@@ -0,0 +1,11 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2010 - DIGITEO - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10add_help_chapter("Parallel", SCI + "/modules/parallel/help/en_US", %T);
11
diff --git a/scilab/modules/parallel/help/en_US/parallel_run.xml b/scilab/modules/parallel/help/en_US/parallel_run.xml
new file mode 100644
index 0000000..8708e74
--- /dev/null
+++ b/scilab/modules/parallel/help/en_US/parallel_run.xml
@@ -0,0 +1,621 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2010 - DIGITEO Bernard HUGUENEY
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13<refentry version="5.0-subset Scilab" xml:id="parallel_run" xml:lang="en"
14 xmlns="http://docbook.org/ns/docbook"
15 xmlns:xlink="http://www.w3.org/1999/xlink"
16 xmlns:svg="http://www.w3.org/2000/svg"
17 xmlns:ns3="http://www.w3.org/1999/xhtml"
18 xmlns:mml="http://www.w3.org/1998/Math/MathML"
19 xmlns:db="http://docbook.org/ns/docbook">
20 <info>
21 <pubdate>$LastChangedDate$</pubdate>
22 </info>
23
24 <refnamediv>
25 <refname>parallel_run</refname>
26
27 <refpurpose>parallel calls to a function</refpurpose>
28 </refnamediv>
29
30 <refsynopsisdiv>
31 <title>Calling Sequence</title>
32
33 <synopsis>[R1[,…,Rm]]=parallel_run(A1[,…,Ak], f[,types][,dims], p)</synopsis>
34 </refsynopsisdiv>
35
36 <refsection>
37 <title>Parameters</title>
38
39 <variablelist>
40 <varlistentry>
41 <term>Ai</term>
42
43 <listitem>
44 <para>Argument matrix of scalars (real) for function f. The Ai
45 matrices do not need to have the same number of columns. Let n be
46 the largest number of columns for the Ai : f will be called <literal>n</literal> times
47 with arguments Ai(:,k) for k=1…n. For Ai with less than n
48 columns, the columns are 'recycled' and the kth call is passed
49 Ai(:,(modulo(k-1,n)+1).</para>
50 </listitem>
51 </varlistentry>
52
53 <varlistentry>
54 <term>f</term>
55
56 <listitem>
57 <para>string containing the name of the function to call.</para>
58 </listitem>
59 </varlistentry>
60
61 <varlistentry>
62 <term>types</term>
63
64 <listitem>
65 <para>strings containing the type name (as per <link
66 linkend="typeof">typeof</link>) of results of the function <emphasis
67 role="bold">f</emphasis>. Currently, only &quot;constant&quot; for reals
68 (scalar or matrix) is supported. Defaults to &quot;constant&quot;.</para>
69 </listitem>
70 </varlistentry>
71
72 <varlistentry>
73 <term>dims</term>
74
75 <listitem>
76 <para>matrix with 1 or 2 columns containing the dimensions of the
77 results of the function <emphasis role="bold">f</emphasis>. Defaults
78 to 1 (i.e. scalar results).</para>
79 </listitem>
80 </varlistentry>
81
82 <varlistentry>
83 <term>p</term>
84
85 <listitem>
86 <para>parameters list (as created with <link
87 linkend="init_param">init_param</link>) used for tuning the
88 parallelization strategy. See <emphasis role="bold">&#167;Tuning the Parallelization with Configuration Parameters</emphasis> for the various parameters that can be set.</para>
89 </listitem>
90 </varlistentry>
91
92 <varlistentry>
93 <term>Ri</term>
94
95 <listitem>
96 <para>vectors of n (see above) columns containing the results of the
97 function called. The number of rows are given by the corresponding
98 size argument if any (1 otherwise).</para>
99 </listitem>
100 </varlistentry>
101 </variablelist>
102 </refsection>
103 <refsection>
104 <title>Description</title>
105
106 <para>parallel_run makes parallel calls (on a multicore system) to the
107 provided function on the supplied vectors of arguments. The function can
108 be the name of either a compiled foreign function (see <link
109 linkend="ilib_for_link">ilib_for_link</link>) or a Scilab macro. In the
110 latter case, the macro should not rely on side effects because some of them
111 will be lost (those performed in other processes than the main scilab
112 process). The number of
113 calls (and dimension of the result vectors) is given by the length of the
114 longest vector of arguments.</para>
115
116 <para>Except for side effects, [R1[,…,Rm]]=parallel_run(A1[,…,Ak],
117 'f'[,types][,dims][,C]) is equivalent to the Scilab pseudo code:</para>
118
119 <programlisting role="example"><![CDATA[for i = 1:max(size(A1,'c'),…,size(Ak,'c'))
120 [R1(:,i),…,Rm(:,i)]= f(A1(:(modulo(i-1,size(A1,'c'))+1),…,Ak(:(modulo(i-1,size(Ak,'c'))+1));
121end; ]]></programlisting>
122
123 <para>Note that the equivalent code does not need <literal>types</literal>, <literal>dims</literal> or <literal>p</literal>.
124 <literal>parallel_run</literal> needs them for performance reasons : <literal>types</literal> and <literal>dims</literal> are used
125 to pre-allocate the result variables and <literal>p</literal> is used to fine tune the
126 parallelization strategy.</para>
127
128 </refsection>
129 <refsection>
130 <title>Limitations</title>
131
132 <para>In order to provide the most efficient implementation possible, the least that parallel_run can do is to avoid imposing an overhead over an explicit loop. Unfortunately, this can only be achieved on some data structures.
133For matrices of scalar, extracting a single column to pass as argument to the function can be done very efficiently.
134Not so for matrices of strings or sparse matrices (not to mention lists !).
135For now, parallel_run only handles arguments and results of scalar matrices of real values and the <emphasis role="bold">types</emphasis> argument is not used.
136</para>
137 <para>Furthermore, no locking primitives are available in Scilab to handle concurrent accesses to shared variables.
138For this reason, the concurrent execution of Scilab macros cannot be safe in a shared memory environment and each parallel execution must be done in a separate memory space. As a result, one should not rely on side effects such as modifying variables from outer scope : only the data stored into the result variables will be copied back into the calling environment.
139</para>
140 <para>A last limitation imposed by the aim to minimize data shuffling info memory is that no stack resizing (via <link linkend="gstacksize">gstacksize()</link> or via <link linkend="stacksize">stacksize()</link>) should take place during a call to <literal>parallel_run</literal> (neither by the function f nor by the prologue or epilogue cf. infra.).
141</para>
142 </refsection>
143 <refsection>
144 <title>Advanced usage</title>
145<para>
146To achieve maximum performance and void any unwarranted copy and heavy context switching, it is possible to use parallel_run on compiled foreign functions. Such and advanced usage of parallel_run is detailed bellow in <emphasis role="bold">&#167;&#160;Advanced Usage : Compiled Foreign Functions</emphasis>.</para>
147 </refsection>
148
149 <refsection>
150 <title>Examples </title>
151<refsection>
152<title>First steps </title>
153 <para>First we rewrite the most trivial loop with parallel_run:</para>
154
155 <programlisting role="example"><![CDATA[for i=1:10
156 res(i)= i*i;
157end;
158// for parallel_run, we need to have a function performing the computation
159function a= g(arg1)
160 a=arg1*arg1
161endfunction
162
163res=parallel_run(1:10, "g"); // res = [1., 4., 9., 16., 25., 36., 49., 64., 81., 100.]; ]]></programlisting>
164The matrix res was filled with res(i)= g(i), with concurrent calls to g(). To see that the calls to <literal>g</literal> are not sequential, we can add some output to the function :
165 <programlisting role="example"><![CDATA[function a= g(arg1)
166disp("called on "+string(arg1));
167 a=arg1*arg1;
168disp("computed "+string(a));
169endfunction
170
171res=parallel_run(1:6, "g"); // the actual output depends on the architecture (i.e. 4 cores) and current load
172 called on 3
173
174 computed 9
175
176 called on 2
177
178 called on 5
179
180 computed 25
181
182
183 computed 4
184
185 called on 1
186 called on 6
187
188 computed 36
189
190 computed 1
191
192 called on 4
193
194 computed 16]]></programlisting>
195As we can see, not only were the the calls to <literal>g</literal> 'out of order', but they where also interleaved.
196<para>
197<emphasis role="bold">Note :</emphasis> This example is for illustrative purposes only ! When the operations performed by the function are available in vector form, it is much more efficient to use these operators than to call parallel_run. For instance, the most efficient way to perform g() on a vector of values would be to rewrite it as <emphasis role="italic"> a= arg1 .* arg1</emphasis> an call it directly on the matrix of arguments (i.e res= g(1:10);). parallel_run is intended for more involved functions.
198</para>
199To illustrate the running time gain, we instrument the next example with calls to <link linkend="getdate">getdate()</link>. However, the next examples will focus only on the illustrative purpose irrespectively of any actual gain. Running the simplest Scilab function with a relevant signature on datasets small enough to be printed is unlikely to benefit from multicore parallel scheduling ! Each example will perform a computation with an explicit loop, and then the same computation with parallel_run.
200<title>Wallclock gain</title>
201<programlisting role="example"
202><![CDATA[function r=f(n)
203 if(n == 0)
204 r= 1;
205 else
206 r= n-m(f(n-1));
207 end;
208endfunction
209
210function r=m(n)
211 if(n == 0)
212 r= 0;
213 else
214 r= n - f(m(n-1));
215 end;
216endfunction;
217
218n_max=40;
219
220t0=getdate();
221for i=1:n_max
222 r(i)= m(i);
223end;
224etime(getdate(), t0) // output the wallclock time for the explicit loop computation
225
226t0=getdate();
227r= parallel_run(1:n_max,"m");
228etime(getdate(), t0) // output the wallclock time for the parallel_run computation, it should be lower that the previous on multicore architectures.]]></programlisting>
229<title>Plurality of arguments and returned values</title>
230 It is of course possible to have more than one argument and more than one returned value :
231 <programlisting role="example"
232><![CDATA[function [r_min, r_med, r_max]= min_med_max(a, b, c)
233 r_min=min(a,b,c); r_med=median([a,b,c]); r_max=max(a,b,c);
234endfunction
235
236N=10;
237A=rand(1:N);B=rand(1:N);C=rand(1:N);
238
239Min=zeros(N); Med=Min; Max=Min;
240for i =1:N
241 [Min(i), Med(i), Max(i)]= min_med_max(A(i), B(i), C(i));
242end;
243
244[Min,Med,Max]=parallel_run(A,B,C,"min_med_max");// equivalent to the previous loop.]]></programlisting>
245
246
247As we have seen in the Note of &#167;First steps, the best performance is achieved by making use of vector (1xn matrices) operations. With parallel_run, it is also possible to take advantage of those operations by taking vector arguments and returning vector results. When returning a vector, one must use the <literal>dims</literal> so that <literal>parallel_run</literal> knows beforehand the number of returned values to expect.
248<title>Vector arguments and results</title>
249 <programlisting role="example"
250><![CDATA[function r= quantiles(data, ranks)
251 tmp=gsort(data,'g','i');
252 r=tmp(ranks);
253endfunction
254
255N=100;
256data=matrix(rand(1:N*10), N, 10);
257
258R4_6_7=matrix(zeros(1:3*10),3,10);
259for i =1:10
260 R4_6_7(:,i)= quantiles(data(:,i),[4;6;7]);
261end;
262
263R4_6_7=parallel_run(data,[4;6;7],"quantiles", 3);// note the last argument to inform that quantiles returns 3 scalars.]]></programlisting>
264While it is only possible to pass vectors (1&#160;x&#160;n) as columns of argument and/or result matrices, it is easy to reshape any matrix into such vector to circumvent this restriction. The previous example was passing arguments with different numbers of columns. In fact, the second argument to pass to <literal>quantiles</literal> only has one columns, because all the calls to the function must be made with the same ranks. This column is recycled as if the second argument had as much columns as the first, all with the same values.
265<para>
266<emphasis role="bold">Note :</emphasis> In the previous example, the shape of the second argument is of utmost importance for parallel_run ! While it was possible to write <emphasis role="italic">R4_6_7(:,i)= quantiles(data(:,i),[4<emphasis role="bold">,</emphasis>6<emphasis role="bold">,</emphasis>7]);</emphasis> (note the comma) in the explicit loop, calling <emphasis role="italic">parallel_run(data,[4;6;7],"quantiles", 3)</emphasis> would have computed a very different result :
267 <programlisting role="example"
268><![CDATA[// with previous definitions
269-->parallel_run(data,[4;6;7],"quantiles", 3)
270ans =
271
272 0.0000426 0.0000512 0.0000387 0.0000271 0.0000175 0.0000462 0.0000243 0.0000302 0.0000483 0.0000099
273 0.0000799 0.0000681 0.0000516 0.0000435 0.0000576 0.0000645 0.0000700 0.0000478 0.0000604 0.0000252
274 0.0000963 0.0000953 0.0000649 0.0000452 0.0000650 0.0000805 0.0000793 0.0000615 0.0000666 0.0000335
275-->parallel_run(data,[4,6,7],"quantiles", 3)
276 ans =
277
278 0.0000426 0.0000681 0.0000649 0.0000271 0.0000576 0.0000805 0.0000243 0.0000478 0.0000666 0.0000099
279 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.
280 0. 0. 0. 0. 0. 0. 0. 0. 0. 0.]]></programlisting>
281The second call to <literal>parallel_run</literal> has a second argument of 3 columns and 1 row, so each call to <literal>quantiles</literal> only gets 1 scalar as second argument. The first call to <literal>quantiles</literal> gets '4' and returns the 4th value of the first columns of data. This is confirmed by the fact that the returned value (0.0000426) is the same as the first returned by the previous call to <literal>parallel_run</literal> (which returned the 4th, 6th and 7th values). For the second call to <literal>parallel_run</literal>, the two other values of the first result column (here 0. ) are undefined because we stated that <literal>quantiles</literal> would return 3 values (the last argument to <literal>parallel_run</literal> ) while in fact <literal>quantiles</literal> only returned one (because it only got one rank as second argument). The second call to <literal>quantiles</literal> gets '6' and returns the 6th value of the second columns of data. This is confirmed by the fact that the returned value (0.0000681) is the same as the first returned by the previous call to <literal>parallel_run</literal> (which returned the 4th, 6th and 7th values). For the second call to <literal>parallel_run</literal>, the two other values of the second result column (here 0. ) are undefined for the reason we have just seen. The third call to <literal>quantiles</literal> gets '7' and computes the 7th rank. For the next calls, the argument matrix with only three columns has its columns recycled so that <literal>quantiles</literal> gets '4' and then '6' and then '7' and then '4' etc.
282
283</para>
284<title>Handling other data types</title>
285
286 <refsection>
287<title>Handling other argument types</title>
288While it is not possible to pass or return most Scilab types with functions called by <literal>parallel_run</literal>, this does not mean that one cannot interact with any data structure. The easiest is to read from any kind of data type: as the global environment is shared amongst the parallel execution context, one can just pass column numbers instead of columns for instance, and let the macro access the data.
289
290 <refsection>
291<title>Handling a sparse matrix argument</title>
292 The following code sample shows how to access to elements of a sparse matrix, to compute quantiles of those elements.
293
294 <programlisting role="example"
295><![CDATA[N=5; // size of a block
296L=10; // number of blocks
297
298
299data=spzeros(N*L,N*L);
300for k=1:L // init diagonal blocks of sparse matrix with random numbers
301 kk=(k-1)*N+1:k*N;
302 data(kk,kk)=matrix(rand(1:N*N),N,N);
303end
304// function to compute quantiles in blocks from a the data sparse matrix
305function r= quantiles_sparse(indices_i, indices_j, ranks)
306 tmp=gsort(full(data(indices_i, indices_j)),'g','i');
307 r=tmp(ranks);
308endfunction
309// compute quantiles of diagonal blocks
310// with explicit loop
311R3_6_9=matrix(zeros(1:3*L),3,L);
312for k=1:L
313 kk=(k-1)*N+1:k*N;
314 R3_6_9(:,k)=quantiles_sparse(kk,kk, [3,6,9]);
315end;
316// compute quantiles of diagonal blocks
317// with parallel_run
318idx=matrix(1:(L*N), N,L);
319R3_6_9=parallel_run(idx,idx,[3;6;9],"quantiles_sparse",3);]]></programlisting>
320</refsection>
321 <refsection>
322<title>Handling a matrix of strings argument</title>
323 The following code sample shows how to access to elements of a matrix of strings, to compute the number of digits in those strings..
324
325 <programlisting role="example"
326><![CDATA[a=["a1";"b2b";"1cc2c";"4d555"]
327
328function result=count_digits(str)
329 result=sum(isdigit(str));
330endfunction
331
332for i=1:size(a,'r')
333 nb_digits(:,i)=count_digits(a(i));
334end;
335
336function result=count_digits_i(index) // we must define another function taking an index argument
337 result=sum(isdigit(a(index))); // and accessing the string from the variable in outer scope
338endfunction
339
340nb_digits= parallel_run(1:size(a,'r'),"count_digits_i");]]></programlisting>
341</refsection>
342</refsection>
343
344 </refsection>
345 <refsection>
346<title>Handling other result types</title>
347Other result types are much harder to handle and should be avoid if at all possible. It would be useless to write to variables from outer scope because each execution environment has its own copy of the memory space. The only solution is to find a mapping to a vector of scalars and channel the result data through it.
348
349 <refsection>
350<title>Handling a sparse matrix argument and result type</title>
351 The following code sample shows how to access to elements of a sparse matrix, to compute the invert of a block diagonal sparse matrix, and return the result in a sparse matrix.
352
353 <programlisting role="example"
354><![CDATA[N=5; // size of a block
355L=10; // number of blocks
356
357
358data=spzeros(N*L,N*L);
359for k=1:L// init sparse matrix with random diagonal blocks
360 kk=(k-1)*N+1:k*N;
361 data(kk,kk)=matrix(rand(1:N*N),N,N);
362end
363
364// invert the diagonal blocks of the sparse matrix
365// with explicit loop
366r=data;
367for k=1:L
368 kk=(k-1)*N+1:k*N;
369 r(kk,kk)=inv(data(kk,kk));
370end;
371
372// function to compute the invert of a block from the sparse matrix
373// it cannot take a sparse matrix argument so it must take the block number (k)
374// a retrieve the block from the variable data in outer scope
375// it also cannot put the result directly in a sparse matrix result
376// so we return the full matrix of the inverted block
377function r= invert_one_block(block_size,k)
378 kk=(k-1)*block_size+1:k*block_size;
379 r=full(inv(data(kk,kk)));// data from global scope
380endfunction;
381
382// function to make a sparse matrix and fill it with the full results
383// from parallel_run
384function r=to_sparse(full_diag,block_size) // full_diag is L * block_size^2
385s=size(full_diag);
386nb_blocks=s(2);
387r=data;//data from global scope
388for k=1:s(2)
389 kk=(k-1)*block_size+1:k*block_size;
390 r(kk,kk)= matrix(full_diag(1:s(1),k),block_size,block_size);
391end
392endfunction
393
394// call parallel_run() to operate on blocks of the sparse matrix
395// and to_sparse() to build the sparse result
396r=to_sparse(parallel_run(N,1:L,"invert_one_block",[N,N]),N);]]></programlisting>
397</refsection>
398 <refsection>
399<title>Handling matrices of strings as argument and result type</title>
400 The following uses the workaround seen in <emphasis role="bold">&#167;Handling a matrix of strings argument</emphasis> to access a string matrix argument, and shows how to return strings by using their numeric representation with ascii(), to flip odd characters in strings.
401
402 <programlisting role="example"
403><![CDATA[a=["one a";"b";"c and a word"];
404
405// only works for ASCII
406function p=censor_odds(str)
407odds=(0:((length(str)-1)/2))*2+1;
408p=ascii(str);
409p(odds)= ascii('#');
410p=ascii(p);
411endfunction
412
413
414for i=1:size(a,'r')
415 res(i)=censor_odds(a(i));
416end;
417
418
419function p=censor_odds_i(i,max_len) // pass an index and the max length
420strlen=length(a(i));
421odds=(0:((strlen-1)/2))*2+1;
422p=ascii(a(i)+blanks(max_len-strlen));
423p(odds)= ascii('#');
424endfunction
425
426function v=censor_v(codes)
427for i=1:size(codes,'r')
428 v(i)=ascii(codes(i,:));
429end;
430endfunction
431
432len=max(length(a));
433res=ascii_v(parallel_run(1:size(a,'r'), len, "censor_odds_i",len)');]]></programlisting>
434</refsection>
435</refsection>
436
437 </refsection>
438<refsection>
439 <title>Advanced Usage : Compiled Foreign Functions</title>
440When aiming at maximum performance, it sometimes makes sense to rewrite a few lines of Scilab code in a compiled language such as C++, C or Fortran.
441 <link linkend="ilib_for_link">ilib_for_link</link> allows to do it easily from Scilab, and <literal>parallel_run</literal> allows you to run your compiled code on your multicore architecture. Moreover, as it is possible to make compiled code thread-safe, it is also possible to launch compiled foreign function in lightweight (with less scheduling overhead) shared memory workers (threads), as will be seen in REF Parameters.
442
443<refsection>
444 <title>Compiled Foreign Functions API</title>
445The restrictions imposed on the data types handled by <literal>parallel_run</literal>() allows to use a simpler API :
446 <programlisting role="example"><![CDATA[void f(void const* const* args, void *const* res)]]></programlisting>
447Both arguments refer to data of opaque type <literal>(void*)</literal> and the implementation has to know which kind of data it receives and cast the pointers accordingly.
448(Note that current implementation only supports double data, but integer types will soon be available.)
449
450<para> <emphasis role="bold">void const* const* args </emphasis> is a pointer to an array of the data of each argument Ai. If there is only one argument, then only args[0] is valid and contains the pointer to its data. Each argument i can be a vector (it is a column of the Scilab matrix argument) and args[i-1] contains the pointer to its data. If argument i is a scalar (Scilab matrix Ai has only one row), only args[i][0] is valid and contains the value. Note : the data referenced by **args is declared const because it refers to arguments of the function. However, the data is currently copied from from underlying Scilab variables before being passed to the function, so it can safely be overwritten by casting away the constness(but conversely cannot be used as in/out parameters). If k arguments are provided to parallel_run, the args[0]...args[k-1] will always be valid for each call, even if some arguments had less columns than others : parallel_run will handle the "recycling" shown in <emphasis role="bold">&#167;Description</emphasis>.
451</para>
452<para> <emphasis role="bold">void *const* res</emphasis> is a pointer to an array of the data of each result Ri. If there is only one argument, then only res[0] is valid and contains the pointer to its data. Each result i (counted from 0) can be a vector as specified by the dims argument and res[i] contains the pointer to its data. If res i is a scalar (default when no dims argument is used), only res[i][0] is valid and available to store the value.
453</para>
454</refsection>
455
456<refsection>
457 <title>Examples</title>
458The following examples are the compiled foreign function rewrite of those from the previous section. However, we will not handle other data types because accessing those data structures from compiled code would be outside the scope of this document. Furthermore, when speed is of essence (as usual when one goes to the length of rewriting some Scilab code into a compiled language) one should strive to stick to dense matrices.
459<refsection>
460
461<title>First steps </title>
462 <para>The most simple application of parallel_run is to</para>
463
464 <programlisting role="example"><![CDATA[function make_compiled_function(name, ext, code)
465 filename=name+ext;
466 mputl(code, filename);
467 ilib_for_link(fun_name,filename,[],"c");
468 exec loader.sce;
469 mdelete(filename);
470endfunction
471
472fun_name='test_fun';
473c_prog=['#include <math.h>'
474'void '+fun_name+'(void const* const* args, void *const* res) {'
475'*((double*)*res)= (((double*)args[0])[0])*(((double*)args[0])[0]);'
476'}'];
477make_compiled_function(fun_name, '.c',c_prog);
478
479res=parallel_run(1:10, fun_name);// res = [1., 4., 9., 16., 25., 36., 49., 64., 81., 100.]; ]]></programlisting>
480<title>Wallclock gain</title>
481In order to illustrate the parallelization gains, the next example includes an explicit loop calling a foreign c function with call.
482The remaining examples will only include the parallel_run version, as their purpose was already illustrated in the previous section.
483<programlisting role="example"
484><![CDATA[function make_compiled_function(name, ext, code)
485 filename=name+ext;
486 mputl(code, filename);
487 ilib_for_link(name,filename,[],"c");
488 exec loader.sce;
489 mdelete(filename);
490endfunction
491
492fun_name='male';
493c_prog=['static int m(int);'
494'static int f(int n) { return n ? (n-m(f(n-1))) : 1 ; }'
495'static int m(int n) { return n ? (n-f(m(n-1))) : 0 ; }'
496'void '+fun_name+'(double* res, double* n) '
497'{ *res= (double)m((int)*n);}'];
498
499make_compiled_function(fun_name, '.c',c_prog);
500
501t0=getdate();for i=1:200
502 res_c(i)=call(fun_name, i,2,"d","out", [1,1],1,"d");
503end;etime(getdate(), t0) // note that we ran the computation until m(200) !
504
505fun_name='male_p';
506// same implementation, only change is the API
507c_prog(4:5)=['void '+fun_name+'(void const* const* args, void *const* res) '
508'{ *((double*)*res)= (double)m((int)((double*)args[0])[0]); }'];
509make_compiled_function(fun_name, '.c',c_prog);
510t0=getdate();res=parallel_run(1:200, fun_name);etime(getdate(), t0)// execution time is shorter on multicore]]></programlisting>
511<title>Plurality of arguments and returned values</title>
512 It is of course possible to have more than one argument, and more than one returned value :
513 <programlisting role="example"
514><![CDATA[N=10;
515A=rand(1:N);B=rand(1:N);C=rand(1:N);
516
517
518f1=['#include <algorithm>',
519'extern ""C""{',
520' void min_med_max_cxx(void const*const* args, void*const* res){',
521' double a(((double const*const*)args)[0][0]),b(((double const*const*)args)[1][0]),c(((double const*const*)args)[2][0]);',
522' if(b<a){ std::swap(a,b);}',
523' if(c<a){ std::swap(a,c);}',
524' if(c<b){ std::swap(b,c);}',
525' ((double*const*)res)[0][0]=a; ((double*const*)res)[1][0]=b; ((double*const*)res)[2][0]= c;',
526' return;',
527' }',
528'}'];
529
530mputl(f1,'min_med_max_cxx.cxx');
531ilib_for_link('min_med_max_cxx','min_med_max_cxx.cxx',[],"c")
532exec loader.sce
533
534
535[Min,Med,Max]=parallel_run(A,B,C, "min_med_max_cxx")]]></programlisting>
536
537
538<title>Vector arguments and results</title>
539 <programlisting role="example"
540><![CDATA[f1=['#include<algorithm>',
541'extern ""C""{',
542' void quantiles_cxx(void const*const* args, void*const* res){',
543' double * data(((double *const*)args)[0]);',
544' int data_size(static_cast<int>(((double const*const*)args)[1][0]));',
545' double const* ranks(((double *const*)args)[2]);',
546' int ranks_size(static_cast<int>(((double *const*)args)[3][0]));',
547' std::sort(data,data+data_size);',
548' for(int i(0); i != ranks_size; ++i)',
549' { ((double*const*)res)[0][i]= data[static_cast<int>(ranks[i])-1]; }',
550' return;',
551' }',
552'}'];
553mputl(f1,'quantiles_cxx.cxx');
554ilib_for_link('quantiles_cxx','quantiles_cxx.cxx',[],"c")
555exec loader.sce
556N=10;
557data=matrix(rand(1:N*N),N,N);
558
559R4_6_7=parallel_run(data',N,[4;6;7],3,"quantiles_cxx", 3);// note the last argument to inform that quantiles returns 3 scalars.]]></programlisting>
560
561
562 </refsection>
563
564 </refsection>
565 </refsection>
566
567
568<refsection>
569<title>Tuning the Parallelization with Configuration Parameters</title>
570
571As we have seen in the calling sequence, it is possible to add a configuration parameter as a last argument to parallel_run. This argument is handled by the <literal>params</literal> module and created with<link linkend="init_param">init_param</link>() (further informations on how to handle parameters can be found in the help pages of <link linkend="add_param">add_param</link>, <link linkend="set_param">set_param</link> and <link linkend="remove_param">remove_param</link>).
572
573<refsection>
574<title>Number of workers </title>
575The number of computing resources used in parallel can be set by the parameter <literal>nb_workers</literal>. The default value (0) uses as many workers as there are cores available.
576</refsection>
577<refsection>
578<title>Shared (threads) or separate (process) memory </title>
579While threads are the most efficient (lightweight) parallelization model, current Scilab implementation does not allow threadsafe code, so threads can only be used for foreign function (which must be threadsafe!) and processes are used for Scilab macros. The behavior is controlled par the <literal>shared_memory</literal> parameter which is a numeric value used as a boolean : threads are used if <literal>shared_memory</literal> is not 0 and <literal>f</literal> is a foreign function. This default value (0) implies separate memory (processes).
580</refsection>
581<refsection>
582<title>Dynamic scheduling </title>
583The number of function calls assigned to each worker can either be static (each worker gets the same number of function calls to do) or dynamic. In the latter case, function calls are assigned to workers when they are available. The behavior is controlled par the <literal>dynamic_scheduling</literal> parameter which is a numeric value used as a boolean : dynamic scheduling is used if <literal>dynamic_scheduling</literal> is not 0. This default value (1) implies dynamic scheduling. Static scheduling is more efficient when there are many calls to the function <literal>f</literal> and they will all take the same amount of time, while dynamic scheduling should be preferred when the amount a time for each call can varies a lot.
584</refsection>
585<refsection>
586<title>Chunk size </title>
587In order to reduce dynamic scheduling overhead, the n function calls are dispatched in chunks. The chunk size can be set by the parameter <literal>chunk_size</literal>. The default value (0) uses chunks of size 1. For static scheduling, there is virtually no scheduling overhead and the difference between the minimum and maximum number of function calls performed by the workers is at most 1.
588</refsection>
589<refsection>
590<title>Prologue and Epilogue </title>
591When using separate memory, it is not uncommon to perform process-specific initialization and finalization. For example, when making Monte Carlo simulations, one must insure that each process uses different random number generator initial state, otherwise all the processes would perform the same pseudo-random sequences in parallel ! The <literal>prologue</literal> (resp. <literal>epilogue</literal>) parameter is a string value either empty ("" default) or containing the name of a macro taking one scalar argument to be run upon starting (resp. ending) a new process (separate memory worker, see above). Each process is given a unique scalar passed as argument to both prologue and epilogue macros.
592<programlisting role="example"><![CDATA[function init_rand(n)
593 rand('seed',n);
594endfunction;
595
596function res= rand_macro(nb)
597 res= rand(1, nb);
598endfunction
599nb= 5;
600// We use a configuration parameter to force nb_workers = 2 even on monocore
601res= parallel_run([nb,nb],'rand_macro',nb,init_param('nb_workers', 2));// without seeding the 2 workers have the same rng state.
602
603res= parallel_run([nb,nb],'rand_macro',nb,init_param('nb_workers', 2,'prologue','init_rand'));// when setting the seed, they should have different random numbers ]]></programlisting>
604</refsection>
605
606
607</refsection>
608
609
610 <refsection>
611 <title>See Also</title>
612
613 <simplelist type="inline">
614 <member><link linkend="typeof">typeof</link></member>
615
616 <member><link linkend="ilib_for_link">ilib_for_link</link></member>
617 <member><link linkend="init_param">init_param</link></member>
618 <member><link linkend="call">call</link></member>
619 </simplelist>
620 </refsection>
621</refentry> \ No newline at end of file
diff --git a/scilab/modules/parallel/help/fr_FR/addchapter.sce b/scilab/modules/parallel/help/fr_FR/addchapter.sce
new file mode 100644
index 0000000..f23a242
--- /dev/null
+++ b/scilab/modules/parallel/help/fr_FR/addchapter.sce
@@ -0,0 +1,11 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2010 - DIGITEO - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10add_help_chapter("Parallel", SCI + "/modules/parallel/help/en_US", %T);
11
diff --git a/scilab/modules/parallel/help/pt_BR/addchapter.sce b/scilab/modules/parallel/help/pt_BR/addchapter.sce
new file mode 100644
index 0000000..1eee166
--- /dev/null
+++ b/scilab/modules/parallel/help/pt_BR/addchapter.sce
@@ -0,0 +1,11 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2010 - DIGITEO - Allan CORNET
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10add_help_chapter("Parallel", SCI + "/modules/parallel/help/pt_BR", %T);
11
diff --git a/scilab/modules/parallel/includes/dynlib_parallel.h b/scilab/modules/parallel/includes/dynlib_parallel.h
new file mode 100644
index 0000000..674d222
--- /dev/null
+++ b/scilab/modules/parallel/includes/dynlib_parallel.h
@@ -0,0 +1,28 @@
1/*
2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3* Copyright (C) DIGITEO - 2010 - Allan CORNET
4*
5* This file must be used under the terms of the CeCILL.
6* This source file is licensed as described in the file COPYING, which
7* you should have received as part of this distribution. The terms
8* are also available at
9* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10*
11*/
12
13/*--------------------------------------------------------------------------*/
14#ifndef __DYNLIB_PARALLEL_H__
15#define __DYNLIB_PARALLEL_H__
16
17#ifdef _MSC_VER
18#ifdef PARALLEL_EXPORTS
19#define PARALLEL_IMPEXP __declspec(dllexport)
20#else
21#define PARALLEL_IMPEXP __declspec(dllimport)
22#endif
23#else
24#define PARALLEL_IMPEXP
25#endif
26
27#endif /* __DYNLIB_PARALLEL_H__ */
28/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/parallel/includes/gw_parallel.h b/scilab/modules/parallel/includes/gw_parallel.h
new file mode 100644
index 0000000..6aa5190
--- /dev/null
+++ b/scilab/modules/parallel/includes/gw_parallel.h
@@ -0,0 +1,22 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - DIGITEO - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12#ifndef __GW_PARALLEL_H__
13#define __GW_PARALLEL_H__
14/*--------------------------------------------------------------------------*/
15#include "dynlib_parallel.h"
16/*--------------------------------------------------------------------------*/
17PARALLEL_IMPEXP int gw_parallel(void);
18/*--------------------------------------------------------------------------*/
19int sci_parallel_run(char *fname,unsigned long fname_len);
20/*--------------------------------------------------------------------------*/
21#endif /* __GW_PARALLEL_H__ */
22/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/parallel/license.txt b/scilab/modules/parallel/license.txt
new file mode 100644
index 0000000..46ae42e
--- /dev/null
+++ b/scilab/modules/parallel/license.txt
@@ -0,0 +1,9 @@