Changeset 520 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Timestamp:

Jul 2, 2009 4:51:52 PM (14 years ago)

Author:

srkline

Message:

threading of model

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf

@@ -98 +98 @@
 
 
-// nothing to change here
-//
-//AAO version, uses XOP if available
-// simply calls the original single point calculation with
-// a wave assignment (this will behave nicely if given point ranges)
+// Threaded version
+// Threaded XOP = 2.4 s
+// non-threaded, non-XOP = 46.8 s
+// = x 19.5 speedup !
+//
 Function FCC_ParaCrystal(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
-        
+
+//      Variable t1=StopMSTimer(-2)
+
+
+/////// NO threading /////////
+//#if exists("FCC_ParaCrystalX")
+//      yw = FCC_ParaCrystalX(cw,xw)
+//#else
+//      yw = fFCC_ParaCrystal(cw,xw)
+//#endif
+
+
+///// THREADING ///////
+
+                        
 #if exists("FCC_ParaCrystalX")
-        yw = FCC_ParaCrystalX(cw,xw)
+
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+
+        for(i=0;i<nthreads;i+=1)
+        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,FCC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+
+        variable dummy= ThreadGroupRelease(mt)
 
 //// to return just Z(q), undo the form factor calculation
@@ -115 +143 @@
 //      yw /= SphereForm_FCC(cw[3],cw[4]-cw[5],xw)*latticeScale
 ////    
+
 #else
-        yw = fFCC_ParaCrystal(cw,xw)
+        yw = fFCC_ParaCrystal(cw,xw)                    // Igor code is NOT threaded, for lots of good reasons
 #endif
+
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+
         return(0)
 End
 
+
+
+// nothing to change here
+//
+//AAO version, uses XOP if available
+// simply calls the original single point calculation with
+// a wave assignment (this will behave nicely if given point ranges)
+//
+// Threaded Version
+ThreadSafe Function FCC_ParaCrystal_T(cw,yw,xw,p1,p2) : FitFunc
+        Wave cw,yw,xw
+        Variable p1,p2
+
+//      Variable t1=StopMSTimer(-2)
+
+#if exists("FCC_ParaCrystalX")
+        yw[p1,p2] = FCC_ParaCrystalX(cw,xw)
+#else
+        yw[p1,p2] = fFCC_ParaCrystal(cw,xw)             // shouldn't ever see this...
+#endif
+
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+
+        return(0)
+End
 
 //