cleanup

Author: pdobbelaere

psiflow/hamiltonians.py

@@ -369,7 +369,7 @@ def get_app(self) -> Callable:
         # execution-side parameters of function are not included in self.parameters()
         evaluation = psiflow.context().definitions["ModelEvaluation"]
         resources = evaluation.wq_resources(1)
-        resources.pop("gpus")  # do not request GPU
+        resources.pop("gpus", None)  # do not request GPU
         return partial(
             apply_modelevaluation,
             function_cls=DispersionFunction,

psiflow/serialization.py

@@ -13,7 +13,6 @@
 
 
 # TODO: verify which attributes need to be serialized with a _to_serialize key?
-# TODO: what with attribute like 'Callable' (the apps created by various psiflow things?)
 
 
 CLS_KEY = "PSIFLOW_CLS"

psiflow/utils/logging.py

@@ -12,7 +12,7 @@ def setup_logging(file: Path, level=logging.INFO) -> None:
 
     fh = logging.FileHandler(file)
     formatter = logging.Formatter(
-        fmt='%(asctime)s [%(levelname)s] %(name)s \t %(message)s',
+        fmt='%(asctime)s [%(levelname)s] %(name)s - %(message)s',
         datefmt='%Y-%m-%d %H:%M'
     )
     fh.setFormatter(formatter)

psiflow/utils/parse.py

@@ -70,6 +70,6 @@ def get_task_name_id(logfile: str) -> tuple[str, str]:
 def format_env_vars(env_vars: dict) -> str:
     if len(env_vars) == 0:
         return ""
-    return "export" + " ".join([f"{k}={v}" for k, v in env_vars.items()])
+    return "export " + " ".join([f"{k}={v}" for k, v in env_vars.items()])
 
 

tests/test_sampling.py

@@ -414,7 +414,7 @@ def test_walker_serialization(dataset, tmp_path):
         assert len(f.read()) > 0
 
     data = [psiflow.serialize(obj, copy_to=tmp_path) for obj in walkers]
-    new_objects = [psiflow.deserialize(d.result()) for d in data]
+    new_objects = [psiflow.deserialize(d).result() for d in data]
     psiflow.wait()
     for d in data:
         print(d.result())