[mpich2-commits] r7818 - in mpich2/trunk: . src/mpid/ch3/channels/nemesis src/mpid/ch3/channels/sock src/mpid/common/sock src/util/dbg

jayesh at mcs.anl.gov jayesh at mcs.anl.gov
Mon Jan 24 14:59:23 CST 2011


Author: jayesh
Date: 2011-01-24 14:59:23 -0600 (Mon, 24 Jan 2011)
New Revision: 7818

Modified:
   mpich2/trunk/mpich2.vcproj
   mpich2/trunk/mpich2s.vcproj
   mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj
   mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj
   mpich2/trunk/src/mpid/common/sock/sock.vcproj
   mpich2/trunk/src/util/dbg/dbg.vcproj
Log:
Update the VS projs to add mpid\common\sched into the include PATH. Also adding assert.c into the build. Also see r7812

Modified: mpich2/trunk/mpich2.vcproj
===================================================================
--- mpich2/trunk/mpich2.vcproj	2011-01-24 18:41:45 UTC (rev 7817)
+++ mpich2/trunk/mpich2.vcproj	2011-01-24 20:59:23 UTC (rev 7818)
@@ -552,7 +552,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
+				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sched;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_WINCONF_H;MPIO_BUILD_PROFILING;HAVE_FORTRAN_BINDING;MPI_EXPORTS;WORDS_LITTLEENDIAN"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -657,7 +657,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
+				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sched;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_WINCONF_H;HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED;USE_LOGGING=MPID_LOGGING_RLOG;MPIO_BUILD_PROFILING;HAVE_FORTRAN_BINDING;MPI_EXPORTS;WORDS_LITTLEENDIAN"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -2266,7 +2266,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
+				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sched;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_WINCONF_H,MPIO_BUILD_PROFILING,HAVE_FORTRAN_BINDING,MPI_EXPORTS,MPICH_MULTITHREADED"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -2372,7 +2372,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
+				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sched;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32,NDEBUG,USE_WINCONF_H,HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED,USE_LOGGING=MPID_LOGGING_RLOG,MPIO_BUILD_PROFILING,HAVE_FORTRAN_BINDING,MPI_EXPORTS,MPICH_MULTITHREADED"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -3895,7 +3895,7 @@
 				Optimization="3"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\mpi\spawn;src\include;src\include\win32;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\ch3\include;src\mpid\common\locks;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32;src\util\wrappers;src\mpid\ch3\channels\nemesis\nemesis\include;src\mpid\ch3\channels\nemesis\include;src\openpa\src;src\openpa\src\win32;src\mpl\include"
+				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\mpi\spawn;src\include;src\include\win32;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\common\sched;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32;src\util\wrappers;src\mpid\ch3\channels\nemesis\nemesis\include;src\mpid\ch3\channels\nemesis\include;src\openpa\src;src\openpa\src\win32;src\mpl\include"
 				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x500;NDEBUG;USE_WINCONF_H;MPIO_BUILD_PROFILING;HAVE_FORTRAN_BINDING;MPI_EXPORTS;WORDS_LITTLEENDIAN;MPICH_MULTITHREADED;ENABLE_NO_MACRO_VARARG_NAME"
 				RuntimeLibrary="0"
 				WarningLevel="0"
@@ -3969,7 +3969,7 @@
 				Optimization="3"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\mpi\spawn;src\include;src\include\win32;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\ch3\include;src\mpid\common\locks;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32;src\util\wrappers;src\openpa\src;src\openpa\src\win32;src\mpl\include;src\mpid\ch3\channels\nemesis\nemesis\include;src\mpid\ch3\channels\nemesis\include"
+				AdditionalIncludeDirectories=""src\mpi\romio\mpi-io";src\mpi\romio\adio\include;src\mpi\spawn;src\include;src\include\win32;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\common\sched;src\mpi\datatype;src\mpi\binding\f90;src\mpi\binding\f90\win32;src\util\wrappers;src\openpa\src;src\openpa\src\win32;src\mpl\include;src\mpid\ch3\channels\nemesis\nemesis\include;src\mpid\ch3\channels\nemesis\include"
 				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x500;NDEBUG;USE_WINCONF_H;MPIO_BUILD_PROFILING;HAVE_FORTRAN_BINDING;MPI_EXPORTS;WORDS_LITTLEENDIAN;MPICH_MULTITHREADED;ENABLE_NO_MACRO_VARARG_NAME;HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED;USE_LOGGING=MPID_LOGGING_RLOG"
 				RuntimeLibrary="0"
 				WarningLevel="0"
@@ -5569,10 +5569,54 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\src\mpi\coll\iallgather.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\iallgatherv.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\iallreduce.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ialltoall.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ialltoallv.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ialltoallw.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ibarrier.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ibcast.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\mpi\pt2pt\ibsend.c"
 				>
 			</File>
 			<File
+				RelativePath=".\src\mpi\coll\iexscan.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\igather.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\igatherv.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\util\info\info_create.c"
 				>
 			</File>
@@ -5981,10 +6025,34 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\mpi\coll\ired_scat.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ired_scat_block.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\ireduce.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\mpi\pt2pt\irsend.c"
 				>
 			</File>
 			<File
+				RelativePath=".\src\mpi\coll\iscan.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\iscatter.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mpi\coll\iscatterv.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\mpi\romio\adio\common\iscontig.c"
 				>
 			</File>
@@ -6065,6 +6133,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\mpid\common\sched\mpid_sched.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\mpid\common\datatype\mpid_segment.c"
 				>
 			</File>
@@ -6157,6 +6229,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\mpi\coll\nbcutil.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\mpi\coll\op_commutative.c"
 				>
 			</File>

Modified: mpich2/trunk/mpich2s.vcproj
===================================================================
--- mpich2/trunk/mpich2s.vcproj	2011-01-24 18:41:45 UTC (rev 7817)
+++ mpich2/trunk/mpich2s.vcproj	2011-01-24 20:59:23 UTC (rev 7818)
@@ -380,7 +380,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;src\mpi\romio\mpi-io&quot;;src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype"
+				AdditionalIncludeDirectories="&quot;src\mpi\romio\mpi-io&quot;;src\mpi\romio\adio\include;src\include;src\include\win32;src\mpl\include;src\mpid\common\datatype;src\mpid\common\sched;src\mpid\common\sock;src\mpid\common\sock\iocp;src\mpid\ch3\include;src\mpid\common\locks;src\mpid\ch3\channels\sock\include;src\mpi\datatype"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WINCONF_H;MPIO_BUILD_PROFILING;HAVE_FORTRAN_BINDING;MPI_EXPORTS;WORDS_LITTLEENDIAN"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj	2011-01-24 18:41:45 UTC (rev 7817)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/ch3nemesis.vcproj	2011-01-24 20:59:23 UTC (rev 7818)
@@ -308,7 +308,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".\include;.\nemesis\include;.\nemesis\netmod\wintcp_module;.\nemesis\utils\monitor;..\..\..\..\util\wrappers;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\..\src\openpa\src\win32;..\..\..\..\..\src\openpa\src;..\..\..\..\..\src\mpl\include;..\..\include;..\..\..\common\datatype;..\..\..\common\locks"
+				AdditionalIncludeDirectories=".\include;.\nemesis\include;.\nemesis\netmod\wintcp_module;.\nemesis\utils\monitor;..\..\..\..\util\wrappers;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\..\src\openpa\src\win32;..\..\..\..\..\src\openpa\src;..\..\..\..\..\src\mpl\include;..\..\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sched"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_WINCONF_H;_WIN32_WINNT=0x0500;ENABLE_NO_MACRO_VARARG_NAME;HAVE_DOUBLEUNDERSCORE_INLINE;MPICH_MULTITHREADED"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
@@ -374,7 +374,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".\include;.\nemesis\include;.\nemesis\netmod\wintcp_module;.\nemesis\utils\monitor;..\..\..\..\util\wrappers;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\..\src\openpa\src\win32;..\..\..\..\..\src\openpa\src;..\..\..\..\..\src\mpl\include;..\..\include;..\..\..\common\datatype;..\..\..\common\locks"
+				AdditionalIncludeDirectories=".\include;.\nemesis\include;.\nemesis\netmod\wintcp_module;.\nemesis\utils\monitor;..\..\..\..\util\wrappers;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\..\src\openpa\src\win32;..\..\..\..\..\src\openpa\src;..\..\..\..\..\src\mpl\include;..\..\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sched"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_WINCONF_H;_WIN32_WINNT=0x0500;ENABLE_NO_MACRO_VARARG_NAME;HAVE_DOUBLEUNDERSCORE_INLINE;MPICH_MULTITHREADED;HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED;USE_LOGGING=MPID_LOGGING_RLOG"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"

Modified: mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj	2011-01-24 18:41:45 UTC (rev 7817)
+++ mpich2/trunk/src/mpid/ch3/channels/sock/ch3sock.vcproj	2011-01-24 20:59:23 UTC (rev 7818)
@@ -108,7 +108,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\mpl\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock"
+				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\mpl\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sched;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_WINCONF_H;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -177,7 +177,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock;..\..\..\..\mpl\include"
+				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sched;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock;..\..\..\..\mpl\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_WINCONF_H,HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED,USE_LOGGING=MPID_LOGGING_RLOG;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -378,7 +378,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\mpl\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock"
+				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\mpl\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sched;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_WINCONF_H,MPICH_MULTITHREADED;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -447,7 +447,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\mpl\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock"
+				AdditionalIncludeDirectories="include;..\..\include;..\..\..\..\include;..\..\..\..\include\win32;..\..\..\..\mpl\include;..\..\..\common\datatype;..\..\..\common\locks;..\..\..\common\sched;..\..\..\common\sock;..\..\..\common\sock\iocp;..\..\..\ch3\util\sock"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_WINCONF_H,HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED,USE_LOGGING=MPID_LOGGING_RLOG,MPICH_MULTITHREADED;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: mpich2/trunk/src/mpid/common/sock/sock.vcproj
===================================================================
--- mpich2/trunk/src/mpid/common/sock/sock.vcproj	2011-01-24 18:41:45 UTC (rev 7817)
+++ mpich2/trunk/src/mpid/common/sock/sock.vcproj	2011-01-24 20:59:23 UTC (rev 7818)
@@ -240,7 +240,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\datatype"
+				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\..\common\sched;..\datatype"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_WINCONF_H;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -309,7 +309,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\datatype"
+				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\common\sched;..\..\ch3\include;..\datatype"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_WINCONF_H,HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED,USE_LOGGING=MPID_LOGGING_RLOG;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -842,7 +842,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\datatype"
+				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\..\common\sched;..\datatype"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_WINCONF_H,MPICH_MULTITHREADED;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -911,7 +911,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\datatype"
+				AdditionalIncludeDirectories=".;iocp;..\..\..\include;..\..\..\include\win32;..\..\..\mpl\include;..\..\ch3\channels\sock\include;..\..\ch3\include;..\..\common\sched;..\datatype"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_WINCONF_H,HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED,USE_LOGGING=MPID_LOGGING_RLOG,MPICH_MULTITHREADED;_WIN32_WINNT=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: mpich2/trunk/src/util/dbg/dbg.vcproj
===================================================================
--- mpich2/trunk/src/util/dbg/dbg.vcproj	2011-01-24 18:41:45 UTC (rev 7817)
+++ mpich2/trunk/src/util/dbg/dbg.vcproj	2011-01-24 20:59:23 UTC (rev 7818)
@@ -439,7 +439,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\include\win32;..\..\mpl\include;..\..\mpid\ch3\include;..\..\mpid\ch3\channels\sock\include;..\..\mpid\common\datatype;..\..\mpid\common\sock;..\..\mpid\common\sock\iocp"
+				AdditionalIncludeDirectories="..\..\include;..\..\include\win32;..\..\mpl\include;..\..\mpid\ch3\include;..\..\mpid\ch3\channels\sock\include;..\..\mpid\common\datatype;..\..\mpid\common\sched;..\..\mpid\common\sock;..\..\mpid\common\sock\iocp"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WINCONF_H"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -1038,7 +1038,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\include\win32;..\..\mpl\include;..\..\mpid\ch3\include;..\..\mpid\ch3\channels\sock\include;..\..\mpid\common\datatype;..\..\mpid\common\sock;..\..\mpid\common\sock\iocp"
+				AdditionalIncludeDirectories="..\..\include;..\..\include\win32;..\..\mpl\include;..\..\mpid\ch3\include;..\..\mpid\ch3\channels\sock\include;..\..\mpid\common\datatype;..\..\mpid\common\sched;..\..\mpid\common\sock;..\..\mpid\common\sock\iocp"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WINCONF_H,MPICH_MULTITHREADED"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -1107,7 +1107,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\include\win32;..\..\mpl\include;..\..\mpid\ch3\include;..\..\mpid\ch3\channels\sock\include;..\..\mpid\common\datatype;..\..\mpid\common\sock;..\..\mpid\common\sock\iocp"
+				AdditionalIncludeDirectories="..\..\include;..\..\include\win32;..\..\mpl\include;..\..\mpid\ch3\include;..\..\mpid\ch3\channels\sock\include;..\..\mpid\common\datatype;..\..\mpid\common\sched;..\..\mpid\common\sock;..\..\mpid\common\sock\iocp"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WINCONF_H,HAVE_TIMING=MPID_TIMING_KIND_LOG_DETAILED,USE_LOGGING=MPID_LOGGING_RLOG,MPICH_MULTITHREADED"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -1882,6 +1882,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\other\assert.c"
+				>
+			</File>
+			<File
 				RelativePath=".\dbg_control.c"
 				>
 			</File>



More information about the mpich2-commits mailing list