diffsky 0.2.5__tar.gz → 0.3.0__tar.gz

{diffsky-0.2.5 → diffsky-0.3.0}/.github/workflows/monthly-warning-test.yaml

@@ -54,7 +54,6 @@ jobs:
           pip install --no-deps git+https://github.com/ArgonneCPAC/diffmah.git
           pip install --no-deps git+https://github.com/ArgonneCPAC/diffstar.git
           pip install --no-deps git+https://github.com/ArgonneCPAC/dsps.git
-          pip install --no-deps git+https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/ArgonneCPAC/diffstarpop.git@main
           python -m pip install --no-build-isolation --no-deps -e .
 
       - name: test that no warnings are raised

{diffsky-0.2.5 → diffsky-0.3.0}/.github/workflows/test_main_branch.yaml

@@ -53,7 +53,6 @@ jobs:
           pip install --no-deps git+https://github.com/ArgonneCPAC/diffmah.git
           pip install --no-deps git+https://github.com/ArgonneCPAC/diffstar.git
           pip install --no-deps git+https://github.com/ArgonneCPAC/dsps.git
-          pip install --no-deps git+https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/ArgonneCPAC/diffstarpop.git@main
           python -m pip install --no-build-isolation --no-deps -e .
 
       - name: test

{diffsky-0.2.5 → diffsky-0.3.0}/.github/workflows/tests_cron.yaml

@@ -57,7 +57,6 @@ jobs:
           pip install --no-deps git+https://github.com/ArgonneCPAC/diffmah.git
           pip install --no-deps git+https://github.com/ArgonneCPAC/diffstar.git
           pip install --no-deps git+https://github.com/ArgonneCPAC/dsps.git
-          pip install --no-deps git+https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/ArgonneCPAC/diffstarpop.git@main
           python -m pip install --no-build-isolation --no-deps -e .
 
       - name: test

{diffsky-0.2.5 → diffsky-0.3.0}/CHANGES.rst

@@ -1,3 +1,8 @@
+0.3.0 (2025-10-03)
+-------------------
+- Update diffsky to be compatible with diffstar v1.0
+
+
 0.2.5 (2025-10-01)
 -------------------
 - Minor changes before updating to diffstar v1.0

{diffsky-0.2.5 → diffsky-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.2.5
+Version: 0.3.0
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -41,8 +41,7 @@ License-File: LICENSE.rst
 Requires-Dist: numpy
 Requires-Dist: jax
 Requires-Dist: diffmah>=0.7.2
-Requires-Dist: diffstar>=0.3.4
-Requires-Dist: diffstarpop>=0.0.2
+Requires-Dist: diffstar>=1.0.0
 Requires-Dist: dsps>=0.4.5
 Requires-Dist: h5py
 Dynamic: license-file
@@ -50,8 +49,8 @@ Dynamic: license-file
 diffsky
 ============
 
-Diffsky is a python library based on JAX for producing mock catalogs based on 
-`diffstar <https://diffstar.readthedocs.io/en/latest/>`_ 
+Diffsky is a python library based on JAX for producing mock catalogs based on
+`diffstar <https://diffstar.readthedocs.io/en/latest/>`_
 and `dsps <https://dsps.readthedocs.io/en/latest/>`_.
 
 Installation
@@ -77,18 +76,7 @@ For a typical development environment in conda-forge::
 Documentation
 -------------
 
-Online documentation for diffsky is available at 
+Online documentation for diffsky is available at
 `diffsky.readthedocs.io <https://diffsky.readthedocs.io/en/latest/>`_.
 
-Testing
--------
-To run the suite of unit tests::
-
-    $ cd /path/to/root/diffsky
-    $ pytest
-
-To build html of test coverage::
-
-    $ pytest -v --cov --cov-report html
-    $ open htmlcov/index.html
 

{diffsky-0.2.5 → diffsky-0.3.0}/README.rst

@@ -1,8 +1,8 @@
 diffsky
 ============
 
-Diffsky is a python library based on JAX for producing mock catalogs based on 
-`diffstar <https://diffstar.readthedocs.io/en/latest/>`_ 
+Diffsky is a python library based on JAX for producing mock catalogs based on
+`diffstar <https://diffstar.readthedocs.io/en/latest/>`_
 and `dsps <https://dsps.readthedocs.io/en/latest/>`_.
 
 Installation
@@ -28,18 +28,7 @@ For a typical development environment in conda-forge::
 Documentation
 -------------
 
-Online documentation for diffsky is available at 
+Online documentation for diffsky is available at
 `diffsky.readthedocs.io <https://diffsky.readthedocs.io/en/latest/>`_.
 
-Testing
--------
-To run the suite of unit tests::
-
-    $ cd /path/to/root/diffsky
-    $ pytest
-
-To build html of test coverage::
-
-    $ pytest -v --cov --cov-report html
-    $ open htmlcov/index.html
 

diffsky-0.3.0/diffsky/_version.py

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

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/data_loaders/hacc_utils/lc_mock_production.py

@@ -9,9 +9,9 @@ import h5py
 import numpy as np
 from diffmah import DEFAULT_MAH_PARAMS, logmh_at_t_obs
 from diffstar import DEFAULT_DIFFSTAR_PARAMS
-from diffstarpop import mc_diffstar_sfh_galpop
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
-from diffstarpop.param_utils import mc_select_diffstar_params
+from diffstar.diffstarpop import mc_diffstar_sfh_galpop
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop.param_utils import mc_select_diffstar_params
 from dsps.cosmology import flat_wcdm
 from jax import random as jran
 

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/diagnostics/plot_delta_mag_burstiness.py

@@ -5,8 +5,8 @@ import os
 import numpy as np
 from diffmah.diffmahpop_kernels.bimod_censat_params import DEFAULT_DIFFMAHPOP_PARAMS
 from diffmah.diffmahpop_kernels.mc_bimod_cens import mc_cenpop
-from diffstarpop import mc_diffstar_sfh_galpop
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop import mc_diffstar_sfh_galpop
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from dsps.constants import T_TABLE_MIN
 from dsps.cosmology import DEFAULT_COSMOLOGY
 from dsps.cosmology.flat_wcdm import _age_at_z_kern, age_at_z0

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/diagnostics/plot_diffstar_fq.py

@@ -1,8 +1,7 @@
-"""
-"""
+""" """
 
 import numpy as np
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from dsps.cosmology import flat_wcdm
 from dsps.cosmology.defaults import DEFAULT_COSMOLOGY
 from jax import random as jran

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/diagnostics/check_smhm.py

@@ -1,7 +1,7 @@
 """ """
 
 import numpy as np
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from jax import random as jran
 
 from .. import mc_lightcone_halos as mclh

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/lc_phot_kern.py

@@ -8,8 +8,8 @@ config.update("jax_enable_x64", True)
 from collections import namedtuple
 
 import numpy as np
+from diffstar.diffstarpop import mc_diffstar_sfh_galpop
 from diffstar.utils import cumulative_mstar_formed_galpop
-from diffstarpop import mc_diffstar_sfh_galpop
 from dsps.constants import T_TABLE_MIN
 from dsps.cosmology import flat_wcdm
 from dsps.metallicity import umzr

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/mc_diffsky_phot.py

@@ -5,7 +5,7 @@ from jax import config
 
 config.update("jax_enable_x64", True)
 
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from dsps.cosmology.defaults import DEFAULT_COSMOLOGY
 from dsps.metallicity import umzr
 from dsps.sed import metallicity_weights as zmetw

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/mc_diffsky_seds.py

@@ -7,7 +7,7 @@ config.update("jax_enable_x64", True)
 from collections import namedtuple
 
 from diffmah import logmh_at_t_obs
-from diffstarpop.param_utils import mc_select_diffstar_params
+from diffstar.diffstarpop.param_utils import mc_select_diffstar_params
 from dsps.cosmology import DEFAULT_COSMOLOGY, age_at_z0
 from dsps.metallicity import umzr
 from jax import jit as jjit

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/mc_lightcone_halos.py

@@ -11,10 +11,10 @@ import numpy as np
 from diffmah.diffmah_kernels import _log_mah_kern
 from diffmah.diffmahpop_kernels.bimod_censat_params import DEFAULT_DIFFMAHPOP_PARAMS
 from diffmah.diffmahpop_kernels.mc_bimod_cens import mc_cenpop
+from diffstar.diffstarpop import mc_diffstar_sfh_galpop
+from diffstar.diffstarpop import param_utils as dpu
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from diffstar.utils import cumulative_mstar_formed_galpop
-from diffstarpop import mc_diffstar_sfh_galpop
-from diffstarpop import param_utils as dpu
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from dsps.constants import T_TABLE_MIN
 from dsps.cosmology import flat_wcdm
 from dsps.metallicity import umzr

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/tests/test_lc_phot_kern.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 from diffstar.defaults import T_TABLE_MIN
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
 from dsps.cosmology import flat_wcdm
 from dsps.cosmology.defaults import DEFAULT_COSMOLOGY
 from dsps.data_loaders import retrieve_fake_fsps_data

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/tests/test_mc_diffsky_seds.py

@@ -144,8 +144,7 @@ def _check_sed_info(sed_info, lc_data, tcurves):
     n_gals = lc_data.logmp0.size
     n_z_table, n_bands, n_met, n_age = lc_data.precomputed_ssp_mag_table.shape
 
-    assert np.all(np.isfinite(sed_info["diffstar_params"].ms_params))
-    assert np.all(np.isfinite(sed_info["diffstar_params"].q_params))
+    assert np.all(np.isfinite(sed_info["diffstar_params"]))
 
     assert np.all(np.isfinite(sed_info["burst_params"].lgfburst))
     assert np.all(sed_info["burst_params"].lgfburst >= LGFBURST_MIN)

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/tests/test_mc_lightcone_halos.py

@@ -222,10 +222,8 @@ def test_mc_lightcone_diffstar_cens():
     assert np.all(np.isfinite(cenpop["logssfr_obs"]))
     assert cenpop["logsm_obs"].min() > 4
 
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_ms"].ms_params))
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_ms"].q_params))
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_q"].ms_params))
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_q"].q_params))
+    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_ms"]))
+    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_q"]))
 
     assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_ms"]))
     assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_q"]))

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/experimental/tests/test_sobol_lightcone.py

@@ -56,10 +56,8 @@ def test_sobol_lightcone_diffstar_cens():
     assert np.all(np.isfinite(cenpop["logssfr_obs"]))
     assert cenpop["logsm_obs"].min() > 4
 
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_ms"].ms_params))
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_ms"].q_params))
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_q"].ms_params))
-    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_q"].q_params))
+    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_ms"]))
+    assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_params_q"]))
 
     assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_ms"]))
     assert np.all(np.isfinite(cenpop["diffstarpop_data"]["sfh_q"]))

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/mc_diffsky.py

@@ -4,10 +4,10 @@ import os
 
 from diffmah.diffmahpop_kernels.bimod_censat_params import DEFAULT_DIFFMAHPOP_PARAMS
 from diffstar.defaults import T_TABLE_MIN
+from diffstar.diffstarpop import mc_diffstar_sfh_galpop
+from diffstar.diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
+from diffstar.diffstarpop.param_utils import mc_select_diffstar_params
 from diffstar.utils import cumulative_mstar_formed_galpop
-from diffstarpop import mc_diffstar_sfh_galpop
-from diffstarpop.defaults import DEFAULT_DIFFSTARPOP_PARAMS
-from diffstarpop.param_utils import mc_select_diffstar_params
 from dsps.cosmology import flat_wcdm
 from dsps.cosmology.defaults import DEFAULT_COSMOLOGY
 from jax import jit as jjit

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/param_utils/diffsky_param_wrapper.py

@@ -2,7 +2,7 @@
 
 from collections import namedtuple
 
-from diffstarpop import (
+from diffstar.diffstarpop import (
     DEFAULT_DIFFSTARPOP_PARAMS,
     DEFAULT_DIFFSTARPOP_U_PARAMS,
     get_bounded_diffstarpop_params,
@@ -41,10 +41,7 @@ DEFAULT_PARAM_COLLECTION = ParamCollection(
 
 
 def get_flat_param_names():
-    diffstarpop_pnames_flat = (
-        *DEFAULT_DIFFSTARPOP_PARAMS.sfh_pdf_cens_params._fields,
-        *DEFAULT_DIFFSTARPOP_PARAMS.satquench_params._fields,
-    )
+    diffstarpop_pnames_flat = (*DEFAULT_DIFFSTARPOP_PARAMS._fields,)
 
     burstpop_pnames_flat = (
         *spspu.DEFAULT_SPSPOP_PARAMS.burstpop_params.freqburst_params._fields,
@@ -76,10 +73,7 @@ def unroll_param_collection_into_flat_array(
     scatter_params,
     ssp_err_pop_params,
 ):
-    diffstarpop_params_flat = (
-        *diffstarpop_params.sfh_pdf_cens_params,
-        *diffstarpop_params.satquench_params,
-    )
+    diffstarpop_params_flat = diffstarpop_params
 
     burstpop_params_flat = (
         *spspop_params.burstpop_params.freqburst_params,
@@ -111,10 +105,7 @@ def unroll_u_param_collection_into_flat_array(
     scatter_u_params,
     ssp_err_pop_u_params,
 ):
-    diffstarpop_u_params_flat = (
-        *diffstarpop_u_params.u_sfh_pdf_cens_params,
-        *diffstarpop_u_params.u_satquench_params,
-    )
+    diffstarpop_u_params_flat = diffstarpop_u_params
 
     burstpop_params_flat = (
         *spspop_u_params.u_burstpop_params.freqburst_u_params,
@@ -190,23 +181,8 @@ def get_param_collection_from_u_param_collection(
 def get_u_param_collection_from_u_param_array(u_param_arr):
     u_params = UParamsFlat(*u_param_arr)
 
-    u_sfh_pdf_cens_params = [
-        getattr(u_params, name)
-        for name in DEFAULT_DIFFSTARPOP_U_PARAMS.u_sfh_pdf_cens_params._fields
-    ]
-    u_sfh_pdf_cens_params = DEFAULT_DIFFSTARPOP_U_PARAMS.u_sfh_pdf_cens_params._make(
-        u_sfh_pdf_cens_params
-    )
-    u_satquench_params = [
-        getattr(u_params, name)
-        for name in DEFAULT_DIFFSTARPOP_U_PARAMS.u_satquench_params._fields
-    ]
-    u_satquench_params = DEFAULT_DIFFSTARPOP_U_PARAMS.u_satquench_params._make(
-        u_satquench_params
-    )
-
     diffstarpop_u_params = DEFAULT_DIFFSTARPOP_U_PARAMS._make(
-        (u_sfh_pdf_cens_params, u_satquench_params)
+        [getattr(u_params, name) for name in DEFAULT_DIFFSTARPOP_U_PARAMS._fields]
     )
 
     u_mzr_params = [

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky/param_utils/tests/test_diffsky_param_wrapper.py

@@ -47,16 +47,8 @@ def test_get_param_collection_from_u_param_collection():
     u_param_collection2 = dpw.get_u_param_collection_from_param_collection(
         *param_collection
     )
-    assert np.allclose(
-        u_param_collection[0].u_sfh_pdf_cens_params,
-        u_param_collection2[0].u_sfh_pdf_cens_params,
-    )
-
-    assert np.allclose(
-        u_param_collection[0].u_satquench_params,
-        u_param_collection2[0].u_satquench_params,
-    )
 
+    assert np.allclose(u_param_collection[0], u_param_collection2[0])
     assert np.allclose(u_param_collection[1], u_param_collection2[1])
 
     assert np.allclose(

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.2.5
+Version: 0.3.0
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -41,8 +41,7 @@ License-File: LICENSE.rst
 Requires-Dist: numpy
 Requires-Dist: jax
 Requires-Dist: diffmah>=0.7.2
-Requires-Dist: diffstar>=0.3.4
-Requires-Dist: diffstarpop>=0.0.2
+Requires-Dist: diffstar>=1.0.0
 Requires-Dist: dsps>=0.4.5
 Requires-Dist: h5py
 Dynamic: license-file
@@ -50,8 +49,8 @@ Dynamic: license-file
 diffsky
 ============
 
-Diffsky is a python library based on JAX for producing mock catalogs based on 
-`diffstar <https://diffstar.readthedocs.io/en/latest/>`_ 
+Diffsky is a python library based on JAX for producing mock catalogs based on
+`diffstar <https://diffstar.readthedocs.io/en/latest/>`_
 and `dsps <https://dsps.readthedocs.io/en/latest/>`_.
 
 Installation
@@ -77,18 +76,7 @@ For a typical development environment in conda-forge::
 Documentation
 -------------
 
-Online documentation for diffsky is available at 
+Online documentation for diffsky is available at
 `diffsky.readthedocs.io <https://diffsky.readthedocs.io/en/latest/>`_.
 
-Testing
--------
-To run the suite of unit tests::
-
-    $ cd /path/to/root/diffsky
-    $ pytest
-
-To build html of test coverage::
-
-    $ pytest -v --cov --cov-report html
-    $ open htmlcov/index.html
 

{diffsky-0.2.5 → diffsky-0.3.0}/diffsky.egg-info/requires.txt

@@ -1,7 +1,6 @@
 numpy
 jax
 diffmah>=0.7.2
-diffstar>=0.3.4
-diffstarpop>=0.0.2
+diffstar>=1.0.0
 dsps>=0.4.5
 h5py

{diffsky-0.2.5 → diffsky-0.3.0}/docs/source/rtd_environment.yaml

@@ -15,7 +15,6 @@ dependencies:
   - jax
   - jaxlib
   - diffmah>=0.7.2
-  - diffstar>=0.3.4
+  - diffstar>=1.0.0
   - dsps>=0.4.5
-  - diffstarpop>=0.0.2
   - h5py

diffsky-0.3.0/requirements.txt

@@ -0,0 +1,6 @@
+numpy
+jax
+diffmah>=0.7.2
+diffstar>=1.0.0
+dsps>=0.4.5
+h5py

diffsky-0.2.5/diffsky/_version.py

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

diffsky-0.2.5/requirements.txt

@@ -1,7 +0,0 @@
-numpy
-jax
-diffmah>=0.7.2
-diffstar>=0.3.4
-diffstarpop>=0.0.2
-dsps>=0.4.5
-h5py