fullwave25 1.2.6.dev8__tar.gz → 1.2.6.dev9__tar.gz

{fullwave25-1.2.6.dev8 → fullwave25-1.2.6.dev9}/.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "1.2.6-dev8"
+current_version = "1.2.6-dev9"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

{fullwave25-1.2.6.dev8 → fullwave25-1.2.6.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fullwave25
-Version: 1.2.6.dev8
+Version: 1.2.6.dev9
 Summary: Fullwave 2.5: Ultrasound wave propagation simulation with heterogeneous power law attenuation modelling capabilities
 Author: Masashi Sode, Gianmarco Pinton
 Maintainer: Masashi Sode

{fullwave25-1.2.6.dev8 → fullwave25-1.2.6.dev9}/fullwave/__init__.py

@@ -60,7 +60,7 @@ try:
     __version__ = version("fullwave")
 except PackageNotFoundError:
     # Update via bump-my-version, not manually
-    __version__ = "1.2.6-dev8"
+    __version__ = "1.2.6-dev9"
 
 VERSION = __version__  # for convenience
 logger.info("Fullwave version: %s", __version__)

{fullwave25-1.2.6.dev8 → fullwave25-1.2.6.dev9}/fullwave/solver/pml_builder.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import concurrent.futures
+import gc
 import logging
 from collections import OrderedDict
 from dataclasses import dataclass, field
@@ -563,6 +564,33 @@ class PMLBuilder:
 
         return output
 
+    def _move_named_arrays_to_cpu(
+        self,
+        named_arrays: list[tuple[str, NDArray]],
+        attr_names: list[str] | None = None,
+    ) -> list[tuple[str, NDArray]]:
+        """Convert CuPy arrays to numpy and free GPU memory pools.
+
+        Also replaces the corresponding ``medium_org`` attributes (given by
+        *attr_names*) so the original GPU arrays can be garbage-collected.
+        """
+        import cupy as cp  # noqa: PLC0415
+
+        numpy_arrays = []
+        for name, arr in named_arrays:
+            if hasattr(arr, "get"):
+                arr_np = arr.get()
+                numpy_arrays.append((name, arr_np))
+                # Update medium_org so the CuPy array can be freed
+                if attr_names and name in attr_names:
+                    setattr(self.medium_org, name, arr_np)
+            else:
+                numpy_arrays.append((name, arr))
+        gc.collect()
+        cp.get_default_memory_pool().free_all_blocks()
+        cp.get_default_pinned_memory_pool().free_all_blocks()
+        return numpy_arrays
+
     def _extend_arrays_gpu(
         self,
         named_arrays: list[tuple[str, NDArray]],
@@ -571,8 +599,8 @@ class PMLBuilder:
 
         Parameters
         ----------
-        named_arrays : list of (name, numpy_array) pairs
-            Arrays to extend. Must be numpy arrays (CPU).
+        named_arrays : list of (name, numpy_array) or (name, cupy_array) pairs
+            Arrays to extend.
 
         Returns
         -------
@@ -585,6 +613,8 @@ class PMLBuilder:
         n_gpus = cp.cuda.runtime.getDeviceCount()
         logger.info("CUDA devices available: %d", n_gpus)
 
+        attr_names = [name for name, _ in named_arrays]
+
         # Strategy 1: Multi-GPU parallel
         if n_gpus > 1:
             n_workers = min(n_gpus, len(named_arrays))
@@ -597,16 +627,15 @@ class PMLBuilder:
                 )
                 return self._extend_arrays_multi_gpu(named_arrays, n_gpus)
             except Exception:
-                logger.warning("Multi-GPU extension failed. Falling back to sequential single-GPU.")
+                logger.warning(
+                    "Multi-GPU extension failed. Falling back to CPU.",
+                    exc_info=True,
+                )
 
-        # Strategy 2: Sequential single-GPU (extend one, free, repeat)
-        try:
-            logger.info("Extending %d medium arrays sequentially on GPU 0.", len(named_arrays))
-            return self._extend_arrays_sequential_gpu(named_arrays)
-        except Exception:
-            logger.warning("Single-GPU extension failed. Falling back to CPU.")
+        # Move arrays to CPU and free GPU memory before CPU fallback.
+        # The original medium arrays may still occupy GPU memory.
+        named_arrays = self._move_named_arrays_to_cpu(named_arrays, attr_names)
 
-        # Strategy 3: CPU
         logger.info("Extending %d medium arrays on CPU.", len(named_arrays))
         return self._extend_arrays_cpu(named_arrays)
 
@@ -669,13 +698,21 @@ class PMLBuilder:
         named_arrays: list[tuple[str, NDArray]],
     ) -> dict[str, NDArray]:
         """Extend arrays on CPU using ThreadPoolExecutor."""
+        # Convert any CuPy arrays to numpy before CPU fallback
+        numpy_arrays = []
+        for name, arr in named_arrays:
+            if hasattr(arr, "get"):
+                numpy_arrays.append((name, arr.get()))
+            else:
+                numpy_arrays.append((name, arr))
+
         orig_xp = self.xp
         self.xp = np
         try:
             with concurrent.futures.ThreadPoolExecutor() as executor:
                 futures = {
                     name: executor.submit(self._extend_map_for_pml, arr)
-                    for name, arr in named_arrays
+                    for name, arr in numpy_arrays
                 }
                 return {name: future.result() for name, future in futures.items()}
         finally:

{fullwave25-1.2.6.dev8 → fullwave25-1.2.6.dev9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fullwave25"
-version = "1.2.6-dev8" # Update via bump-my-version, not manually
+version = "1.2.6-dev9" # Update via bump-my-version, not manually
 description = "Fullwave 2.5: Ultrasound wave propagation simulation with heterogeneous power law attenuation modelling capabilities"
 readme = "README.md"
 requires-python = ">=3.10"

{fullwave25-1.2.6.dev8 → fullwave25-1.2.6.dev9}/uv.lock

@@ -735,7 +735,7 @@ wheels = [
 
 [[package]]
 name = "fullwave25"
-version = "1.2.6.dev8"
+version = "1.2.6.dev9"
 source = { editable = "." }
 dependencies = [
     { name = "matplotlib" },