fix GB

hanjinliu · Oct 3, 2023 · 0ba0953 · 0ba0953
1 parent e7b713c
commit 0ba0953
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/impy/arrays/imgarray.py b/impy/arrays/imgarray.py
@@ -249,9 +249,9 @@ def rescale(
         # Check if output is too large.
         gb = -1
         if not scale_is_seq and scale > 1:
-            gb = np.prod(self.shape) * (scale ** len(dims)) / 1e9
+            gb = np.prod(self.shape) * (scale ** len(dims)) / 2**30
         elif scale_is_seq and np.prod(list(scale)) > 1:
-            gb = np.prod(self.shape) * np.prod(list(scale)) / 1e9
+            gb = np.prod(self.shape) * np.prod(list(scale)) / 2**30
         if gb > Const["MAX_GB"]:
             raise MemoryError(f"Output image is too large: {gb} GB")
 

diff --git a/impy/arrays/lazy.py b/impy/arrays/lazy.py
@@ -119,7 +119,7 @@ def chunksize(self) -> AxesTuple[int]:
     @property
     def GB(self) -> float:
         """Return the array size in GB."""
-        return self.value.nbytes / 1e9
+        return self.value.nbytes / 2**30
 
     gb = GB  # alias
 

diff --git a/impy/core.py b/impy/core.py
@@ -552,7 +552,7 @@ def imread(
 
     # read tif metadata
     if not is_memmap:
-        size = os.path.getsize(path) / 1e9
+        size = os.path.getsize(path) / 2**30
         if size > Const["MAX_GB"]:
             raise MemoryError(f"Too large {size:.2f} GB")
 

diff --git a/impy/viewer/utils.py b/impy/viewer/utils.py
@@ -82,7 +82,7 @@ def make_world_scale(obj):
 def viewer_imread(viewer: "napari.Viewer", path: str):    
     """Read an image into the viewer."""
 
-    if "*" in path or os.path.getsize(path)/1e9 < Const["MAX_GB"]:
+    if "*" in path or os.path.getsize(path)/2**30 < Const["MAX_GB"]:
         img = imread(path)
     else:
         img = lazy_imread(path)