paddle 1.1.15__tar.gz → 1.2.0__tar.gz

{paddle-1.1.15 → paddle-1.2.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.15
+current_version = 1.2.0
 commit = True
 tag = True
 

{paddle-1.1.15 → paddle-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paddle
-Version: 1.1.15
+Version: 1.2.0
 Summary: Python Atmospheric Dynamics: Discovery and Learning about Exoplanets. An open-source, user-friendly python frontend of canoe
 Project-URL: Homepage, https://github.com/elijah-mullens/paddle
 Project-URL: Repository, https://github.com/elijah-mullens/paddle
@@ -22,9 +22,8 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: >=3.9
-Requires-Dist: kintera>=1.1.5
 Requires-Dist: scipy
-Requires-Dist: snapy>=0.8.1
+Requires-Dist: snapy>=1.0.3
 Requires-Dist: torch<=2.7.1,>=2.7.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7; extra == 'dev'

{paddle-1.1.15 → paddle-1.2.0}/example_py_scripts/robert.yaml

@@ -15,7 +15,7 @@ geometry:
 distribute:
   backend: gloo
   layout: slab
-  nb2: 4
+  nb2: 1
   nb3: 1
   verbose: false
 

{paddle-1.1.15 → paddle-1.2.0}/example_py_scripts/test_saturn_adiabat.py

@@ -14,7 +14,8 @@ from pathlib import Path
 
 def setup_saturn_profile():
     # path = resources.files("paddle") / "data" / "saturn1d.yaml"
-    path = Path("data") / "saturn1d.yaml"
+    # path = Path("data") / "saturn1d.yaml"
+    path = "saturn1d.yaml"
     print(f"Reading input file: {path}")
 
     op_block = MeshBlockOptions.from_yaml(str(path))

{paddle-1.1.15 → paddle-1.2.0}/paddle/__init__.py

@@ -4,4 +4,4 @@ from .find_init_params import find_init_params
 from .evolve_kinetics import evolve_kinetics
 
 __all__ = ["setup_profile", "write_profile", "find_init_params", "evolve_kinetics"]
-__version__ = "1.1.15"
+__version__ = "1.2.0"

{paddle-1.1.15 → paddle-1.2.0}/paddle/crm.py

@@ -4,7 +4,6 @@ import time
 import kintera
 import numpy as np
 from snapy import (
-    index,
     MeshBlockOptions,
     MeshBlock,
     OutputOptions,
@@ -16,6 +15,7 @@ from kintera import (
     KineticsOptions,
     Kinetics,
 )
+from snapy import kIDN, kICY
 
 if __name__ == "__main__":
     # input file
@@ -59,7 +59,7 @@ if __name__ == "__main__":
 
         if count % 1 == 0:
             print(f"count = {count}, dt = {dt}, time = {current_time}")
-            print("mass = ", u[interior][index.idn].sum())
+            print("mass = ", u[interior][kIDN].sum())
 
             for out in outs:
                 out.increment_file_number()
@@ -70,7 +70,7 @@ if __name__ == "__main__":
             block.forward(dt, stage)
 
         # evolve kinetics
-        u[index.icy :] += evolve_kinetics(block, kinet, thermo_x)
+        u[kICY:] += evolve_kinetics(block, kinet, thermo_x)
 
         current_time += dt
         count += 1

{paddle-1.1.15 → paddle-1.2.0}/paddle/evolve_kinetics.py

@@ -1,6 +1,7 @@
 import torch
 import snapy
 import kintera
+from snapy import kIDN, kIPR, kICY
 
 
 def evolve_kinetics(
@@ -27,8 +28,8 @@ def evolve_kinetics(
     thermo_y = block.module("hydro.eos.thermo")
 
     temp = eos.compute("W->T", (hydro_w,))
-    pres = hydro_w[snapy.index.ipr]
-    xfrac = thermo_y.compute("Y->X", (hydro_w[snapy.index.icy :],))
+    pres = hydro_w[kIPR]
+    xfrac = thermo_y.compute("Y->X", (hydro_w[kICY:],))
     conc = thermo_x.compute("TPX->V", (temp, pres, xfrac))
     cp_vol = thermo_x.compute("TV->cp", (temp, conc))
 

paddle-1.2.0/paddle/example_save.py

@@ -0,0 +1,22 @@
+import torch
+import types
+
+
+def save_tensors(tensor_map: dict[str, torch.Tensor], filename: str):
+    class TensorModule(torch.nn.Module):
+        def __init__(self, tensors):
+            super().__init__()
+            for name, tensor in tensors.items():
+                self.register_buffer(name, tensor)
+
+    module = TensorModule(tensor_map)
+    scripted = torch.jit.script(module)  # Needed for LibTorch compatibility
+    scripted.save(filename)
+
+
+if __name__ == "__main__":
+    tensors = {
+        "foo": torch.randn(3, 4),
+        "bar": torch.randn(5, 6),
+    }
+    save_tensors(tensors, "foo_bar.pt")

{paddle-1.1.15 → paddle-1.2.0}/paddle/find_init_params.py

@@ -1,6 +1,7 @@
 from scipy.interpolate import interp1d
 import snapy
 import numpy as np
+from snapy import kIPR
 
 from .setup_profile import setup_profile
 
@@ -46,7 +47,7 @@ def find_init_params(
         temp = eos.compute("W->T", (w,)).squeeze()
 
         # calculate 1D pressure
-        pres = w[snapy.index.ipr, ...].squeeze()
+        pres = w[kIPR, ...].squeeze()
 
         # temperature function
         t_func = interp1d(

{paddle-1.1.15 → paddle-1.2.0}/paddle/setup_profile.py

@@ -3,6 +3,7 @@ from typing import Tuple
 import torch
 import snapy
 import kintera
+from snapy import kIDN, kIPR, kICY
 
 
 def integrate_neutral(
@@ -248,9 +249,9 @@ def setup_profile(
             xfrac /= xfrac.sum(dim=-1, keepdim=True)
         conc = thermo_x.compute("TPX->V", [temp, pres, xfrac])
 
-        w[snapy.index.ipr, ..., i] = pres
-        w[snapy.index.idn, ..., i] = thermo_x.compute("V->D", [conc])
-        w[snapy.index.icy :, ..., i] = thermo_x.compute("X->Y", [xfrac])
+        w[kIPR, ..., i] = pres
+        w[kIDN, ..., i] = thermo_x.compute("V->D", [conc])
+        w[kICY:, ..., i] = thermo_x.compute("X->Y", [xfrac])
 
         dz = coord.buffer("dx1f")[i]
         if method.split("-")[0] == "dry":
@@ -279,7 +280,7 @@ def setup_profile(
         dz = coord.buffer("dx1f")[i]
         pres *= torch.exp(-grav * mu * dz / (kintera.constants.Rgas * temp))
         conc = thermo_x.compute("TPX->V", [temp, pres, xfrac])
-        w[snapy.index.ipr, ..., i] = pres
-        w[snapy.index.idn, ..., i] = thermo_x.compute("V->D", [conc])
-        w[snapy.index.icy :, ..., i] = thermo_x.compute("X->Y", [xfrac])
+        w[kIPR, ..., i] = pres
+        w[kIDN, ..., i] = thermo_x.compute("V->D", [conc])
+        w[kICY:, ..., i] = thermo_x.compute("X->Y", [xfrac])
     return w

{paddle-1.1.15 → paddle-1.2.0}/paddle/write_profile.py

@@ -6,6 +6,7 @@ import numpy as np
 import torch
 import kintera
 import snapy
+from snapy import kIPR, kICY
 
 
 def write_profile(
@@ -47,7 +48,7 @@ def write_profile(
         raise ValueError("hydro_w must have shape (N, 1, 1, L).")
 
     # calculate a height grid
-    pres = hydro_w[snapy.index.ipr, ...].squeeze() / 1.0e5  # Pa -> bar
+    pres = hydro_w[kIPR, ...].squeeze() / 1.0e5  # Pa -> bar
     zlev_func = interp1d(
         pres.log().cpu().numpy(),
         coord.buffer("x1v").cpu().numpy(),
@@ -61,7 +62,7 @@ def write_profile(
     temp = eos.compute("W->T", (hydro_w,)).squeeze()
 
     # calculate mole fractions
-    xfrac = thermo_y.compute("Y->X", (hydro_w[snapy.index.icy :, ...],)).squeeze()
+    xfrac = thermo_y.compute("Y->X", (hydro_w[kICY:, ...],)).squeeze()
 
     # calculate heat capacity
     conc = thermo_x.compute("TPX->V", (temp, pres * 1.0e5, xfrac))

{paddle-1.1.15 → paddle-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "paddle"
-version = "1.1.15"
+version = "1.2.0"
 description = "Python Atmospheric Dynamics: Discovery and Learning about Exoplanets. An open-source, user-friendly python frontend of canoe"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -32,8 +32,7 @@ classifiers = [
 
 dependencies = [
   "torch>=2.7.0,<=2.7.1",
-  "kintera>=1.1.5",
-  "snapy>=0.8.1",
+  "snapy>=1.0.3",
   "scipy"
 ]