Changeset 517

Timestamp:

Mar 9, 2012 3:10:26 PM (12 years ago)

Author:

toby

Message:

make sure that texture is initialized for multiprocessing

Location:

MPbranch

Files:

• GSASIIlattice.py (modified) (4 diffs)
• GSASIIpath.py (modified) (2 diffs)
• GSASIIplot.py (modified) (2 diffs)
• GSASIIstruct.py (modified) (13 diffs)

MPbranch/GSASIIlattice.py

@@ -1019 +1019 @@
     
 def Glnh(Start,SHCoef,psi,gam,SamSym):
+    # Start is not used
     import pytexture as ptx
     RSQPI = 0.5641895835478
     SQ2 = 1.414213562373
-
-    if Start:
-        ptx.pyqlmninit()
-        Start = False
+    InitTexture()
     Fln = np.zeros(len(SHCoef))
     for i,term in enumerate(SHCoef):
@@ -1042 +1040 @@
 
 def Flnh(Start,SHCoef,phi,beta,SGData):
+    # Start is not used
     import pytexture as ptx
     
@@ -1047 +1046 @@
     RSQPI = 0.5641895835478
     SQ2 = 1.414213562373
-
-    if Start:
-        ptx.pyqlmninit()
-        Start = False
+    InitTexture()
     Fln = np.zeros(len(SHCoef))
     for i,term in enumerate(SHCoef):
@@ -1447 +1443 @@
             if H not in hklN:
                 print H,' missing from hkl from GSASII'
-        
-        
-    
+
+TextureInit = False
+def InitTexture():
+    '''A routine to initialize the texture routines only once'''
+    global TextureInit
+    if not TextureInit:
+        import pytexture as ptx
+        ptx.pyqlmninit()
+        TextureInit = True    
 
 if __name__ == '__main__':

MPbranch/GSASIIpath.py

@@ -1 @@
-# determine a binary path for the pyd files based on the host OS and the python version,  
-# path is relative to location of the script that is called as well as this file
-# this must be imported before anything that imports any .pyd/.so file for GSASII
+''' determine a binary path for the pyd files based on the host OS and the python version,
+path is relative to location of the script that is called as well as this file
+this must be imported before anything that imports any .pyd/.so file for GSASII
+
+also determine if GSAS-II is being run interactively'''
+
 import os.path as ospath
 import sys
 import platform
+
+# Find the name of the main routine and if we are running interactively (true if GSASII.py)
+import __main__
+GSAS2interactive = False
+try:
+    if ospath.split(__main__.__file__)[1].lower() == "gsasii.py":
+        GSAS2interactive = True
+except:
+   pass
+
+# define the path to where GSAS-II source files are found from the location of
+# the current file
+path2GSAS2 = ospath.dirname(ospath.realpath(__file__))
+
 bindir = None
 if sys.platform == "win32":
@@ -18 +35 @@
     else:
         bindir = 'binlinux%d.%d' % sys.version_info[0:2]
-for loc in sys.path[0],ospath.split(__file__)[0]:
+for loc in sys.path[0],path2GSAS2:
     if bindir:
         if ospath.exists(ospath.join(loc,bindir)) and ospath.join(loc,bindir) not in sys.path: 

MPbranch/GSASIIplot.py

@@ -1157 +1157 @@
     '''Plot 3D mustrain/size/preferred orientation figure. In this instance data is for a phase
     '''
+    # Start is not used -- fix later
     
     PatternId = G2frame.PatternId
@@ -1162 +1163 @@
     SGData = generalData['SGData']
     SGLaue = SGData['SGLaue']
-    if Start:                   #initialize the spherical harmonics qlmn arrays
-        ptx.pyqlmninit()
-        Start = False
+    G2lat.InitTexture()
     MuStrKeys = G2spc.MustrainNames(SGData)
     cell = generalData['Cell'][1:]

MPbranch/GSASIIstruct.py

@@ -41 +41 @@
     '''
     Controls = {'deriv type':'analytic Hessian','max cyc':3,
-                'max Hprocess':1,
-                'max Rprocess':2,
+                'max Hprocess':2,
+                'max Rprocess':1,
                 'min dM/M':0.0001,'shift factor':1.}
     file = open(GPXfile,'rb')
@@ -2338 +2338 @@
 
 def getPowderProfile(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup):               
-    if (calcControls['max Hprocess'] <= 1 and calcControls['max Rprocess'] > 1:
+    if calcControls['max Hprocess'] <= 1 and calcControls['max Rprocess'] > 1:
         mpPool = mp.Pool()
+        #print 'multiprocess function call'
+    #else:
+        #print 'single thread function call'
     hId = Histogram['hId']
     hfx = ':%d:'%(hId)
@@ -2388 +2391 @@
             calcControls['max Rprocess'] == 1 or
             mp.cpu_count() < 2 or len(refList) <  2 * chunk):
-            print 'single thread function',hId,len(refList)
             res = ComputeReflectionProfile(
                 (0,refList,x,Phase,calcControls,wave,G,g,GB,Vst,
@@ -2396 +2398 @@
             yc[iBeg:iFin] += yct
         else:
-            print 'multiprocess function',hId,len(refList)
             argList = []
             for i in range(0,len(refList),chunk):
@@ -2604 +2605 @@
         
 def getPowderProfileDerv(parmDict,x,varylist,Histogram,Phases,calcControls,pawleyLookup):    
-    if (calcControls['max Hprocess'] <= 1 and calcControls['max Rprocess'] > 1:
+    if calcControls['max Hprocess'] <= 1 and calcControls['max Rprocess'] > 1:
         mpPool = mp.Pool()
+        #print 'mp derivs'
+    #else:
+        #print 'single thread derivs'
     # create a list of dependent variables and set up a dictionary to hold their derivatives
     dependentVars = G2mv.GetDependentVars()
@@ -2667 +2671 @@
             calcControls['max Rprocess'] == 1 or
             mp.cpu_count() < 2 or len(refList) <  2 * chunk):
-            print 'single thread derivs'
             TdepDerivDict, TdMdv, iBegO, iFinO = ComputeReflectionDerivative(
                 (0,refList,x,dependentVars,varylist,dFdvDict,
@@ -2676 +2679 @@
                 depDerivDict[j] += TdepDerivDict[j]
         else:
-            print 'multiprocess derivs'
             argList = []
             for iref in range(0,len(refList),chunk):
@@ -2720 +2722 @@
 
 def ComputePowderHessian(args):
+    G2lat.InitTexture()     #initialize fortran arrays for spherical harmonics
     Histogram,parmdict,varylist,Phases,calcControls,pawleyLookup = args
     hId = Histogram['hId']
@@ -2797 +2800 @@
 
 def ComputePowderProfile(args):
+    G2lat.InitTexture()     #initialize fortran arrays for spherical harmonics
     Histogram,parmdict,varylist,Phases,calcControls,pawleyLookup,histkey = args
     hId = Histogram['hId']
@@ -2874 +2878 @@
                 )
     if MaxProcess > 1: 
-        mpPool = mp.Pool()
+        mpPool = mp.Pool(1)
         for (xB,xF,ycSect,ybSect,RL,histkey
              ) in mpPool.imap_unordered(ComputePowderProfile,argList):
@@ -2887 +2891 @@
             Histogram['sumwYo'] = np.sum(w[xB:xF]*y[xB:xF]**2)
             sumwYo += Histogram['sumwYo']
-            
             yc[xB:xF] = ycSect
             yb[xB:xF] = ybSect
@@ -2934 +2937 @@
                     
 def Refine(GPXfile,dlg):
-    import pytexture as ptx
-    ptx.pyqlmninit()            #initialize fortran arrays for spherical harmonics
-    
+    G2lat.InitTexture()     #initialize fortran arrays for spherical harmonics
     ShowBanner()
     varyList = []
@@ -3080 +3081 @@
 
 def SeqRefine(GPXfile,dlg):
-    import pytexture as ptx
-    ptx.pyqlmninit()            #initialize fortran arrays for spherical harmonics
-    
+    G2lat.InitTexture()     #initialize fortran arrays for spherical harmonics
     ShowBanner()
     print ' Sequential Refinement'