CUQIpy 1.4.0.post0.dev101__tar.gz → 1.4.0.post0.dev116__tar.gz

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/CUQIpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CUQIpy
-Version: 1.4.0.post0.dev101
+Version: 1.4.0.post0.dev116
 Summary: Computational Uncertainty Quantification for Inverse problems in Python
 Maintainer-email: "Nicolai A. B. Riis" <nabr@dtu.dk>, "Jakob S. Jørgensen" <jakj@dtu.dk>, "Amal M. Alghamdi" <amaal@dtu.dk>, Chao Zhang <chaz@dtu.dk>
 License:                                  Apache License

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/CUQIpy.egg-info/SOURCES.txt

@@ -107,6 +107,7 @@ cuqi/utilities/_utilities.py
 tests/test_abstract_distribution_density.py
 tests/test_algebra.py
 tests/test_bayesian_inversion.py
+tests/test_config.py
 tests/test_density.py
 tests/test_distribution.py
 tests/test_distributions_shape.py

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CUQIpy
-Version: 1.4.0.post0.dev101
+Version: 1.4.0.post0.dev116
 Summary: Computational Uncertainty Quantification for Inverse problems in Python
 Maintainer-email: "Nicolai A. B. Riis" <nabr@dtu.dk>, "Jakob S. Jørgensen" <jakj@dtu.dk>, "Amal M. Alghamdi" <amaal@dtu.dk>, Chao Zhang <chaz@dtu.dk>
 License:                                  Apache License

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/cuqi/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-11-27T07:17:19+0100",
+ "date": "2025-12-04T09:30:08+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "439c46b8411ea3990f38b3f2f66025ad0868034c",
- "version": "1.4.0.post0.dev101"
+ "full-revisionid": "a37a0584e43394251680ac4288e8df89f5ebb023",
+ "version": "1.4.0.post0.dev116"
 }
 '''  # END VERSION_JSON
 

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/cuqi/config.py

@@ -12,3 +12,9 @@ MAX_STACK_SEARCH_DEPTH = 1000
 
 MIN_DIM_SPARSE = 75
 """ Minimum dimension to start storing Nd-arrays as sparse for N>2. The minimum dimension is defined as MIN_DIM_SPARSE^N. """
+
+PROGRESS_BAR_DYNAMIC_UPDATE = True
+""" If True, progress bars are updated frequently (dynamic updates).
+If False, progress bars are minimal/static (only shown at start and end), 
+which is useful, for example, when building documentation or the Jupyter book (CUQI-Book)
+"""

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/cuqi/problem/_problem.py

@@ -330,9 +330,9 @@ class BayesianProblem(object):
         print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
         print("")
 
-        if not legacy:
+        if legacy:
             print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-            print("!!!  Using samplers from cuqi.sampler  !!!")
+            print("!! Using legacy samplers from cuqi.legacy.sampler !!")
             print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
             print("")
 

{cuqipy-1.4.0.post0.dev101 → cuqipy-1.4.0.post0.dev116}/cuqi/sampler/_sampler.py

@@ -5,6 +5,7 @@ import pickle as pkl
 import warnings
 import cuqi
 from cuqi.samples import Samples
+from cuqi import config
 
 try:
     from tqdm import tqdm
@@ -228,6 +229,7 @@ class Sampler(ABC):
             batch_handler = _BatchHandler(batch_size, sample_path)
 
         # Draw samples
+        acc_rate = 0.0
         pbar = tqdm(range(Ns), "Sample: ")
         for idx in pbar:
             
@@ -239,8 +241,10 @@ class Sampler(ABC):
             if (Nt > 0) and (idx % Nt == 0):
                 self._samples.append(self.current_point)
 
-            # display acc rate at progress bar
-            pbar.set_postfix_str(f"acc rate: {np.mean(self._acc[-1-idx:]):.2%}")
+            # Display acc rate at progress bar
+            acc_rate = np.mean(self._acc[-1-idx:])
+            if config.PROGRESS_BAR_DYNAMIC_UPDATE:
+                pbar.set_postfix_str(f"acc rate: {acc_rate:.2%}")
 
             # Add sample to batch
             if batch_size > 0:
@@ -248,6 +252,10 @@ class Sampler(ABC):
 
             # Call callback function if specified            
             self._call_callback(idx, Ns)
+
+        # Finalize progress bar printing
+        if not config.PROGRESS_BAR_DYNAMIC_UPDATE:
+            print(f"Sampling acceptance rate: {acc_rate:.2%}\n")
                 
         return self
     
@@ -273,6 +281,7 @@ class Sampler(ABC):
         tune_interval = max(int(tune_freq * Nb), 1)
 
         # Draw warmup samples with tuning
+        acc_rate = 0.0
         pbar = tqdm(range(Nb), "Warmup: ")
         for idx in pbar:
 
@@ -288,12 +297,18 @@ class Sampler(ABC):
             if (Nt > 0) and (idx % Nt == 0):
                 self._samples.append(self.current_point)
 
-            # display acc rate at progress bar
-            pbar.set_postfix_str(f"acc rate: {np.mean(self._acc[-1-idx:]):.2%}")
+            # Display acc rate at progress bar
+            acc_rate = np.mean(self._acc[-1-idx:])
+            if config.PROGRESS_BAR_DYNAMIC_UPDATE:
+                pbar.set_postfix_str(f"acc rate: {acc_rate:.2%}")
 
             # Call callback function if specified
             self._call_callback(idx, Nb)
 
+        # Finalize progress bar printing
+        if not config.PROGRESS_BAR_DYNAMIC_UPDATE:
+            print(f"Warmup acceptance rate: {acc_rate:.2%}\n")
+
         return self
     
     def get_state(self) -> dict:

cuqipy-1.4.0.post0.dev116/tests/test_config.py

@@ -0,0 +1,13 @@
+import cuqi
+
+def test_progress_bar_update_frequently_default():
+    """Config exposes PROGRESS_BAR_DYNAMIC_UPDATE and it is a boolean."""
+    assert hasattr(cuqi, "config")
+    assert isinstance(cuqi.config.PROGRESS_BAR_DYNAMIC_UPDATE, bool)
+
+def test_progress_bar_update_frequently_toggle(monkeypatch):
+    """Can toggle PROGRESS_BAR_DYNAMIC_UPDATE via monkeypatch."""
+    original = cuqi.config.PROGRESS_BAR_DYNAMIC_UPDATE
+    monkeypatch.setattr(cuqi.config, "PROGRESS_BAR_DYNAMIC_UPDATE", not original, raising=True)
+    assert cuqi.config.PROGRESS_BAR_DYNAMIC_UPDATE == (not original)
+    # monkeypatch will restore the original value after the test