Merge branch 'develop' of https://github.com/abinit/abipy into develop

abinit · Feb 6, 2024 · db55c14 · db55c14
2 parents daa20e4 + 170508a
commit db55c14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/abipy/flowtk/flows.py b/abipy/flowtk/flows.py
@@ -2498,7 +2498,11 @@ def make_tarfile(self, name=None, max_filesize=None, exclude_exts=None, exclude_
         def any2bytes(s):
             """Convert string or number to memory in bytes."""
             if is_string(s):
-                return int(Memory.from_string(s).to("b"))
+                # Support for deprecated pymatgen API
+                try:
+                    mem = int(Memory.from_string(s).to("b"))
+                except:
+                    mem = int(Memory.from_str(s).to("b"))
             else:
                 return int(s)
 

diff --git a/abipy/flowtk/qadapters.py b/abipy/flowtk/qadapters.py
@@ -215,7 +215,11 @@ def __init__(self, **kwargs):
 
         # Convert memory to megabytes.
         m = str(kwargs.pop("mem_per_node"))
-        self.mem_per_node = int(Memory.from_str(m).to("Mb"))
+        # Support for old pymatgen API
+        try:
+            self.mem_per_node = int(Memory.from_string(m).to("Mb"))
+        except:
+            self.mem_per_node = int(Memory.from_str(m).to("Mb"))
 
         if self.mem_per_node <= 0 or self.sockets_per_node <= 0 or self.cores_per_socket <= 0:
             raise ValueError("invalid parameters: %s" % kwargs)