Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kwave/kspaceFirstOrder.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ def kspaceFirstOrder(
smooth_p0=False,
pml_size=pml_size,
pml_alpha=pml_alpha,
quiet=quiet,
).run()

elif backend == "cpp":
Expand Down
27 changes: 24 additions & 3 deletions kwave/solvers/kspace_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from types import SimpleNamespace

import numpy as np
from tqdm import tqdm

try:
import cupy as cp
Expand Down Expand Up @@ -117,7 +118,19 @@ class Simulation:
"""

def __init__(
self, kgrid, medium, source, sensor, *, device="cpu", use_sg=True, use_kspace=True, smooth_p0=True, pml_size=None, pml_alpha=None
self,
kgrid,
medium,
source,
sensor,
*,
device="cpu",
use_sg=True,
use_kspace=True,
smooth_p0=True,
pml_size=None,
pml_alpha=None,
quiet=False,
):
self.kgrid = kgrid
self.medium = medium
Expand All @@ -126,6 +139,7 @@ def __init__(
self.use_sg = use_sg
self.use_kspace = use_kspace
self.smooth_p0 = smooth_p0
self.quiet = quiet
self._pml_size_override = pml_size
self._pml_alpha_override = pml_alpha
# kWaveGrid doesn't have pml_size_x attrs; warn if PML will silently be disabled
Expand Down Expand Up @@ -632,8 +646,15 @@ def run(self):
"""Run simulation to completion. Returns results dict."""
if not self._is_setup:
self.setup()
while self.t < self.Nt:
self.step()
remaining = self.Nt - self.t
if not self.quiet and remaining > 0:
with tqdm(total=remaining, desc="k-Wave", unit="step") as pbar:
while self.t < self.Nt:
self.step()
pbar.update(1)
else:
while self.t < self.Nt:
self.step()
# Copy to CPU one-by-one, freeing GPU memory as we go
result = {}
for k in list(self.sensor_data):
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ dependencies = [
"matplotlib==3.10.7",
"beartype==0.22.9",
"jaxtyping==0.3.2",
"deprecated>=1.2.14"
"deprecated>=1.2.14",
"tqdm>=4.60"
]

[project.urls]
Expand Down
26 changes: 26 additions & 0 deletions tests/test_native_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,32 @@ def test_cartesian_1d(self, grid_1d):
assert result["p"].shape == (3, 20)


class TestProgressBar:
def test_progress_bar_runs(self, grid_2d):
"""quiet=False (default) shows tqdm progress bar without error."""
result = kspaceFirstOrder(
grid_2d,
kWaveMedium(sound_speed=1500),
_p0_source((64, 64)),
kSensor(mask=np.ones((64, 64), dtype=bool)),
backend="python",
quiet=False,
)
assert "p" in result

def test_quiet_suppresses_bar(self, grid_2d):
"""quiet=True suppresses progress bar."""
result = kspaceFirstOrder(
grid_2d,
kWaveMedium(sound_speed=1500),
_p0_source((64, 64)),
kSensor(mask=np.ones((64, 64), dtype=bool)),
backend="python",
quiet=True,
)
assert "p" in result


class TestMatlabInterop:
def test_simulate_from_dicts(self):
from kwave.solvers.kspace_solver import simulate_from_dicts
Expand Down
2 changes: 2 additions & 0 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading