[mpich2-commits] r5392 - in mpich2/trunk: . src/mpid/ch3/channels/sock
jayesh at mcs.anl.gov
jayesh at mcs.anl.gov
Thu Oct 1 16:46:07 CDT 2009
Author: jayesh
Date: 2009-10-01 16:46:07 -0500 (Thu, 01 Oct 2009)
New Revision: 5392
Modified:
mpich2/trunk/mpich2.sln
mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj
Log:
1) Updating windows proj dependencies for ch3sock channel. This was reqd because we started using proj dependencies for nemesis channel and the proj dependencies are orthogonal to solution configs in VS. (2) Removing mpe_win_thread.c from multithreaded sock channel builds
Modified: mpich2/trunk/mpich2.sln
===================================================================
--- mpich2/trunk/mpich2.sln 2009-10-01 21:42:24 UTC (rev 5391)
+++ mpich2/trunk/mpich2.sln 2009-10-01 21:46:07 UTC (rev 5392)
@@ -2,9 +2,9 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpich2", "mpich2.vcproj", "{0FACD81A-FE33-4845-ACF6-A1D50BD35991}"
ProjectSection(ProjectDependencies) = postProject
+ {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A} = {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A}
+ {3DE857FA-6F20-4214-8D99-811165354D3F} = {3DE857FA-6F20-4214-8D99-811165354D3F}
{10115F75-1A40-4155-BCD4-9521609DFFEC} = {10115F75-1A40-4155-BCD4-9521609DFFEC}
- {3DE857FA-6F20-4214-8D99-811165354D3F} = {3DE857FA-6F20-4214-8D99-811165354D3F}
- {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A} = {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpich2s", "mpich2s.vcproj", "{7FBADF88-70AB-4415-B7DA-248EFA299A86}"
@@ -27,21 +27,24 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpiexec", "src\pm\smpd\mpiexec.vcproj", "{EFAF72A2-7154-410B-9235-460444894A38}"
ProjectSection(ProjectDependencies) = postProject
+ {DFFFA925-D59C-4480-8094-1B7E9D12BC02} = {DFFFA925-D59C-4480-8094-1B7E9D12BC02}
+ {7FBADF88-70AB-4415-B7DA-248EFA299A86} = {7FBADF88-70AB-4415-B7DA-248EFA299A86}
+ {0703FA94-8B8C-49AC-BFCE-91F67B599E51} = {0703FA94-8B8C-49AC-BFCE-91F67B599E51}
{97B727A6-0F41-4E8E-A524-FC0F30D3AC8A} = {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A}
- {0703FA94-8B8C-49AC-BFCE-91F67B599E51} = {0703FA94-8B8C-49AC-BFCE-91F67B599E51}
- {7FBADF88-70AB-4415-B7DA-248EFA299A86} = {7FBADF88-70AB-4415-B7DA-248EFA299A86}
- {DFFFA925-D59C-4480-8094-1B7E9D12BC02} = {DFFFA925-D59C-4480-8094-1B7E9D12BC02}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smpd", "src\pm\smpd\smpd.vcproj", "{73DC517A-212E-4C8C-8B13-D5CA120C7B5C}"
ProjectSection(ProjectDependencies) = postProject
+ {DFFFA925-D59C-4480-8094-1B7E9D12BC02} = {DFFFA925-D59C-4480-8094-1B7E9D12BC02}
+ {7FBADF88-70AB-4415-B7DA-248EFA299A86} = {7FBADF88-70AB-4415-B7DA-248EFA299A86}
+ {0703FA94-8B8C-49AC-BFCE-91F67B599E51} = {0703FA94-8B8C-49AC-BFCE-91F67B599E51}
{97B727A6-0F41-4E8E-A524-FC0F30D3AC8A} = {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A}
- {0703FA94-8B8C-49AC-BFCE-91F67B599E51} = {0703FA94-8B8C-49AC-BFCE-91F67B599E51}
- {7FBADF88-70AB-4415-B7DA-248EFA299A86} = {7FBADF88-70AB-4415-B7DA-248EFA299A86}
- {DFFFA925-D59C-4480-8094-1B7E9D12BC02} = {DFFFA925-D59C-4480-8094-1B7E9D12BC02}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smpd_util", "src\pm\smpd\smpd_util.vcproj", "{0703FA94-8B8C-49AC-BFCE-91F67B599E51}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EAC12E9B-4B5D-4D26-8FAE-2425A48E3804} = {EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmi", "src\pmi\smpd\pmi.vcproj", "{97B727A6-0F41-4E8E-A524-FC0F30D3AC8A}"
ProjectSection(ProjectDependencies) = postProject
@@ -63,8 +66,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpewrap", "src\mpe2\mpewrap.vcproj", "{AA0AAB17-BDC9-45DD-8FF0-01F8D384FB18}"
ProjectSection(ProjectDependencies) = postProject
+ {23709B5A-153D-422B-B006-17CC05552B57} = {23709B5A-153D-422B-B006-17CC05552B57}
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804} = {EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}
- {23709B5A-153D-422B-B006-17CC05552B57} = {23709B5A-153D-422B-B006-17CC05552B57}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wmpiexec", "src\pm\smpd\wmpiexec\wmpiexec.csproj", "{B0365633-1495-4C2C-8FD6-6943F5208D5C}"
@@ -79,9 +82,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ch3nemesis", "src\mpid\ch3\channels\nemesis\ch3nemesis.vcproj", "{10115F75-1A40-4155-BCD4-9521609DFFEC}"
ProjectSection(ProjectDependencies) = postProject
+ {DFFFA925-D59C-4480-8094-1B7E9D12BC02} = {DFFFA925-D59C-4480-8094-1B7E9D12BC02}
+ {3DE857FA-6F20-4214-8D99-811165354D3F} = {3DE857FA-6F20-4214-8D99-811165354D3F}
{97B727A6-0F41-4E8E-A524-FC0F30D3AC8A} = {97B727A6-0F41-4E8E-A524-FC0F30D3AC8A}
- {3DE857FA-6F20-4214-8D99-811165354D3F} = {3DE857FA-6F20-4214-8D99-811165354D3F}
- {DFFFA925-D59C-4480-8094-1B7E9D12BC02} = {DFFFA925-D59C-4480-8094-1B7E9D12BC02}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "executive", "src\util\ex\executive.vcproj", "{ACB7CE11-E708-49CD-9DC5-6022B1BF730B}"
@@ -1744,6 +1747,7 @@
{3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockPRelease|x64.ActiveCfg = Release|Win32
{3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockRelease|Any CPU.ActiveCfg = Release|Win32
{3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockRelease|Mixed Platforms.ActiveCfg = Release|Win32
+ {3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockRelease|Mixed Platforms.Build.0 = Release|Win32
{3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockRelease|Win32.ActiveCfg = Release|Win32
{3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockRelease|Win32.Build.0 = Release|Win32
{3DE857FA-6F20-4214-8D99-811165354D3F}.ch3sockRelease|x64.ActiveCfg = Release|Win32
@@ -3732,6 +3736,7 @@
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisPDebug|x64.ActiveCfg = Debug|Win32
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisPRelease|Any CPU.ActiveCfg = ch3nemesisPRelease|Win32
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisPRelease|Mixed Platforms.ActiveCfg = ch3nemesisPRelease|Win32
+ {EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisPRelease|Mixed Platforms.Build.0 = ch3nemesisPRelease|Win32
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisPRelease|Win32.ActiveCfg = ch3nemesisPRelease|Win32
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisPRelease|x64.ActiveCfg = ch3nemesisPRelease|Win32
{EAC12E9B-4B5D-4D26-8FAE-2425A48E3804}.ch3nemesisRelease|Any CPU.ActiveCfg = Release|Win32
Modified: mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj 2009-10-01 21:42:24 UTC (rev 5391)
+++ mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj 2009-10-01 21:46:07 UTC (rev 5392)
@@ -1316,130 +1316,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\util\thread\mpe_thread_win.c"
- >
- <FileConfiguration
- Name="ch3sockDebug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ch3sockRelease|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ch3sockPRelease|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ch3sockPliteRelease|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="mpich2DebugConfig_1_0_4|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="mpich2ReleaseConfig_1_0_4|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ch3shm_mpich2ReleaseConfig_1_0_4|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="mpich2sshm_mpich2ReleaseConfig_1_0_4|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="mpich2ssm_mpich2ReleaseConfig_1_0_4|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="mt_mpich2ReleaseConfig_1_0_4|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="testrelease|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="mpich2DebugConfig_1_0_5|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="fortDebugConfig_1_0_5|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="fmpe|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ch3nemesisPRelease|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\src\mpid_abort.c"
>
</File>
More information about the mpich2-commits
mailing list