Merge remote-tracking branch 'origin/MPI' 09/12509/1
Antoine ELIAS [Thu, 12 Sep 2013 08:38:38 +0000 (10:38 +0200)]
Change-Id: Ie77d1bd5c75429bdff854392fb5965c421db4f68

1  2 
scilab/Scilab.sln
scilab/modules/mpi/mpi.vcxproj

@@@ -1598,6 -1600,14 +1600,10 @@@ Globa
                {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32
                {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64
                {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64
+               {5E726409-247A-464A-A994-6E6A7A02A981}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {5E726409-247A-464A-A994-6E6A7A02A981}.Debug|Win32.Build.0 = Debug|Win32
+               {5E726409-247A-464A-A994-6E6A7A02A981}.Debug|x64.ActiveCfg = Debug|x64
 -              {5E726409-247A-464A-A994-6E6A7A02A981}.Debug|x64.Build.0 = Debug|x64
+               {5E726409-247A-464A-A994-6E6A7A02A981}.Release|Win32.ActiveCfg = Release|Win32
 -              {5E726409-247A-464A-A994-6E6A7A02A981}.Release|Win32.Build.0 = Release|Win32
+               {5E726409-247A-464A-A994-6E6A7A02A981}.Release|x64.ActiveCfg = Release|x64
 -              {5E726409-247A-464A-A994-6E6A7A02A981}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 0000000,14ef17e..f30e0ce
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,231 +1,231 @@@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   <ItemGroup Label="ProjectConfigurations">
+     <ProjectConfiguration Include="Debug|Win32">
+       <Configuration>Debug</Configuration>
+       <Platform>Win32</Platform>
+     </ProjectConfiguration>
+     <ProjectConfiguration Include="Debug|x64">
+       <Configuration>Debug</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|Win32">
+       <Configuration>Release</Configuration>
+       <Platform>Win32</Platform>
+     </ProjectConfiguration>
+     <ProjectConfiguration Include="Release|x64">
+       <Configuration>Release</Configuration>
+       <Platform>x64</Platform>
+     </ProjectConfiguration>
+   </ItemGroup>
+   <PropertyGroup Label="Globals">
+     <ProjectGuid>{5E726409-247A-464A-A994-6E6A7A02A981}</ProjectGuid>
+     <RootNamespace>time</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+     <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <CharacterSet>MultiByte</CharacterSet>
+     <WholeProgramOptimization>false</WholeProgramOptimization>
+     <PlatformToolset>v110</PlatformToolset>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+     <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <CharacterSet>MultiByte</CharacterSet>
+     <PlatformToolset>v110</PlatformToolset>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+     <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <CharacterSet>MultiByte</CharacterSet>
+     <WholeProgramOptimization>false</WholeProgramOptimization>
+     <PlatformToolset>v110</PlatformToolset>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+     <ConfigurationType>DynamicLibrary</ConfigurationType>
+     <CharacterSet>MultiByte</CharacterSet>
+     <PlatformToolset>v110</PlatformToolset>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+   <ImportGroup Label="ExtensionSettings">
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+   </ImportGroup>
+   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+   </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup>
+     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
+     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
+     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
+     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
+     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+   </PropertyGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <ClCompile>
+       <Optimization>Disabled</Optimization>
+       <AdditionalIncludeDirectories>../../libs/openmpi/include;includes;src/c;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl</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>
+     <PreLinkEvent>
+     </PreLinkEvent>
+     <Link>
+       <AdditionalDependencies>
+       </AdditionalDependencies>
+       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+       <ModuleDefinitionFile>
+       </ModuleDefinitionFile>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+       <SubSystem>Windows</SubSystem>
+       <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+       <TargetMachine>MachineX86</TargetMachine>
+       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+     <Midl>
+       <TargetEnvironment>X64</TargetEnvironment>
+     </Midl>
+     <ClCompile>
+       <Optimization>Disabled</Optimization>
+       <AdditionalIncludeDirectories>../../libs/openmpi/include;includes;src/c;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl</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>
+     <Link>
+       <AdditionalDependencies>
+       </AdditionalDependencies>
+       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+       <ModuleDefinitionFile>
+       </ModuleDefinitionFile>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+       <SubSystem>Windows</SubSystem>
+       <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+       <TargetMachine>MachineX64</TargetMachine>
+       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <ClCompile>
+       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+       <WholeProgramOptimization>false</WholeProgramOptimization>
+       <AdditionalIncludeDirectories>../../libs/openmpi/include;includes;src/c;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;MPI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <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>
+       <FunctionLevelLinking>true</FunctionLevelLinking>
+       <WarningLevel>Level3</WarningLevel>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+     </ClCompile>
+     <Link>
+       <AdditionalDependencies>
+       </AdditionalDependencies>
+       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+       <ModuleDefinitionFile>
+       </ModuleDefinitionFile>
+       <GenerateDebugInformation>false</GenerateDebugInformation>
+       <SubSystem>Windows</SubSystem>
+       <OptimizeReferences>true</OptimizeReferences>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+       <TargetMachine>MachineX86</TargetMachine>
+       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+     <Midl>
+       <TargetEnvironment>X64</TargetEnvironment>
+     </Midl>
+     <ClCompile>
+       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+       <WholeProgramOptimization>false</WholeProgramOptimization>
+       <AdditionalIncludeDirectories>../../libs/openmpi/include;includes;src/c;../api_scilab/includes;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl</AdditionalIncludeDirectories>
 -      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;MPI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <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>
+       <FunctionLevelLinking>true</FunctionLevelLinking>
+       <WarningLevel>Level3</WarningLevel>
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+     </ClCompile>
+     <Link>
+       <AdditionalDependencies>
+       </AdditionalDependencies>
+       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+       <ModuleDefinitionFile>
+       </ModuleDefinitionFile>
+       <GenerateDebugInformation>false</GenerateDebugInformation>
+       <SubSystem>Windows</SubSystem>
+       <OptimizeReferences>true</OptimizeReferences>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+       <TargetMachine>MachineX64</TargetMachine>
+       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemGroup>
+     <ClInclude Include="includes\dynlib_mpi.h" />
+     <ClInclude Include="includes\gw_mpi.h" />
+     <ClInclude Include="src\c\deserialization.h" />
+     <ClInclude Include="src\c\sci_mpi.h" />
+     <ClInclude Include="src\c\serialization.h" />
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="sci_gateway\c\gw_mpi.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_bcast.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_comm_rank.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_comm_size.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_finalize.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_get_processor_name.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_init.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_irecv.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_isend.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_recv.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_send.c" />
+     <ClCompile Include="sci_gateway\c\sci_mpi_wait.c" />
+     <ClCompile Include="src\c\deserialization.c" />
+     <ClCompile Include="src\c\DllmainMpi.c" />
+     <ClCompile Include="src\c\serialization.c" />
+   </ItemGroup>
+   <ItemGroup>
+     <ResourceCompile Include="src\c\mpi.rc" />
+   </ItemGroup>
+   <ItemGroup>
+     <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
+       <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
+     </ProjectReference>
+     <ProjectReference Include="..\core\src\c\core.vcxproj">
+       <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+     </ProjectReference>
+     <ProjectReference Include="..\output_stream\src\c\output_stream.vcxproj">
+       <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+     </ProjectReference>
+   </ItemGroup>
+   <ItemGroup>
+   </ItemGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+   <ImportGroup Label="ExtensionTargets">
+   </ImportGroup>
+ </Project>