diffstar 0.3.2__tar.gz → 0.3.3__tar.gz

diffstar-0.3.2/.github/workflows/linting.yml → diffstar-0.3.3/.github/workflows/linting.yaml

@@ -21,15 +21,14 @@ jobs:
           channel-priority: strict
           show-channel-urls: true
           miniforge-version: latest
-          miniforge-variant: Mambaforge
 
       - name: configure conda and install code
         shell: bash -l {0}
         run: |
-          mamba install --quiet \
+          conda install --quiet \
             --file=requirements.txt
           python -m pip install --no-deps -e .
-          mamba install -y -q \
+          conda install -y -q \
             flake8
 
       - name: lint

diffstar-0.3.2/.github/workflows/monthly-warning-test.yml → diffstar-0.3.3/.github/workflows/monthly-warning-test.yaml

@@ -23,18 +23,16 @@ jobs:
           channel-priority: strict
           show-channel-urls: true
           miniforge-version: latest
-          miniforge-variant: Mambaforge
-          use-mamba: true
 
       - name: configure conda and install code
       # Test against current main branch of diffmah and dsps
         shell: bash -l {0}
         run: |
           conda config --set always_yes yes
-          mamba install --quiet \
+          conda install --quiet \
             --file=requirements.txt
           python -m pip install --no-deps -e .
-          mamba install -y -q \
+          conda install -y -q \
             flake8 \
             pytest \
             pytest-xdist \

diffstar-0.3.2/.github/workflows/test_releases.yml → diffstar-0.3.3/.github/workflows/test_releases.yaml

@@ -27,18 +27,16 @@ jobs:
           channel-priority: strict
           show-channel-urls: true
           miniforge-version: latest
-          miniforge-variant: Mambaforge
-          use-mamba: true
 
       - name: configure conda and install code
       # Test against current confa-forge release of diffmah
         shell: bash -l {0}
         run: |
           conda config --set always_yes yes
-          mamba install --quiet \
+          conda install --quiet \
             --file=requirements.txt
           python -m pip install --no-deps -e .
-          mamba install -y -q \
+          conda install -y -q \
             flake8 \
             pytest \
             pytest-xdist \

diffstar-0.3.2/.github/workflows/tests_cron.yml → diffstar-0.3.3/.github/workflows/tests_cron.yaml

@@ -27,18 +27,16 @@ jobs:
           channel-priority: strict
           show-channel-urls: true
           miniforge-version: latest
-          miniforge-variant: Mambaforge
-          use-mamba: true
 
       - name: configure conda and install code
       # Test against current main branch of diffmah and dsps
         shell: bash -l {0}
         run: |
           conda config --set always_yes yes
-          mamba install --quiet \
+          conda install --quiet \
             --file=requirements.txt
           python -m pip install --no-deps -e .
-          mamba install -y -q \
+          conda install -y -q \
             flake8 \
             pytest \
             pytest-xdist \

{diffstar-0.3.2 → diffstar-0.3.3}/CHANGES.rst

@@ -1,3 +1,8 @@
+0.3.3 (2025-01-15)
+------------------
+- Clean out old code so that only tpeak-based diffmah models remain (https://github.com/ArgonneCPAC/diffstar/pull/72)
+
+
 0.3.2 (2024-10-25)
 ------------------
 - Adapt sfh kernels to be compatible with diffmah 0.6.1

{diffstar-0.3.2/diffstar.egg-info → diffstar-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: diffstar
-Version: 0.3.2
+Version: 0.3.3
 Summary: Differentiable Star Formation Histories
 Author-email: Alex Alarcon <alexalarcongonzalez@gmail.com>
 License: BSD 3-Clause License
@@ -35,10 +35,10 @@ License: BSD 3-Clause License
         
 Project-URL: home, https://github.com/ArgonneCPAC/diffstar
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: diffmah>=0.6.1
+Requires-Dist: diffmah>=0.7.0
 Requires-Dist: numpy
 Requires-Dist: jax
 Requires-Dist: h5py

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/__init__.py

@@ -1,5 +1,6 @@
 """
 """
+
 # flake8: noqa
 from ._version import __version__
 from .defaults import (
@@ -14,4 +15,4 @@ from .defaults import (
     get_bounded_diffstar_params,
     get_unbounded_diffstar_params,
 )
-from .sfh_model import calc_sfh_galpop, calc_sfh_singlegal
+from .sfh_model_tpeak import calc_sfh_galpop, calc_sfh_singlegal

diffstar-0.3.3/diffstar/_version.py

@@ -0,0 +1 @@
+__version__ = '0.3.3'

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/data_loaders/load_bpl.py

@@ -1,5 +1,6 @@
 """
 """
+
 import os
 from collections import OrderedDict
 
@@ -13,7 +14,7 @@ try:
 except ImportError:
     HAS_ASTROPY = False
 
-from ..kernels.main_sequence_kernels import _get_bounded_sfr_params_vmap
+from ..kernels.main_sequence_kernels_tpeak import _get_bounded_sfr_params_vmap
 from ..kernels.quenching_kernels import _get_bounded_q_params_vmap
 from ..utils import _jax_get_dt_array
 

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/defaults.py

@@ -1,10 +1,11 @@
 """
 """
+
 # flake8: noqa
 from collections import namedtuple
 
 import numpy as np
-from diffmah.defaults import DEFAULT_MAH_PARAMS, DEFAULT_MAH_PDICT
+from diffmah.diffmah_kernels import DEFAULT_MAH_PARAMS, DEFAULT_MAH_PDICT
 from jax import jit as jjit
 
 TODAY = 13.8
@@ -20,7 +21,7 @@ DEFAULT_N_STEPS = 50
 
 
 from .kernels.gas_consumption import FB
-from .kernels.main_sequence_kernels import (
+from .kernels.main_sequence_kernels_tpeak import (
     DEFAULT_MS_PARAMS,
     DEFAULT_MS_PDICT,
     DEFAULT_U_MS_PARAMS,

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/fit_smah_helpers_tpeak.py

@@ -146,7 +146,6 @@ def get_loss_data_default(
     log_smah_sim,
     logmp,
     mah_params,
-    t_peak,
     dlogm_cut=DLOGM_CUT,
     t_fit_min=T_FIT_MIN,
     mass_fit_min=MIN_MASS_CUT,
@@ -251,7 +250,7 @@ def get_loss_data_default(
         )
 
     logt = jnp.log10(t_sim)
-    dmhdt, log_mah = _diffmah_kern(mah_params, t_sim, t_peak, lgt0)
+    dmhdt, log_mah = _diffmah_kern(mah_params, t_sim, lgt0)
 
     weight, weight_fstar = get_weights(
         t_sim,

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/fitting_kernels.py

@@ -1,14 +1,14 @@
 """
 """
 
-from diffmah.individual_halo_assembly import _calc_halo_history
+from diffmah import DEFAULT_MAH_PARAMS, mah_singlehalo
 from jax import jit as jjit
 from jax import numpy as jnp
 from jax import vmap
 
-from ..defaults import FB
+from ..defaults import FB, LGT0
 from ..kernels.gas_consumption import _get_lagged_gas
-from ..kernels.main_sequence_kernels import (
+from ..kernels.main_sequence_kernels_tpeak import (
     MS_BOUNDING_SIGMOID_PDICT,
     _get_bounded_sfr_params,
     _sfr_eff_plaw,
@@ -127,13 +127,7 @@ def calculate_sm_sfr_history_from_mah(
 
 @jjit
 def calculate_histories(
-    lgt,
-    dt,
-    mah_params,
-    u_ms_params,
-    u_q_params,
-    fstar_tdelay,
-    fb=FB,
+    lgt, dt, mah_params, u_ms_params, u_q_params, fstar_tdelay, fb=FB, lgt0=LGT0
 ):
     """Calculate individual halo mass MAH and galaxy SFH
 
@@ -185,7 +179,9 @@ def calculate_histories(
         Base-10 log of cumulative peak halo mass in units of Msun assuming h=1
 
     """
-    dmhdt, log_mah = _calc_halo_history(lgt, *mah_params)
+    tarr = 10**lgt
+    mah_params = DEFAULT_MAH_PARAMS._make(mah_params)
+    dmhdt, log_mah = mah_singlehalo(mah_params, tarr, lgt0)
     mstar, sfr, fstar = calculate_sm_sfr_fstar_history_from_mah(
         lgt,
         dt,

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/param_clippers.py

@@ -1,13 +1,14 @@
 """Functions ms_param_clipper and q_param_clipper implement clips on the diffstar
 parameters to help protect against NaNs and infinities
 """
+
 from collections import OrderedDict
 
 from jax import jit as jjit
 from jax import numpy as jnp
 from jax import vmap
 
-from ..kernels.main_sequence_kernels import MS_PARAM_BOUNDS_PDICT
+from ..kernels.main_sequence_kernels_tpeak import MS_PARAM_BOUNDS_PDICT
 from ..kernels.quenching_kernels import Q_PARAM_BOUNDS_PDICT
 
 _EPS = 0.001

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/tests/test_fitting_kernels.py

@@ -2,14 +2,12 @@
 """
 
 import numpy as np
-from diffmah.defaults import DEFAULT_MAH_PARAMS, MAH_K
-from diffmah.individual_halo_assembly import _calc_halo_history
+from diffmah import mah_singlehalo
+from diffmah.defaults import DEFAULT_MAH_PARAMS
 
 from ...defaults import DEFAULT_U_MS_PARAMS, DEFAULT_U_Q_PARAMS, FB, LGT0
-from ...kernels import get_sfh_from_mah_kern
 from ...utils import _jax_get_dt_array
 from ..fitting_kernels import (
-    _sfr_history_from_mah,
     calculate_histories,
     calculate_histories_vmap,
     calculate_sm_sfr_fstar_history_from_mah,
@@ -19,17 +17,6 @@ from ..fitting_kernels import (
 DEFAULT_LOGM0 = 12.0
 
 
-def _get_default_diffmah_args():
-    return (
-        LGT0,
-        DEFAULT_MAH_PARAMS.logmp,
-        DEFAULT_MAH_PARAMS.logtc,
-        MAH_K,
-        DEFAULT_MAH_PARAMS.early_index,
-        DEFAULT_MAH_PARAMS.late_index,
-    )
-
-
 def test_calculate_sm_sfr_fstar_history_from_mah():
     n_t = 100
     tarr = np.linspace(0.1, 10**LGT0, n_t)
@@ -41,7 +28,7 @@ def test_calculate_sm_sfr_fstar_history_from_mah():
     _mask = tarr > fstar_tdelay + fstar_tdelay / 2.0
     fstar_indx_high = fstar_indx_high[_mask]
 
-    dmhdt, log_mah = _calc_halo_history(lgtarr, *_get_default_diffmah_args())
+    dmhdt, log_mah = mah_singlehalo(DEFAULT_MAH_PARAMS, tarr, LGT0)
     args = (
         lgtarr,
         dtarr,
@@ -68,7 +55,7 @@ def test_calculate_sm_sfr_history_from_mah():
     tarr = np.linspace(0.1, 10**LGT0, n_t)
     lgtarr = np.log10(tarr)
     dtarr = _jax_get_dt_array(tarr)
-    dmhdt, log_mah = _calc_halo_history(lgtarr, *_get_default_diffmah_args())
+    dmhdt, log_mah = mah_singlehalo(DEFAULT_MAH_PARAMS, tarr, LGT0)
 
     args = lgtarr, dtarr, dmhdt, log_mah, DEFAULT_U_MS_PARAMS, DEFAULT_U_Q_PARAMS, FB
     _res = calculate_sm_sfr_history_from_mah(*args)
@@ -86,7 +73,6 @@ def test_calculate_histories():
     tarr = np.linspace(0.1, 10**LGT0, n_t)
     lgtarr = np.log10(tarr)
     dtarr = _jax_get_dt_array(tarr)
-    all_diffmah_args = _get_default_diffmah_args()
 
     fstar_tdelay = 0.5  # gyr
     fstar_indx_high = np.searchsorted(tarr, tarr - fstar_tdelay)
@@ -96,7 +82,7 @@ def test_calculate_histories():
     args = (
         lgtarr,
         dtarr,
-        all_diffmah_args,
+        DEFAULT_MAH_PARAMS,
         DEFAULT_U_MS_PARAMS,
         DEFAULT_U_Q_PARAMS,
         fstar_tdelay,
@@ -112,16 +98,12 @@ def test_calculate_histories():
         assert x.shape == (n_t,)
     assert np.all(np.diff(log_mah) > 0)
 
-    logmp = all_diffmah_args[1]
-    assert log_mah[-1] == logmp
-
 
 def test_calculate_histories_vmap():
     n_t = 100
     tarr = np.linspace(0.1, 10**LGT0, n_t)
     lgtarr = np.log10(tarr)
     dtarr = _jax_get_dt_array(tarr)
-    all_diffmah_args = np.array(_get_default_diffmah_args()).reshape((1, -1))
     u_ms_params = np.array(DEFAULT_U_MS_PARAMS).reshape((1, -1))
     u_q_params = np.array(DEFAULT_U_Q_PARAMS).reshape((1, -1))
     fstar_tdelay = 0.5  # gyr
@@ -129,11 +111,12 @@ def test_calculate_histories_vmap():
     _mask = tarr > fstar_tdelay + fstar_tdelay / 2.0
     fstar_indx_high = fstar_indx_high[_mask]
 
+    mah_params = DEFAULT_MAH_PARAMS._make([np.zeros(1) + x for x in DEFAULT_MAH_PARAMS])
     # in_axes = (None, None, 0, 0, 0, None, None, None)
     args = (
         lgtarr,
         dtarr,
-        all_diffmah_args,
+        mah_params,
         u_ms_params,
         u_q_params,
         fstar_tdelay,
@@ -145,22 +128,3 @@ def test_calculate_histories_vmap():
     mstar_galpop, sfr_galpop, fstar_galpop, dmhdt_galpop, log_mah_galpop = _res
     for x in mstar_galpop, sfr_galpop, dmhdt_galpop, log_mah_galpop:
         assert x.shape == (1, n_t)
-
-
-def test_sfr_history_from_mah():
-    n_t = 200
-    tarr = np.linspace(0.1, 10**LGT0, n_t)
-    lgtarr = np.log10(tarr)
-    dtarr = _jax_get_dt_array(tarr)
-    all_diffmah_args = _get_default_diffmah_args()
-    dmhdt, log_mah = _calc_halo_history(lgtarr, *all_diffmah_args)
-    args = lgtarr, dtarr, dmhdt, log_mah, DEFAULT_U_MS_PARAMS, DEFAULT_U_Q_PARAMS, FB
-    sfh_from_fitting_kernels = _sfr_history_from_mah(*args)
-    lgt0, logmp, logtc, k, early_index, late_index = all_diffmah_args
-    mah_params = logmp, logtc, early_index, late_index
-
-    sfh_kern = get_sfh_from_mah_kern(tobs_loop="vmap")
-    sfh_from_diffstar_kernels = sfh_kern(
-        tarr, mah_params, DEFAULT_U_MS_PARAMS, DEFAULT_U_Q_PARAMS, LGT0, FB
-    )
-    assert np.allclose(sfh_from_fitting_kernels, sfh_from_diffstar_kernels, atol=0.01)

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/tests/test_fitting_kernels_are_frozen.py

@@ -1,10 +1,11 @@
 """Unit tests enforcing that the behavior of Diffstar on the default params is frozen.
 """
+
 import os
 
 import numpy as np
+from diffmah import mah_singlehalo
 from diffmah.defaults import DEFAULT_MAH_PARAMS, MAH_K
-from diffmah.individual_halo_assembly import _calc_halo_history
 from jax import numpy as jnp
 
 from ...defaults import DEFAULT_U_MS_PARAMS, DEFAULT_U_Q_PARAMS, LGT0
@@ -19,18 +20,6 @@ TESTING_DATA_DRN = os.path.join(
 )
 
 
-def _get_default_mah_params():
-    """Return (logt0, logmp, logtc, k, early, late)"""
-    return (
-        LGT0,
-        DEFAULT_MAH_PARAMS.logmp,
-        DEFAULT_MAH_PARAMS.logtc,
-        MAH_K,
-        DEFAULT_MAH_PARAMS.early_index,
-        DEFAULT_MAH_PARAMS.late_index,
-    )
-
-
 def _get_default_sfr_u_params():
     u_ms_params = jnp.array(DEFAULT_U_MS_PARAMS)
     u_q_params = jnp.array(DEFAULT_U_Q_PARAMS)
@@ -43,11 +32,10 @@ def calc_sfh_on_default_params(n_t=100):
     This function is used to generate the unit-testing data used in this module
     to freeze the behavior of Diffstar evaluated on the default parameters.
     """
-    mah_params = _get_default_mah_params()
 
     lgt = jnp.linspace(-1, LGT0, n_t)
     dt = _get_dt_array(10**lgt)
-    dmhdt, log_mah = _calc_halo_history(lgt, *mah_params)
+    dmhdt, log_mah = mah_singlehalo(DEFAULT_MAH_PARAMS, 10**lgt, LGT0)
     u_ms_params, u_q_params = _get_default_sfr_u_params()
     args = lgt, dt, dmhdt, log_mah, u_ms_params, u_q_params
     sfh = _sfr_history_from_mah(*args)
@@ -120,7 +108,14 @@ def test_diffmah_behavior_is_frozen():
     (at which point this test will need to be updated).
 
     """
-    assumed_default_params = _get_default_mah_params()
+    assumed_default_params = (
+        LGT0,
+        DEFAULT_MAH_PARAMS.logm0,
+        DEFAULT_MAH_PARAMS.logtc,
+        MAH_K,
+        DEFAULT_MAH_PARAMS.early_index,
+        DEFAULT_MAH_PARAMS.late_index,
+    )
     lgt0, logmp, logtc, k, early_index, late_index = assumed_default_params
 
     msg = "Default age of the universe assumed by Diffmah has changed"
@@ -144,7 +139,7 @@ def test_diffmah_behavior_is_frozen():
 
     args, sfh = calc_sfh_on_default_params()
     lgt, dt, dmhdt, log_mah, u_ms_params, u_q_params = args
-    dmhdt, log_mah = _calc_halo_history(lgt, *assumed_default_params)
+    dmhdt, log_mah = mah_singlehalo(DEFAULT_MAH_PARAMS, 10**lgt, lgt0)
 
     log_mah_fn = os.path.join(TESTING_DATA_DRN, "default_params_test_log_mah.txt")
     frozen_log_mah = np.loadtxt(log_mah_fn)
@@ -171,26 +166,28 @@ def test_sfh_is_frozen_on_example_bpl_sample():
     frozen_sfhs = np.loadtxt(sfh_fn)
     lgt_bpl = np.loadtxt(lgt_fn)
     dt_bpl = np.loadtxt(dt_fn)
+    t_bpl = 10**lgt_bpl
+    lgt0 = lgt_bpl[-1]
+    assert np.allclose(LGT0_BPL, lgt0, rtol=1e-3)
+
     mah_params_test_sample = np.loadtxt(mah_params_fn)
     ms_u_params_test_sample = np.loadtxt(ms_params_fn)
     q_u_params_test_sample = np.loadtxt(q_params_fn)
 
     sfh_test_sample = []
     for ih in range(mah_params_test_sample.shape[0]):
-        all_mah_params_ih = np.array(
-            (
-                LGT0_BPL,
-                mah_params_test_sample[ih, 0],
-                mah_params_test_sample[ih, 1],
-                MAH_K,
-                mah_params_test_sample[ih, 2],
-                mah_params_test_sample[ih, 3],
-            )
+        logm0 = mah_params_test_sample[ih, 0]
+        logtc = mah_params_test_sample[ih, 1]
+        early_indx = mah_params_test_sample[ih, 2]
+        late_indx = mah_params_test_sample[ih, 3]
+        t_peak = DEFAULT_MAH_PARAMS.t_peak
+        mah_params = DEFAULT_MAH_PARAMS._make(
+            [logm0, logtc, early_indx, late_indx, t_peak]
         )
         ms_u_params_ih = np.array(ms_u_params_test_sample[ih, :])
         q_u_params_ih = np.array(q_u_params_test_sample[ih, :])
 
-        dmhdt_ih, log_mah_ih = _calc_halo_history(lgt_bpl, *all_mah_params_ih)
+        dmhdt_ih, log_mah_ih = mah_singlehalo(mah_params, t_bpl, lgt0)
         sfh_ih = _sfr_history_from_mah(
             lgt_bpl, dt_bpl, dmhdt_ih, log_mah_ih, ms_u_params_ih, q_u_params_ih
         )

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/tests/test_fitting_smah_helpers.py

@@ -2,33 +2,33 @@
 """
 
 import numpy as np
+from diffmah.diffmah_kernels import DEFAULT_MAH_PARAMS
 
 from ...defaults import DEFAULT_MS_PDICT, DEFAULT_Q_PDICT
 from ...utils import _jax_get_dt_array
-from ..fit_smah_helpers import get_header, get_loss_data_fixed_hi
+from ..fit_smah_helpers_tpeak import get_header, get_loss_data_default
 
 DIFFMAH_K = 3.5
 
 
 def test_get_header_colnames_agree_with_model_param_names():
-    header = get_header()
+    header, colnames = get_header()
     assert header[0] == "#"
-    colnames = header[1:].strip().split()
 
     assert colnames[0] == "halo_id"
 
     u_ms_colnames_from_header = colnames[1:6]
-    ms_colnames_from_header = [s[2:] for s in u_ms_colnames_from_header]
+    ms_colnames_from_header = [s for s in u_ms_colnames_from_header]
     assert ms_colnames_from_header == list(DEFAULT_MS_PDICT.keys())
 
     u_q_colnames_from_header = colnames[6:10]
-    q_colnames_from_header = [s[2:] for s in u_q_colnames_from_header]
+    q_colnames_from_header = [s for s in u_q_colnames_from_header]
     assert q_colnames_from_header == list(DEFAULT_Q_PDICT.keys())
 
     assert colnames[10:] == ["loss", "success"]
 
 
-def test_get_loss_data_fixed_hi():
+def test_get_loss_data_evaluates():
     t_sim = np.linspace(0.1, 13.8, 100)
     dt_sim = _jax_get_dt_array(t_sim)
     sfrh = np.random.uniform(0, 10, t_sim.size)
@@ -36,8 +36,6 @@ def test_get_loss_data_fixed_hi():
     log_smah_sim = np.log10(smh)
 
     logmp = 12.0
-    logtc, early, late = 0.1, 2.0, 1.0
-    mah_params = logtc, DIFFMAH_K, early, late
-    p_init, loss_data = get_loss_data_fixed_hi(
-        t_sim, dt_sim, sfrh, log_smah_sim, logmp, mah_params
+    p_init, loss_data = get_loss_data_default(
+        t_sim, dt_sim, sfrh, log_smah_sim, logmp, DEFAULT_MAH_PARAMS
     )

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/tests/test_param_clippers.py

@@ -1,9 +1,10 @@
 """
 """
+
 import numpy as np
 from jax import random as jran
 
-from ...kernels.main_sequence_kernels import (
+from ...kernels.main_sequence_kernels_tpeak import (
     MS_PARAM_BOUNDS_PDICT,
     _get_bounded_sfr_params_vmap,
     _get_unbounded_sfr_params_vmap,

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/fitting_helpers/tests/test_stars.py

@@ -1,7 +1,8 @@
 """
 """
+
 from ...defaults import DEFAULT_MS_PDICT
-from ...kernels.main_sequence_kernels import MS_PARAM_BOUNDS_PDICT
+from ...kernels.main_sequence_kernels_tpeak import MS_PARAM_BOUNDS_PDICT
 
 
 def test_sfh_parameter_bounds():

diffstar-0.3.3/diffstar/kernels/__init__.py

@@ -0,0 +1,4 @@
+"""
+"""
+
+# flake8: noqa

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/kernels/tests/test_quenching_kernels.py

@@ -1,5 +1,6 @@
 """
 """
+
 import numpy as np
 
 from ...defaults import DEFAULT_Q_PARAMS, DEFAULT_U_Q_PARAMS, Q_PARAM_BOUNDS_PDICT

{diffstar-0.3.2 → diffstar-0.3.3}/diffstar/tests/test_defaults.py

@@ -1,10 +1,11 @@
 """
 """
+
 import numpy as np
 import pytest
 
 from .. import defaults
-from ..kernels.main_sequence_kernels import (
+from ..kernels.main_sequence_kernels_tpeak import (
     DEFAULT_MS_PDICT,
     DEFAULT_U_MS_PDICT,
     _get_bounded_sfr_params,

diffstar-0.3.3/diffstar/tests/test_sfh_model_tpeak.py

@@ -0,0 +1,62 @@
+""""""
+
+import numpy as np
+from diffmah.diffmah_kernels import DEFAULT_MAH_PARAMS
+from jax import random as jran
+
+from ..defaults import (
+    DEFAULT_MS_PARAMS,
+    DEFAULT_Q_PARAMS,
+    DEFAULT_U_MS_PARAMS,
+    DEFAULT_U_Q_PARAMS,
+    FB,
+    LGT0,
+    DiffstarUParams,
+    MSUParams,
+    QUParams,
+    get_bounded_diffstar_params,
+)
+from ..sfh_model_tpeak import calc_sfh_singlegal
+
+
+def _get_all_default_params():
+    ms_params, q_params = DEFAULT_MS_PARAMS, DEFAULT_Q_PARAMS
+    return LGT0, DEFAULT_MAH_PARAMS, ms_params, q_params
+
+
+def _get_all_default_u_params():
+    u_ms_params, u_q_params = DEFAULT_U_MS_PARAMS, DEFAULT_U_Q_PARAMS
+    return LGT0, DEFAULT_MAH_PARAMS, u_ms_params, u_q_params
+
+
+def test_calc_sfh_singlegal_imports_from_top_level():
+    from .. import calc_sfh_singlegal as _func  # noqa
+
+
+def test_calc_sfh_galpop_imports_from_top_level():
+    from .. import calc_sfh_galpop as _func  # noqa
+
+
+def test_sfh_singlegal_evaluates_on_wide_param_range():
+    lgt0, mah_params, u_ms_params_init, u_q_params_init = _get_all_default_u_params()
+
+    n_t = 100
+    tarr = np.linspace(0.1, 10**lgt0, n_t)
+
+    ran_key = jran.PRNGKey(0)
+    ntests = 20
+    ran_keys = jran.split(ran_key, ntests)
+    for test_key in ran_keys:
+        ms_key, q_key = jran.split(test_key, 2)
+        u_ms_params = jran.normal(ms_key, shape=(5,)) + np.array(u_ms_params_init)
+        u_q_params = jran.normal(q_key, shape=(4,)) + np.array(u_q_params_init)
+        sfh_u_params = DiffstarUParams(MSUParams(*u_ms_params), QUParams(*u_q_params))
+        sfh_params = get_bounded_diffstar_params(sfh_u_params)
+        sfh_new = calc_sfh_singlegal(sfh_params, mah_params, tarr, lgt0=lgt0, fb=FB)
+        assert np.all(np.isfinite(sfh_new))
+
+        sfh_new2, smh_new2 = calc_sfh_singlegal(
+            sfh_params, mah_params, tarr, lgt0=lgt0, fb=FB, return_smh=True
+        )
+        assert np.allclose(sfh_new, sfh_new2)
+        assert np.all(np.isfinite(smh_new2))

{diffstar-0.3.2 → diffstar-0.3.3/diffstar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: diffstar
-Version: 0.3.2
+Version: 0.3.3
 Summary: Differentiable Star Formation Histories
 Author-email: Alex Alarcon <alexalarcongonzalez@gmail.com>
 License: BSD 3-Clause License
@@ -35,10 +35,10 @@ License: BSD 3-Clause License
         
 Project-URL: home, https://github.com/ArgonneCPAC/diffstar
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: diffmah>=0.6.1
+Requires-Dist: diffmah>=0.7.0
 Requires-Dist: numpy
 Requires-Dist: jax
 Requires-Dist: h5py