Changeset 5724

Timestamp:

11/06/09 09:10:56 (2 weeks ago)

Author:

jayesh

Message:

Since disabling thread package is broken, make the thread package available for all builds on windows. Also disabling async progress stuff - added in r5695 - for now on windows

Files:

• mpich2/trunk/winconfigure.wsf (modified) (6 diffs)

mpich2/trunk/winconfigure.wsf

@@ -2975 +2975 @@
                                         fout.WriteLine("#endif")
                                 Case "MPIU_THREAD_PACKAGE_NAME"
-                                        fout.WriteLine("#ifdef MPICH_MULTITHREADED")
                                         fout.WriteLine("#define MPIU_THREAD_PACKAGE_NAME MPIU_THREAD_PACKAGE_WIN")
-                                        fout.WriteLine("#else")
-                                        fout.WriteLine("#define MPIU_THREAD_PACKAGE_NAME MPIU_THREAD_PACKAGE_NONE")
-                                        fout.WriteLine("#endif")
                                 Case "MPIU_THREAD_REFCOUNT"
                                         fout.WriteLine("#define MPIU_THREAD_REFCOUNT MPIU_REFCOUNT_NONE")
@@ -3617 +3613 @@
                                             fout.WriteLine("#define SIZEOF_OPA_PTR_T 4")
                                         End if
+                                Case "USE_ASYNC_PROGRESS"
+                                        fout.WriteLine("/* #undef USE_ASYNC_PROGRESS */")
                                 Case Else
                                         'MsgBox("Unhandled definition <" & define & ">")
@@ -6500 +6498 @@
         CreateRules f.GetFolder("src\util\logging\common"), trimlength
         CreateRules f.GetFolder("src\util\param"), trimlength
+        CreateRules f.GetFolder("src\util\thread"), trimlength
         ' Insert rules for romio manually since romio is not build with Makefile.sm files
         mfile.WriteLine("{..\src\mpi\romio\adio\ad_ntfs}.c{$(OUTDIR)}.obj:")
@@ -6536 +6535 @@
         CreateObjs "mpich2", f.GetFolder("src\util\logging\common"), trimlength, false, false
         CreateObjs "mpich2", f.GetFolder("src\util\param"), trimlength, false, false
+        CreateObjs "mpich2", f.GetFolder("src\util\thread"), trimlength, false, false
         mfile.WriteLine(" \" & vbCrLf & "       $(OUTDIR)\ad_ntfs.obj \")
         mfile.WriteLine("       $(OUTDIR)\ad_ntfs_close.obj \")
@@ -6688 +6688 @@
         CreateRules f.GetFolder("src\mpid\ch3\util\sock"), trimlength
         'CreateRules f.GetFolder("src\util\events"), trimlength
-        mfile.WriteLine("{..\src\util\thread}.c{$(MT_OUTDIR)}.obj:")
-        mfile.WriteLine("    $(cc) $(cflags) /Fo""$(MT_OUTDIR)\\"" /Fd""$(MT_OUTDIR)\\"" $**")
-        mfile.WriteLine
         CreateObjs "ch3mt", f.GetFolder("src\mpid\ch3\channels\sock"), trimlength, true, false
-        CreateObjs "ch3mt", f.GetFolder("src\mpid\ch3\util\sock"), trimlength, false, false
+        CreateObjs "ch3mt", f.GetFolder("src\mpid\ch3\util\sock"), trimlength, false, true
         'CreateObjs "ch3mt", f.GetFolder("src\util\events"), trimlength, false, false
-        mfile.WriteLine(" \" & vbCrLf & "       $(MT_OUTDIR)\mpiu_thread.obj")
 
         mfile.WriteLine
@@ -6704 +6700 @@
 '       CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\utils"), trimlength
         CreateRules f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength
-        mfile.WriteLine("{..\src\util\thread}.c{$(NEMESIS_OUTDIR)}.obj:")
-        mfile.WriteLine("    $(cc) $(cflags) /Fo""$(NEMESIS_OUTDIR)\\"" /Fd""$(NEMESIS_OUTDIR)\\"" $**")
-        mfile.WriteLine
         CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\src"), trimlength, true, false
         CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\src"), trimlength, false, false
 '       CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\utils"), trimlength, false, false
-        CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength, false, false
-        mfile.WriteLine(" \" & vbCrLf & "       $(NEMESIS_OUTDIR)\mpiu_thread.obj")
+        CreateObjs "ch3nemesis", f.GetFolder("src\mpid\ch3\channels\nemesis\nemesis\netmod\wintcp"), trimlength, false, true
 
         mfile.WriteLine