PySDM-examples 3.0.0rc3__tar.gz → 3.0.0rc5__tar.gz

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 3.0.0rc3
+Version: 3.0.0rc5
 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-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/Arabas_and_Shima_2017/simulation.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 import PySDM.products as PySDM_products
-from PySDM.backends import CPU
+from PySDM.backends import Numba
 from PySDM.builder import Builder
 from PySDM.dynamics import AmbientThermodynamics, Condensation
 from PySDM.environments import Parcel
@@ -10,7 +10,7 @@ from PySDM.physics import constants as const
 
 
 class Simulation:
-    def __init__(self, settings, backend=CPU):
+    def __init__(self, settings, backend=Numba):
         t_half = settings.z_half / settings.w_avg
 
         dt_output = (2 * t_half) / settings.n_output
@@ -23,7 +23,7 @@ class Simulation:
                 formulae=settings.formulae,
                 **(
                     {"override_jit_flags": {"parallel": False}}
-                    if backend == CPU
+                    if backend is Numba
                     else {}
                 ),
             ),

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/Arabas_et_al_2015/example_benchmark.py

@@ -6,7 +6,7 @@ from PySDM_examples.utils.kinematic_2d import Simulation, Storage
 
 import PySDM.backends.impl_numba.conf
 from PySDM import Formulae
-from PySDM.backends import CPU, GPU
+from PySDM.backends import Numba, ThrustRTC
 from PySDM.products import WallTime
 
 
@@ -42,11 +42,11 @@ def main():
     n_sd = range(14, 16, 1)
 
     times = {}
-    backends = [(CPU, "sync"), (CPU, "async")]
-    if GPU.ENABLE:
-        backends.append((GPU, "async"))
+    backends = [(Numba, "sync"), (Numba, "async")]
+    if ThrustRTC.ENABLE:
+        backends.append((ThrustRTC, "async"))
     for backend, mode in backends:
-        if backend is CPU:
+        if backend is Numba:
             PySDM.backends.impl_numba.conf.NUMBA_PARALLEL = mode
             reload_cpu_backend()
         key = f"{backend} (mode={mode})"

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/Bulenok_2023_MasterThesis/utils.py

@@ -95,7 +95,7 @@ def go_benchmark(
         backend_configs.append((GPU, None))
 
     for backend_class, n_threads in backend_configs:
-        backend_name = backend_class.__name__
+        backend_name = backend_class().__class__.__name__
         if n_threads:
             numba.set_num_threads(n_threads)
             backend_name += "_" + str(numba.get_num_threads())

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/Shima_et_al_2009/example.py

@@ -12,21 +12,12 @@ from PySDM.environments import Box
 from PySDM.initialisation.sampling.spectral_sampling import ConstantMultiplicity
 from PySDM.products import ParticleVolumeVersusRadiusLogarithmSpectrum, WallTime
 
-_BACKEND_CACHE = {}
-
-
-def backend_factory(backend_class, formulae):
-    key = backend_class.__name__ + ":" + str(formulae)
-    if key not in _BACKEND_CACHE:
-        _BACKEND_CACHE[key] = backend_class(formulae=formulae)
-    return _BACKEND_CACHE[key]
-
 
 def run(settings, backend=CPU, observers=()):
     env = Box(dv=settings.dv, dt=settings.dt)
     builder = Builder(
         n_sd=settings.n_sd,
-        backend=backend_factory(backend, formulae=settings.formulae),
+        backend=backend(formulae=settings.formulae),
         environment=env,
     )
     attributes = {}

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/Shipway_and_Hill_2012/settings.py

@@ -49,6 +49,7 @@ class Settings:
         formulae: Formulae = None,
         save_spec_and_attr_times=(),
         collision_kernel=None,
+        old_buggy_density_formula=False,
     ):
         self.formulae = formulae or Formulae()
         self.n_sd_per_gridbox = n_sd_per_gridbox
@@ -127,6 +128,8 @@ class Settings:
                 1 + water_vapour_mixing_ratio
             ) - rhod * d_water_vapour_mixing_ratio__dz / (
                 1 + water_vapour_mixing_ratio
+            ) ** (
+                2 if not old_buggy_density_formula else 1
             )
 
         z_span = (-self.particle_reservoir_depth, self.z_max)

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/Spichtinger_et_al_2023/simulation.py

@@ -3,7 +3,7 @@ import numpy as np
 from PySDM_examples.utils import BasicSimulation
 
 import PySDM.products as PySDM_products
-from PySDM.backends import CPU
+from PySDM.backends import Numba
 from PySDM.builder import Builder
 from PySDM.dynamics import (
     AmbientThermodynamics,
@@ -17,7 +17,7 @@ from PySDM.initialisation.hygroscopic_equilibrium import equilibrate_wet_radii
 
 
 class Simulation(BasicSimulation):
-    def __init__(self, settings, backend=CPU):
+    def __init__(self, settings, backend=Numba):
 
         dt = settings.dt
 
@@ -38,7 +38,7 @@ class Simulation(BasicSimulation):
                 formulae=settings.formulae,
                 **(
                     {"override_jit_flags": {"parallel": False}}
-                    if backend == CPU
+                    if backend is Numba
                     else {}
                 ),
             ),

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/deJong_Mackay_et_al_2023/settings1D.py

@@ -35,6 +35,7 @@ class Settings1D(SettingsSH):
     def __init__(
         self,
         *,
+        old_buggy_density_formula: bool,
         n_sd_per_gridbox: int,
         p0: float = 1007 * si.hPa,  # as used in Olesik et al. 2022 (GMD)
         kappa: float = 1,
@@ -80,6 +81,7 @@ class Settings1D(SettingsSH):
                 fragmentation_function=self.fragmentation_function.__class__.__name__
             ),
             save_spec_and_attr_times=save_spec_at,
+            old_buggy_density_formula=old_buggy_density_formula,
         )
         self.breakup = breakup
         self.stochastic_breakup = stochastic_breakup

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/PySDM_examples/utils/kinematic_2d/simulation.py

@@ -20,16 +20,6 @@ from PySDM.environments import Kinematic2D
 from PySDM.initialisation.sampling import spatial_sampling
 
 
-_BACKEND_CACHE = {}
-
-
-def backend_factory(backend_class, formulae):
-    key = backend_class.__name__ + ":" + str(formulae)
-    if key not in _BACKEND_CACHE:
-        _BACKEND_CACHE[key] = backend_class(formulae=formulae)
-    return _BACKEND_CACHE[key]
-
-
 class Simulation:
     def __init__(self, settings, storage, SpinUp, backend_class=CPU):
         self.settings = settings
@@ -44,7 +34,7 @@ class Simulation:
 
     def reinit(self, products=None):
         formulae = self.settings.formulae
-        backend = backend_factory(self.backend_class, formulae=formulae)
+        backend = self.backend_class(formulae=formulae)
         environment = Kinematic2D(
             dt=self.settings.dt,
             grid=self.settings.grid,

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/pyproject.toml

@@ -4,4 +4,4 @@ local_scheme = "no-local-version"
 version_scheme = "post-release"
 
 [build-system]
-requires = ['setuptools==80.9.0', 'setuptools-scm==8.3.1']
+requires = ['setuptools==80.9.0', 'setuptools-scm==9.0.1']

{pysdm_examples-3.0.0rc3 → pysdm_examples-3.0.0rc5}/pysdm_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 3.0.0rc3
+Version: 3.0.0rc5
 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-3.0.0rc3 → pysdm_examples-3.0.0rc5}/setup.py

@@ -1,4 +1,5 @@
 import os
+import platform
 import re
 import sys
 
@@ -42,7 +43,7 @@ setup(
     ]
     + (
         ["pyvinecopulib" + ("==0.7.3" if CI else ">=0.7.3")]
-        if sys.platform != "darwin"
+        if not (sys.platform == "darwin" and platform.machine() == "x86_64")
         else []
     ),
     extras_require={