Fix logging problems that were coming up in tests.

Author: NikoOinonen

ppafm/HighLevel.py

@@ -378,11 +378,10 @@ def loadValenceElectronDict():
     except:
         pass
     if valElDict_ is None:
-        namespace = {}
-        fname_valelec_dict = cpp_utils.PACKAGE_PATH / "defaults" / "valelec_dict.py"
-        exec(open(fname_valelec_dict).read(), namespace)
-        valElDict_ = namespace["valElDict"]
-        logger.debug(f"Valence electrons loaded from default location : {fname_valelec_dict}")
+        from .defaults import valelec_dict
+
+        valElDict_ = valelec_dict.valElDict
+        logger.debug(f"Valence electrons loaded from defaults")
     logger.debug(f" Valence Electron Dict : \n {valElDict_}")
     return valElDict_
 

ppafm/defaults/valelec_dict.py

@@ -29,4 +29,4 @@
     54: 8.0,
 }
 
-logger.debug(f"inside  valelec_dict.py valElDict={valElDict}")
+logger.debug(f"inside valelec_dict.py valElDict={valElDict}")

ppafm/ocl/field.py

@@ -1873,7 +1873,6 @@ def releaseBuffers(self):
         self.cl_atoms.release()
         self.cl_coefs.release()
         self.cl_poss.release()
-        self.cl_FE.release()
 
     def tryReleaseBuffers(self):
         """
@@ -1892,18 +1891,14 @@ def tryReleaseBuffers(self):
             self.cl_poss.release()
         except:
             pass
-        try:
-            self.cl_FE.release()
-        except:
-            pass
 
     def run_evalLorenz(self, poss=None, Eout=None, local_size=(32,)):
         """
         kernel producing lorenzian function around each atom
         """
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -1931,7 +1926,7 @@ def run_evaldisks(self, poss=None, Eout=None, tipRot=None, offset=0.0, local_siz
             self.tipRot = tipRot
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -1966,7 +1961,7 @@ def run_evaldisks_occlusion(self, poss=None, Eout=None, tipRot=None, local_size=
             self.tipRot = tipRot
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -2001,7 +1996,7 @@ def run_evalSpheres(self, poss=None, Eout=None, tipRot=None, local_size=(32,)):
             self.tipRot = tipRot
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -2034,7 +2029,7 @@ def run_evalSphereCaps(self, poss=None, Eout=None, tipRot=None, local_size=(32,)
             self.tipRot = tipRot
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -2069,7 +2064,7 @@ def run_evalQdisks(self, poss=None, Eout=None, tipRot=None, local_size=(32,)):
             self.tipRot = tipRot
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -2272,7 +2267,7 @@ def run_evalCoulomb(self, poss=None, Eout=None, local_size=(32,)):
         """
         if Eout is None:
             Eout = np.zeros(self.prj_dim, dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)
@@ -2308,7 +2303,7 @@ def run_evalHartreeGradient(self, pot, poss=None, Eout=None, h=None, rot=np.eye(
 
         if Eout is None:
             Eout = np.zeros(self.prj_dim[:2], dtype=np.float32)
-            logger.debug(f"FE.shape {Eout.shape} {self.nDim}")
+            logger.debug(f"FE.shape {Eout.shape}")
         if poss is not None:
             logger.debug(f"poss.shape {poss.shape} {self.prj_dim} {poss.nbytes} {poss.dtype}")
             oclu.updateBuffer(poss, self.cl_poss)