PySDM-examples 2.90__tar.gz → 2.92__tar.gz

{pysdm_examples-2.90 → pysdm_examples-2.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.90
+Version: 2.92
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples/Bartman_2020_MasterThesis/fig_4_adaptive_sdm.py

@@ -7,7 +7,7 @@ from PySDM_examples.Shima_et_al_2009.spectrum_plotter import SpectrumPlotter
 
 
 def main(plot: bool = True, save: str = None):
-    n_sds = [13, 15, 17]
+    n_sds = [13, 15, 17] if "CI" not in os.environ else [13, 15]
     dts = [10, 5, 1, "adaptive"]
     iters = 10
     base_time = None

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples/Bartman_2020_MasterThesis/fig_5_SCIPY_VS_ADAPTIVE.py

@@ -109,7 +109,7 @@ def main(save=None, show_plot=True):
     rtols = [1e-7, 1e-11]
     schemes = ["CPU", "SciPy"]
     setups_num = len(setups)
-    input_data = data(80, rtols, schemes, setups_num)
+    input_data = data(80 if "CI" not in os.environ else 20, rtols, schemes, setups_num)
     plot(input_data, rtols, schemes, setups_num, show_plot, save)
 
 

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples/Berry_1967/example_fig_6.py

@@ -15,7 +15,7 @@ def full_params(params):
 
 def print_collection_efficiency_portrait(params):
     size = 2 * 5.236
-    plt.figure(num=1, figsize=(size / 2, size))
+    plt.figure(figsize=(size / 2, size))
     points = 200
     Y_c = np.zeros(points)
     x_values = np.linspace(0, 1, points)

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples/Berry_1967/spectrum_plotter.py

@@ -8,7 +8,7 @@ from PySDM_examples.Shima_et_al_2009.spectrum_plotter import (
 class SpectrumPlotter(SuperSpectrumPlotter):
     def __init__(self, settings, title=None, grid=True, legend=False):
         size = 2 * 5.236
-        pyplot.figure(num=1, figsize=(size, size * 0.54))
+        pyplot.figure(figsize=(size, size * 0.54))
         pyplot.xlabel("particle radius [µm]")
         pyplot.ylabel("dm/dlnr [g/m^3/(unit dr/r)]")
         super().__init__(settings, title=title, grid=grid, legend=legend, log_base=2)

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples/Bulenok_2023_MasterThesis/__init__.py

@@ -2,7 +2,4 @@
 """
 Box-model coalescence-breakup performance benchmark from
 [Bulenok 2023 MSc thesis](https://www.ap.uj.edu.pl/diplomas/166879)
-
-performance_comparison_Srivastava_Setup.ipynb:
-.. include:: ./performance_comparison_Srivastava_Setup.ipynb.badges.md
 """

pysdm_examples-2.92/PySDM_examples/Bulenok_2023_MasterThesis/performance_comparison_Srivastava_Setup.py

@@ -0,0 +1,225 @@
+import subprocess
+import os
+
+from datetime import datetime
+import numba  # pylint: disable=unused-import
+
+from PySDM_examples.Bulenok_2023_MasterThesis.utils import (
+    go_benchmark,
+    process_results,
+    plot_processed_results,
+    write_to_file,
+)
+from PySDM_examples.Bulenok_2023_MasterThesis.setups import (
+    setup_coalescence_only_sim,
+    setup_breakup_only_sim,
+    setup_coalescence_breakup_sim,
+)
+
+from PySDM.backends import GPU, CPU
+from PySDM.physics import si
+
+
+def main(plot: bool = True, save: str = None):
+
+    TIMESTAMP = str(datetime.now().strftime("%Y-%d-%m_%Hh-%Mm-%Ss"))
+
+    SIM_RUN_FNAME = "env_name_" + TIMESTAMP
+
+    assert not os.path.isfile(SIM_RUN_FNAME)
+
+    cmd = [
+        "bash",
+        "-c",
+        # pylint: disable=no-member
+        f"echo NUMBA_DEFAULT_NUM_THREADS: {numba.config.NUMBA_DEFAULT_NUM_THREADS}"
+        + f">> {SIM_RUN_FNAME}",
+    ]
+    subprocess.run(cmd, check=False)
+    subprocess.run(
+        [  # pylint: disable=no-member
+            "bash",
+            "-c",
+            f"echo NUMBA_NUM_THREADS: {numba.config.NUMBA_NUM_THREADS} >> {SIM_RUN_FNAME}",
+        ],
+        check=False,
+    )
+    subprocess.run(["bash", "-c", f"lscpu >> {SIM_RUN_FNAME}"], check=False)
+    subprocess.run(["bash", "-c", f"nvidia-smi >> {SIM_RUN_FNAME}"], check=False)
+    subprocess.run(["bash", "-c", f"nvidia-smi -L >> {SIM_RUN_FNAME}"], check=False)
+    subprocess.run(["bash", "-c", f"cat /proc/cpuinfo >> {SIM_RUN_FNAME}"], check=False)
+
+    CI = "CI" in os.environ
+
+    exponents = [3, 5, 8, 10, 12, 14, 16, 18, 20, 22, 24] if not CI else [3, 5]
+    n_sds = [2**i for i in exponents]
+
+    numba_n_threads = [1, 2, 4, 5, 6, 8, 10] if not CI else [1, 2]
+
+    n_realisations = 3 if not CI else 2
+    seeds = list(range(n_realisations))
+
+    n_steps_short = 100 if not CI else 3
+    n_steps_full = 2048 if not CI else 3
+
+    # # Benchmark regular setup (without scaling)
+
+    # ### Coalescence-only
+
+    res_coalescence_only = go_benchmark(
+        setup_coalescence_only_sim,
+        n_sds,
+        n_steps_short,
+        seeds,
+        numba_n_threads=numba_n_threads,
+        double_precision=True,
+        sim_run_filename=SIM_RUN_FNAME + "-coalescence",
+        backends=[CPU, GPU],
+    )
+    coalescence_only_processed = process_results(res_coalescence_only)
+    filename = f"{SIM_RUN_FNAME}-results-coalescence-double-n_steps{n_steps_short}"
+    if plot:
+        plot_processed_results(
+            coalescence_only_processed,
+            plot_title=f"coalescence-only (n_steps: {n_steps_short})",
+            plot_filename=filename + ".svg",
+        )
+    if save is not None:
+        write_to_file(filename=filename + ".txt", d=coalescence_only_processed)
+
+    # ### Breakup-only
+
+    res_breakup_only = go_benchmark(
+        setup_breakup_only_sim,
+        n_sds,
+        n_steps_short,
+        seeds,
+        numba_n_threads=numba_n_threads,
+        double_precision=True,
+        sim_run_filename=SIM_RUN_FNAME + "-breakup",
+        backends=[CPU, GPU],
+    )
+    breakup_only_processed = process_results(res_breakup_only)
+    filename = f"{SIM_RUN_FNAME}-results-breakup-double-n_steps{n_steps_short}"
+    if plot:
+        plot_processed_results(
+            breakup_only_processed,
+            plot_title=f"breakup-only  (n_steps: {n_steps_short})",
+            plot_filename=filename + ".svg",
+        )
+    if save is not None:
+        write_to_file(filename=filename + ".txt", d=breakup_only_processed)
+
+    # ### Coalescence and Breakup
+
+    res_coal_breakup = go_benchmark(
+        setup_coalescence_breakup_sim,
+        n_sds,
+        n_steps_full,
+        seeds,
+        numba_n_threads=numba_n_threads,
+        double_precision=True,
+        sim_run_filename=SIM_RUN_FNAME + "-coal-break",
+        backends=[CPU, GPU],
+    )
+    coal_breakup_processed = process_results(res_coal_breakup)
+    filename = f"{SIM_RUN_FNAME}-results-coal_with_breakup-double-n_steps{n_steps_full}"
+    if plot:
+        plot_processed_results(
+            coal_breakup_processed,
+            plot_title=f"coalescence+breakup (n_steps: {n_steps_full})",
+            plot_filename=filename + ".svg",
+        )
+    if save is not None:
+        write_to_file(filename=filename + ".txt", d=coal_breakup_processed)
+
+    # # Benchmark setup with scaling
+
+    def total_number_from_n_sd(n_sd):
+        return n_sd * 1e8
+
+    def dv_from_n_sd(n_sd):
+        return n_sd * (0.125 * si.m**3)
+
+    # ### Coalescence-only
+
+    res_coalescence_only_scaled = go_benchmark(
+        setup_coalescence_only_sim,
+        n_sds,
+        n_steps_short,
+        seeds,
+        numba_n_threads=numba_n_threads,
+        double_precision=True,
+        sim_run_filename=SIM_RUN_FNAME + "-coalescence-scaled",
+        total_number=total_number_from_n_sd,
+        dv=dv_from_n_sd,
+        backends=[CPU, GPU],
+    )
+    coalescence_only_processed_scaled = process_results(res_coalescence_only_scaled)
+    filename = (
+        f"{SIM_RUN_FNAME}-results-scaled-coalescence-double-n_steps{n_steps_short}"
+    )
+    if plot:
+        plot_processed_results(
+            coalescence_only_processed_scaled,
+            plot_title=f"coalescence-only with scaling (n_steps: {n_steps_short})",
+            plot_filename=filename + ".svg",
+        )
+    if save is not None:
+        write_to_file(filename=filename + ".txt", d=coalescence_only_processed_scaled)
+
+    # ### Breakup-only
+
+    res_breakup_only_scaled = go_benchmark(
+        setup_breakup_only_sim,
+        n_sds,
+        n_steps_short,
+        seeds,
+        numba_n_threads=numba_n_threads,
+        double_precision=True,
+        sim_run_filename=SIM_RUN_FNAME + "-breakup-scaled",
+        total_number=total_number_from_n_sd,
+        dv=dv_from_n_sd,
+        backends=[CPU, GPU],
+    )
+    breakup_only_processed_scaled = process_results(res_breakup_only_scaled)
+    filename = f"{SIM_RUN_FNAME}-results-scaled-breakup-double-n_steps{n_steps_short}"
+    if plot:
+        plot_processed_results(
+            breakup_only_processed_scaled,
+            plot_title=f"breakup-only with scaling (n_steps: {n_steps_short})",
+            plot_filename=filename + ".svg",
+        )
+    if save is not None:
+        write_to_file(filename=filename + ".txt", d=breakup_only_processed_scaled)
+
+    # ### Coalescence and Breakup
+
+    res_coal_breakup_scaled = go_benchmark(
+        setup_coalescence_breakup_sim,
+        n_sds,
+        n_steps_full,
+        seeds,
+        numba_n_threads=numba_n_threads,
+        double_precision=True,
+        sim_run_filename=SIM_RUN_FNAME + "-coal-break-scaled",
+        total_number=total_number_from_n_sd,
+        dv=dv_from_n_sd,
+        backends=[CPU, GPU],
+    )
+    coal_breakup_processed_scaled = process_results(res_coal_breakup_scaled)
+    filename = (
+        f"{SIM_RUN_FNAME}-results-scaled-coal_with_breakup-double-n_steps{n_steps_full}"
+    )
+    if plot:
+        plot_processed_results(
+            coal_breakup_processed_scaled,
+            plot_title=f"coalescence+breakup with scaling (n_steps: {n_steps_full})",
+            plot_filename=filename + ".svg",
+        )
+    if save is not None:
+        write_to_file(filename=filename + ".txt", d=coal_breakup_processed_scaled)
+
+
+if __name__ == "__main__":
+    main(plot="CI" not in os.environ, save=".")

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples/Bulenok_2023_MasterThesis/utils.py

@@ -6,7 +6,6 @@ import time
 import numba
 import numpy as np
 from matplotlib import pyplot
-from open_atmos_jupyter_utils import show_plot
 
 from PySDM.backends import CPU, GPU
 
@@ -208,11 +207,11 @@ class PlottingHelpers:
 
 def plot_processed_results(
     processed_d,
-    show=True,
+    *,
     plot_label="",
     plot_title=None,
     metric="min",
-    plot_filename=None,
+    plot_filename,
     markers=None,
     colors=None,
 ):
@@ -257,33 +256,27 @@ def plot_processed_results(
     if plot_title:
         pyplot.title(plot_title)
 
-    if show:
-        if plot_filename:
-            show_plot(filename=plot_filename)
-        else:
-            pyplot.show()
+    pyplot.savefig(plot_filename)
 
 
 def plot_processed_on_same_plot(coal_d, break_d, coal_break_d):
-    plot_processed_results(coal_d, plot_label="-c", show=False)
-    plot_processed_results(break_d, plot_label="-b", show=False)
-    plot_processed_results(coal_break_d, plot_label="-cb", show=False)
-
-    show_plot()
+    filename = "same_plot.svg"
+    plot_processed_results(coal_d, plot_label="-c", plot_filename=filename)
+    plot_processed_results(break_d, plot_label="-b", plot_filename=filename)
+    plot_processed_results(coal_break_d, plot_label="-cb", plot_filename=filename)
 
 
 def plot_time_per_step(
     processed_d,
     n_sd,
-    show=True,
+    *,
     plot_label="",
     plot_title=None,
     metric="mean",
-    plot_filename=None,
+    plot_filename,
     step_from_to=None,
 ):
     backends = PlottingHelpers.get_sorted_backend_list(processed_d)
-
     markers = PlottingHelpers.get_backend_markers(backends)
 
     for backend in backends:
@@ -305,8 +298,4 @@ def plot_time_per_step(
     if plot_title:
         pyplot.title(plot_title + f"(n_sd: {n_sd})")
 
-    if show:
-        if plot_filename:
-            show_plot(filename=plot_filename)
-        else:
-            pyplot.show()
+    pyplot.savefig(plot_filename)

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.90
+Version: 2.92
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors

{pysdm_examples-2.90 → pysdm_examples-2.92}/PySDM_examples.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ PySDM_examples/Bieli_et_al_2022/simulation.py
 PySDM_examples/Bolin_1958/__init__.py
 PySDM_examples/Bolot_et_al_2013/__init__.py
 PySDM_examples/Bulenok_2023_MasterThesis/__init__.py
+PySDM_examples/Bulenok_2023_MasterThesis/performance_comparison_Srivastava_Setup.py
 PySDM_examples/Bulenok_2023_MasterThesis/setups.py
 PySDM_examples/Bulenok_2023_MasterThesis/utils.py
 PySDM_examples/Ervens_and_Feingold_2012/__init__.py

{pysdm_examples-2.90 → pysdm_examples-2.92}/pyproject.toml

@@ -1,5 +1,7 @@
 [tool.setuptools_scm]
 root = ".."
+local_scheme = "no-local-version"
+version_scheme = "post-release"
 
 [build-system]
 requires = ['setuptools==75.6.0', 'setuptools-scm==8.1.0']

{pysdm_examples-2.90 → pysdm_examples-2.92}/setup.py

@@ -23,10 +23,6 @@ setup(
     name="PySDM-examples",
     description="PySDM usage examples reproducing results from literature "
     "and depicting how to use PySDM from Python Jupyter notebooks",
-    use_scm_version={
-        "local_scheme": lambda _: "",
-        "version_scheme": "post-release",
-    },
     install_requires=[
         "PySDM",
         "PyMPDATA" + (">=1.0.15" if CI else ""),