mpi module plugged. 74/15974/5
Cedric Delamarre [Wed, 18 Feb 2015 16:20:55 +0000 (17:20 +0100)]
Change-Id: Ic3e2daeaa95e5892905ef3f45f4fecb47d2d64c7

17 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/modules/functions_manager/includes/dynamic_modules.hxx
scilab/modules/functions_manager/src/cpp/dynamic_modules.cpp
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/mpi/Makefile.am
scilab/modules/mpi/Makefile.in
scilab/modules/mpi/etc/mpi.start
scilab/modules/mpi/includes/gw_mpi.h
scilab/modules/mpi/mpi.vcxproj
scilab/modules/mpi/sci_gateway/c/gw_mpi.c
scilab/modules/mpi/sci_gateway/mpi_gateway.xml
scilab/modules/mpi/src/c/serialization.c
scilab/modules/startup/src/c/initMPI.c
scilab/modules/startup/src/c/initMPI.h
scilab/modules/startup/src/cpp/scilab.cpp
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj

index 2abd0e8..bd674db 100644 (file)
@@ -80,6 +80,7 @@ scilab_bin_CPPFLAGS = \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/core/src/c/ \
     -I$(top_srcdir)/modules/dynamic_link/includes/ \
+    -I$(top_srcdir)/modules/startup/src/c/ \
     $(EIGEN_CPPFLAGS) \
     $(AM_CPPFLAGS)
 
index 585c051..62c4dd9 100644 (file)
@@ -836,7 +836,8 @@ scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/ast/includes/ast/ \
        -I$(top_srcdir)/modules/localization/includes/ \
        -I$(top_srcdir)/modules/core/src/c/ \
        -I$(top_srcdir)/modules/dynamic_link/includes/ \
-       $(EIGEN_CPPFLAGS) $(AM_CPPFLAGS) $(am__append_10)
+       -I$(top_srcdir)/modules/startup/src/c/ $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS) $(am__append_10)
 
 # --no-undefined --relax
 
index 71b7af9..71b429f 100644 (file)
@@ -182,4 +182,10 @@ public :
     static int Load();
 };
 
+class MPIModule : public GenericModule
+{
+public :
+    static int Load();
+};
+
 #endif /* !__DYNAMIC_MODULES_HXX_ */
index 6cf1fc9..4da2e0b 100644 (file)
@@ -573,3 +573,21 @@ int XcosModule::Load()
     return 1;
 }
 
+int MPIModule::Load()
+{
+    wstring wstModuleName = L"mpi";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_1);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, NULL, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
index a3c2d07..5682776 100644 (file)
@@ -347,6 +347,7 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap[L"scicos"] = pair<GW_MOD, GW_MOD>(&ScicosModule::Load, &ScicosModule::Unload);
     m_ModuleMap[L"xcos"] = pair<GW_MOD, GW_MOD>(&XcosModule::Load, &XcosModule::Unload);
     m_ModuleMap[L"fftw"] = pair<GW_MOD, GW_MOD>(&FFTWModule::Load, &FFTWModule::Unload);
+    m_ModuleMap[L"mpi"] = pair<GW_MOD, GW_MOD>(&MPIModule::Load, &MPIModule::Unload);
 
     if (ConfigVariable::getScilabMode() != SCILAB_NWNI)
     {
index 3e37788..03dee23 100644 (file)
@@ -31,14 +31,18 @@ CC = $(OPENMPI_CC)
 libscimpi_la_CFLAGS=  -Iincludes/ \
        -Isrc/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ast \
+       -I$(top_srcdir)/modules/ast/includes/operations \
+       -I$(top_srcdir)/modules/ast/includes/types \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/elementary_functions/includes \
        -DDEBUG
 # libscimpi_la_LDFLAGS = $(LAMPI_LDFLAGS)
 libscimpi_la_LIBADD = $(OPENMPI_LIBS)
 
-# Name of the future library (.la will be replace by .so, .a, etc regarding 
+# Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
 pkglib_LTLIBRARIES = libscimpi.la
 
@@ -54,11 +58,11 @@ modulename=mpi
 libscimpi_la_rootdir = $(mydatadir)
 libscimpi_la_root_DATA = readme.txt
 
-#### mpi : init scripts #### 
+#### mpi : init scripts ####
 libscimpi_la_etcdir = $(mydatadir)/etc
 libscimpi_la_etc_DATA = etc/mpi.quit etc/mpi.start
 
-#### mpi : gateway declaration #### 
+#### mpi : gateway declaration ####
 libscimpi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscimpi_la_sci_gateway_DATA = sci_gateway/mpi_gateway.xml
 
index 8fb3130..9940a58 100644 (file)
@@ -568,15 +568,19 @@ GATEWAY_C_SOURCES = \
 libscimpi_la_CFLAGS = -Iincludes/ \
        -Isrc/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ast \
+       -I$(top_srcdir)/modules/ast/includes/operations \
+       -I$(top_srcdir)/modules/ast/includes/types \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/elementary_functions/includes \
        -DDEBUG
 
 # libscimpi_la_LDFLAGS = $(LAMPI_LDFLAGS)
 libscimpi_la_LIBADD = $(OPENMPI_LIBS)
 
-# Name of the future library (.la will be replace by .so, .a, etc regarding 
+# Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
 pkglib_LTLIBRARIES = libscimpi.la
 
@@ -591,11 +595,11 @@ modulename = mpi
 libscimpi_la_rootdir = $(mydatadir)
 libscimpi_la_root_DATA = readme.txt
 
-#### mpi : init scripts #### 
+#### mpi : init scripts ####
 libscimpi_la_etcdir = $(mydatadir)/etc
 libscimpi_la_etc_DATA = etc/mpi.quit etc/mpi.start
 
-#### mpi : gateway declaration #### 
+#### mpi : gateway declaration ####
 libscimpi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscimpi_la_sci_gateway_DATA = sci_gateway/mpi_gateway.xml
 
index 11c6af4..2399926 100644 (file)
@@ -1,5 +1,5 @@
 // ====================================================================
-// gui module initialisation file 
+// gui module initialisation file
 // CopyrighDIGITEO 2009
 // ====================================================================
 //Load  functions libraries
index 1f14be7..c6a8295 100644 (file)
 #define __GW_MPI__
 
 #include "dynlib_mpi.h"
+#include "c_gateway_prototype.h"
 
-MPI_IMPEXP int gw_mpi(void);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_init);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_finalize);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_comm_size);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_comm_rank);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_recv);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_send);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_get_processor_name);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_bcast);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_irecv);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_isend);
+MPI_IMPEXP C_GATEWAY_PROTOTYPE (sci_mpi_wait);
 
-typedef int (*MPI_Interf) (char *fname, unsigned long l);
-/*--------------------------------------------------------------------------*/
-/* interface for the previous function Table */
-/*--------------------------------------------------------------------------*/
-int sci_mpi_init(char *fname, unsigned long fname_len);
-int sci_mpi_finalize(char *fname, unsigned long fname_len);
-int sci_mpi_comm_size(char *fname, unsigned long fname_len);
-int sci_mpi_comm_rank(char *fname, unsigned long fname_len);
-int sci_mpi_recv(char *fname, unsigned long fname_len);
-int sci_mpi_send(char *fname, unsigned long fname_len);
-int sci_mpi_get_processor_name(char *fname, unsigned long fname_len);
-int sci_mpi_bcast(char *fname, unsigned long fname_len);
-int sci_mpi_irecv(char *fname, unsigned long fname_len);
-int sci_mpi_isend(char *fname, unsigned long fname_len);
-int sci_mpi_wait(char *fname, unsigned long fname_len);
 #endif /*  __GW_MPI__ */
index 6d34927..2f4985c 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast;../ast/includes/types</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;MPI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;OMPI_IMPORTS;OPAL_IMPORTS;ORTE_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast;../ast/includes/types</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;MPI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;OMPI_IMPORTS;OPAL_IMPORTS;ORTE_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast;../ast/includes/types</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;MPI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;OMPI_IMPORTS;OPAL_IMPORTS;ORTE_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../../libs/mpi/include;../../libs/intl;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../elementary_functions/includes;../ast/includes/operations;../ast/includes/ast;../ast/includes/types</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;MPI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;OMPI_IMPORTS;OPAL_IMPORTS;ORTE_IMPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 42a614b..fab2e2e 100644 (file)
 #include "sci_malloc.h"
 #include "callFunctionFromGateway.h"
 /*-----------------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-    {sci_mpi_init, "MPI_Init"},
-    {sci_mpi_finalize, "MPI_Finalize"},
-    {sci_mpi_comm_size, "MPI_Comm_size"},
-    {sci_mpi_comm_rank, "MPI_Comm_rank"},
-    {sci_mpi_recv, "MPI_Recv"},
-    {sci_mpi_send, "MPI_Send"},
-    {sci_mpi_get_processor_name, "MPI_Get_processor_name"},
-    {sci_mpi_bcast, "MPI_Bcast"},
-    {sci_mpi_irecv, "MPI_Irecv"},
-    {sci_mpi_isend, "MPI_Isend"},
-    {sci_mpi_wait, "MPI_Wait"}
-};
+//static gw_generic_table Tab[] =
+//{
+//    {sci_mpi_init, "MPI_Init"},
+//    {sci_mpi_finalize, "MPI_Finalize"},
+//    {sci_mpi_comm_size, "MPI_Comm_size"},
+//    {sci_mpi_comm_rank, "MPI_Comm_rank"},
+//    {sci_mpi_recv, "MPI_Recv"},
+//    {sci_mpi_send, "MPI_Send"},
+//    {sci_mpi_get_processor_name, "MPI_Get_processor_name"},
+//    {sci_mpi_bcast, "MPI_Bcast"},
+//    {sci_mpi_irecv, "MPI_Irecv"},
+//    {sci_mpi_isend, "MPI_Isend"},
+//    {sci_mpi_wait, "MPI_Wait"}
+//};
 /*-----------------------------------------------------------------------------------*/
 int gw_mpi(void)
 {
+    return 0;
 }
 
 /*-----------------------------------------------------------------------------------*/
index 276218a..896dc1e 100644 (file)
@@ -1,36 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="mpi">
-    <!-- =================== -->
-    <!--
+<!DOCTYPE module SYSTEM "../../functions/mpi/gateway.dtd">
+<!--
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2015 - Scilab Enterprises - Cedric DELAMARRE
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
  Scilab
  Interface description. In this file, we define the list of the function which
  will be available into Scilab and the link to the "native" function.
 
- gatewayId is the position in the hashtable 'Interfaces' defined in the
- file SCI/modules/core/src/c/callinterf.h
-
- primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- in the file modules/<module>/sci_gateway/c/gw_<module>.c
-
- primitiveName is the name of the Scilab function
-
- @author Allan CORNET
- @author Sylvestre LEDRU
- @date INRIA 2007
- ===================
  Don't touch if you do not know what you are doing
 -->
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="73" primitiveId="1" primitiveName="MPI_Init"/>
-    <PRIMITIVE gatewayId="73" primitiveId="2" primitiveName="MPI_Finalize"/>
-    <PRIMITIVE gatewayId="73" primitiveId="3" primitiveName="MPI_Comm_size"/>
-    <PRIMITIVE gatewayId="73" primitiveId="4" primitiveName="MPI_Comm_rank"/>
-    <PRIMITIVE gatewayId="73" primitiveId="5" primitiveName="MPI_Recv"/>
-    <PRIMITIVE gatewayId="73" primitiveId="6" primitiveName="MPI_Send"/>
-    <PRIMITIVE gatewayId="73" primitiveId="7" primitiveName="MPI_Get_processor_name"/>
-    <PRIMITIVE gatewayId="73" primitiveId="8" primitiveName="MPI_Bcast"/>
-    <PRIMITIVE gatewayId="73" primitiveId="9" primitiveName="MPI_Irecv"/>
-    <PRIMITIVE gatewayId="73" primitiveId="10" primitiveName="MPI_Isend"/>
-    <PRIMITIVE gatewayId="73" primitiveId="11" primitiveName="MPI_Wait"/>
-</GATEWAY>
+<module name="mpi">
+    <gateway name="sci_mpi_init"                function="MPI_Init"                 type="0" />
+    <gateway name="sci_mpi_finalize"            function="MPI_Finalize"             type="0" />
+    <gateway name="sci_mpi_comm_size"           function="MPI_Comm_size"            type="0" />
+    <gateway name="sci_mpi_comm_rank"           function="MPI_Comm_rank"            type="0" />
+    <gateway name="sci_mpi_recv"                function="MPI_Recv"                 type="0" />
+    <gateway name="sci_mpi_send"                function="MPI_Send"                 type="0" />
+    <gateway name="sci_mpi_get_processor_name"  function="MPI_Get_processor_name"   type="0" />
+    <gateway name="sci_mpi_bcast"               function="MPI_Bcast"                type="0" />
+    <gateway name="sci_mpi_irecv"               function="MPI_Irecv"                type="0" />
+    <gateway name="sci_mpi_isend"               function="MPI_Isend"                type="0" />
+    <gateway name="sci_mpi_wait"                function="MPI_Wait"                 type="0" />
+</module>
index 6318ed7..ce1cfbc 100644 (file)
@@ -431,7 +431,15 @@ static int serialize_sparse(void *_pvCtx, int *_piAddr, int **_piBuffer, int *_p
 
 int serialize_to_mpi(void *_pvCtx, int *_piAddr, int **_piBuffer, int *_piBufferSize)
 {
-    switch (*_piAddr)
+    int iType = 0;
+    SciErr sciErr = getVarType(_pvCtx, _piAddr, &iType);
+    if (sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+        return 0;
+    }
+
+    switch (iType)
     {
         case sci_matrix:
             return serialize_double(_pvCtx, _piAddr, _piBuffer, _piBufferSize);
@@ -455,4 +463,4 @@ int serialize_to_mpi(void *_pvCtx, int *_piAddr, int **_piBuffer, int *_piBuffer
             return -1;
             break;
     }
-}
\ No newline at end of file
+}
index 9383e55..63b5ad4 100644 (file)
@@ -14,6 +14,7 @@
 #include <mpi.h>                        // for MPI_Error_string, MPI_Init, etc
 #include <stddef.h>                     // for NULL
 #include "localization.h"               // for _
+#include "initMPI.h"
 
 MPI_Errhandler errhdl;
 
index 594322f..4d8f07d 100644 (file)
@@ -13,5 +13,9 @@
 /**
  * Initialize the MPI features
  */
+#ifndef __INITMPI__
+#define __INITMPI__
 int initScilabMPI(void);
+#endif // __INITMPI__
+
 
index 0872748..7635ea3 100644 (file)
@@ -43,6 +43,13 @@ extern "C"
 
 #define INTERACTIVE     -1
 
+extern "C"
+{
+#ifdef ENABLE_MPI
+#include "initMPI.h"
+#endif
+}
+
 /*
 ** Usage
 **
@@ -224,6 +231,11 @@ int main(int argc, char *argv[])
 //#endif
 {
     int iRet = 0;
+
+#ifdef ENABLE_MPI
+    initScilabMPI();
+#endif
+
     ScilabEngineInfo* pSEI = InitScilabEngineInfo();
 #ifdef WITHOUT_GUI
     /* Building Scilab-cli-bin. We won't ever had the gui nor the jvm */
index 5d0ac86..0d0ed11 100644 (file)
@@ -79,7 +79,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
     </Midl>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../../libs/Eigen/includes;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>