Changeset 3093 for trunk/GSASIIstrMath.py

Timestamp:

Sep 20, 2017 5:36:05 PM (5 years ago)

Author:

toby

Message:

fix multiprocessing with constraints

File:

• trunk/GSASIIstrMath.py (modified) (3 diffs)

trunk/GSASIIstrMath.py

@@ -3927 +3927 @@
     # now process derivatives in constraints
     dMdv[:,ma.getmaskarray(x)] = 0.  # instead of masking, zero out masked values
-    G2mv.Dict2Deriv(varylist,depDerivDict,dMdv)
-    return dMdv
+    #G2mv.Dict2Deriv(varylist,depDerivDict,dMdv)
+    return dMdv,depDerivDict
     
 def UserRejectHKL(ref,im,userReject):
@@ -4070 +4070 @@
             xB = np.searchsorted(x,Limits[0])
             xF = np.searchsorted(x,Limits[1])+1
-            dMdvh = np.sqrt(w[xB:xF])*getPowderProfileDervMP([parmDict,x[xB:xF],
+            dMdv,depDerivDict = getPowderProfileDervMP([parmDict,x[xB:xF],
                 varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars])
+            G2mv.Dict2Deriv(varylist,depDerivDict,dMdv)
+            dMdvh = np.sqrt(w[xB:xF])*dMdv
         elif 'HKLF' in histogram[:4]:
             Histogram = Histograms[histogram]
@@ -4134 +4136 @@
                 MPpool = mp.Pool(ncores)
                 dMdvh = None
+                depDerivDict = None
                 profArgs = [
                     (parmDict,x[xB:xF],varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars,
                      i,ncores) for i in range(ncores)]
-                for dmdv in MPpool.imap_unordered(getPowderProfileDervMP,profArgs):
+                for dmdv,depDerivs in MPpool.imap_unordered(getPowderProfileDervMP,profArgs):
                     if dMdvh is None:
                        dMdvh = dmdv
+                       depDerivDict = depDerivs
                     else: 
                        dMdvh += dmdv
+                       for key in depDerivs.keys(): depDerivDict[key] += depDerivs[key]                        
             else:
-                dMdvh = getPowderProfileDervMP([parmDict,x[xB:xF],
+                dMdvh,depDerivDict = getPowderProfileDervMP([parmDict,x[xB:xF],
                     varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars])
                 #dMdvh = getPowderProfileDerv(parmDict,x[xB:xF],
                 #    varylist,Histogram,Phases,rigidbodyDict,calcControls,pawleyLookup,dependentVars)
+            G2mv.Dict2Deriv(varylist,depDerivDict,dMdvh)
             if GSASIIpath.GetConfigValue('debug'): print 'getPowderProfileDerv t=',time.time()-starttime
             Wt = ma.sqrt(W[xB:xF])[nxs,:]