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

Timestamp:

Nov 26, 2008 2:37:41 PM (14 years ago)

Author:

srkline

Message:

Threading is now included in MonteCarlo?, and CylPolyRad?, and BCC, as WaveMetrics? has fixed teh bug in Igor in version 6.10B04

Threading can now be added to all appropriate fit functions, provided we require 6.10 (when it is a release version)

Threading issues with MonteCarlo? appear to be due to NR ran() routines, which are not thread safe. Duplicate function instances (with different names) have been created. This works, but is inelegant.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Files:

• NewModels_2006/Cylinder_PolyRadius_v40.ipf (modified) (1 diff)
• NewModels_2008/BCC_ParaCrystal_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf

@@ -294 +294 @@
 
 ///////NON-THREADED VERSION ///////
-#if exists("Cyl_PolyRadiusX")   
-        yw = Cyl_PolyRadiusX(cw,xw)
+//#if exists("Cyl_PolyRadiusX") 
+//      yw = Cyl_PolyRadiusX(cw,xw)
+//#else
+//      yw = fCyl_PolyRadius(cw,xw)
+//#endif
+
+///// THREADED VERSION NEEDS Igor 6.10B04 or higher to avoid crashes //////     
+#if exists("Cyl_PolyRadiusX")
+
+        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,Cyl_PolyRadius_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)
+        
 #else
-        yw = fCyl_PolyRadius(cw,xw)
+                yw = fCyl_PolyRadius(cw,xw)             //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe
 #endif
-
-/// THREADED VERSION HAS BEEN REMOVED DUE TO CRASHES //////     
-//#if exists("Cyl_PolyRadiusX")
-//
-//      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,Cyl_PolyRadius_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)
-//      
-//#else
-//              yw = fCyl_PolyRadius(cw,xw)             //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe
-//#endif
 
 //      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6

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

@@ -105 +105 @@
         Wave cw,yw,xw
 
-///// NO threading /////////
+/////// NO threading /////////
+//#if exists("BCC_ParaCrystalX")
+//      yw = BCC_ParaCrystalX(cw,xw)
+//#else
+//      yw = fBCC_ParaCrystal(cw,xw)
+//#endif
+
+
+/// THREADING ///////
+
+//      Variable t1=StopMSTimer(-2)
+                
 #if exists("BCC_ParaCrystalX")
-        yw = BCC_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,BCC_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)
+        
 #else
-        yw = fBCC_ParaCrystal(cw,xw)
+                yw = fBCC_ParaCrystal(cw,xw)            //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe
 #endif
 
-
-/// THREADING ///////
-
-////    Variable t1=StopMSTimer(-2)
-//              
-//#if exists("BCC_ParaCrystalX")
-//
-//      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,BCC_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)
-//      
-//#else
-//              yw = fBCC_ParaCrystal(cw,xw)            //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe
-//#endif
-//
-////    Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6