diffsky 0.1.0__tar.gz → 0.1.1__tar.gz

{diffsky-0.1.0 → diffsky-0.1.1}/CHANGES.rst

@@ -1,3 +1,8 @@
+0.1.1 (2023-10-04)
+-------------------
+- Update calls to dsps v0.3.4
+
+
 0.1.0 (2023-10-03)
 -------------------
 - First release. Compatible with diffstar v0.2.1 and dsps v0.3.3.

{diffsky-0.1.0 → diffsky-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffsky
-Version: 0.1.0
+Version: 0.1.1
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -48,15 +48,15 @@ Requires-Dist: dsps
 diffsky
 ============
 
-Code for producing mock catalogs based on 
+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
 ------------
-The latest release of diffsky is available for installation with pip or conda::
+The latest release of diffsky is available for installation with pip or conda-forge::
 
-    $ conda install diffsky
+    $ conda install -c conda-forge diffsky
 
 
 To install diffsky into your environment from the source code::
@@ -67,9 +67,9 @@ To install diffsky into your environment from the source code::
 
 Conda environment
 ~~~~~~~~~~~~~~~~~
-For a typical development environment in conda::
+For a typical development environment in conda-forge::
 
-    $ conda create -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
+    $ conda create -c conda-forge -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
 
 
 Documentation

{diffsky-0.1.0 → diffsky-0.1.1}/README.rst

@@ -1,15 +1,15 @@
 diffsky
 ============
 
-Code for producing mock catalogs based on 
+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
 ------------
-The latest release of diffsky is available for installation with pip or conda::
+The latest release of diffsky is available for installation with pip or conda-forge::
 
-    $ conda install diffsky
+    $ conda install -c conda-forge diffsky
 
 
 To install diffsky into your environment from the source code::
@@ -20,9 +20,9 @@ To install diffsky into your environment from the source code::
 
 Conda environment
 ~~~~~~~~~~~~~~~~~
-For a typical development environment in conda::
+For a typical development environment in conda-forge::
 
-    $ conda create -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
+    $ conda create -c conda-forge -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
 
 
 Documentation

diffsky-0.1.1/diffsky/_version.py

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

{diffsky-0.1.0 → diffsky-0.1.1}/diffsky/experimental/dspspop/boris_dust.py

@@ -1,11 +1,12 @@
 """
 """
-from jax import jit as jjit
-from jax import vmap
+from collections import OrderedDict
+
 import numpy as np
+from dsps.utils import _inverse_sigmoid, _sigmoid, powerlaw_rvs
+from jax import jit as jjit
 from jax import numpy as jnp
-from dsps.utils import _sigmoid, _inverse_sigmoid, powerlaw_rvs
-from collections import OrderedDict
+from jax import vmap
 
 powerlaw_rvs_vmap = jjit(vmap(powerlaw_rvs, in_axes=(None, 0, 0, 0)))
 
@@ -195,11 +196,33 @@ def _age_dep_funo_from_params_kern(
 N_PARAMS = len(DEFAULT_PARAMS)
 _a = [0, 0, 0, None, *[None] * N_PARAMS]
 _b = [None, None, None, 0, *[None] * N_PARAMS]
+_age_dep_funo_from_params_singlegal = jjit(
+    vmap(_age_dep_funo_from_params_kern, in_axes=_b)
+)
 _age_dep_funo_from_params_vmap = jjit(
-    vmap(vmap(_age_dep_funo_from_params_kern, in_axes=_b), in_axes=_a)
+    vmap(_age_dep_funo_from_params_singlegal, in_axes=_a)
 )
 
 
+@jjit
+def _get_funo_from_params_singlegal(
+    gal_logsm, gal_logfburst, gal_logssfr, ssp_lg_age_gyr, funo_params
+):
+    return _age_dep_funo_from_params_singlegal(
+        gal_logsm, gal_logfburst, gal_logssfr, ssp_lg_age_gyr, *funo_params
+    )
+
+
+@jjit
+def _get_funo_from_u_params_singlegal(
+    gal_logsm, gal_logfburst, gal_logssfr, ssp_lg_age_gyr, funo_u_params
+):
+    funo_params = get_params_from_u_params(funo_u_params)
+    return _age_dep_funo_from_params_singlegal(
+        gal_logsm, gal_logfburst, gal_logssfr, ssp_lg_age_gyr, *funo_params
+    )
+
+
 @jjit
 def _get_funo_from_params_galpop(
     gal_logsm, gal_logfburst, gal_logssfr, ssp_lg_age_gyr, funo_params

{diffsky-0.1.0 → diffsky-0.1.1}/diffsky/experimental/dspspop/photpop.py

@@ -3,7 +3,7 @@
 from dsps.constants import SFR_MIN
 from dsps.cosmology.flat_wcdm import _age_at_z_kern
 from dsps.experimental.diffburst import _age_weights_from_u_params
-from dsps.metallicity.mzr import DEFAULT_MZR_PDICT, mzr_model
+from dsps.metallicity.mzr import DEFAULT_MET_PDICT, mzr_model
 from dsps.sed import calc_ssp_weights_sfh_table_lognormal_mdf
 from dsps.sed.stellar_age_weights import _calc_logsm_table_from_sfh_table
 from jax import jit as jjit
@@ -18,7 +18,7 @@ from .lgfburstpop import _get_lgfburst_galpop_from_u_params
 _A = (None, 0)
 _age_weights_from_u_params_vmap = jjit(vmap(_age_weights_from_u_params, in_axes=_A))
 
-DEFAULT_MZR_PARAMS = jnp.array(list(DEFAULT_MZR_PDICT.values()))
+DEFAULT_MET_PARAMS = jnp.array(list(DEFAULT_MET_PDICT.values()))
 _linterp_vmap = jjit(vmap(jnp.interp, in_axes=(None, None, 0)))
 
 _g = (None, 0, 0, None, None, None, None)
@@ -49,8 +49,7 @@ def get_obs_photometry_singlez(
     fracuno_pop_u_params,
     cosmo_params,
     z_obs,
-    met_params=DEFAULT_MZR_PARAMS,
-    lgmet_scatter=0.2,
+    met_params=DEFAULT_MET_PARAMS,
 ):
     """Compute apparent magnitudes of galaxies at a single redshift
 
@@ -143,7 +142,8 @@ def get_obs_photometry_singlez(
     gal_logsfr_t_obs = _linterp_vmap(lgt_obs, lgt_table, gal_logsfr_table)
     gal_logssfr_t_obs = gal_logsfr_t_obs - gal_logsm_t_obs
 
-    gal_lgmet = mzr_model(gal_logsm_t_obs, t_obs, *met_params[:-1])
+    mzr_params, lgmet_scatter = met_params[:-1], met_params[-1]
+    gal_lgmet = mzr_model(gal_logsm_t_obs, t_obs, *mzr_params)
 
     _res = calc_ssp_weights_sfh_table_lognormal_mdf_vmap(
         gal_t_table,

diffsky-0.1.1/diffsky/experimental/dspspop/tests/test_boris_dust.py

@@ -0,0 +1,36 @@
+"""
+"""
+import numpy as np
+
+from ..boris_dust import DEFAULT_U_PARAMS as DEFAULT_BORIS_U_PARAMS
+from ..boris_dust import (
+    _get_funo_from_params_singlegal,
+    _get_funo_from_u_params_singlegal,
+    get_params_from_u_params,
+    get_u_params_from_params,
+)
+
+
+def test_param_u_param_inversion():
+    p = get_params_from_u_params(DEFAULT_BORIS_U_PARAMS)
+    u_p = get_u_params_from_params(p)
+    assert np.allclose(u_p, DEFAULT_BORIS_U_PARAMS, rtol=1e-3)
+
+
+def test_get_funo_from_u_params_singlegal():
+    logsm, logfburst, logssfr = 10.0, -2.0, -10.5
+
+    n_age = 94
+    ssp_lg_age_gyr = np.linspace(5.5, 10.25, n_age) - 9.0
+    funo = _get_funo_from_u_params_singlegal(
+        logsm, logfburst, logssfr, ssp_lg_age_gyr, DEFAULT_BORIS_U_PARAMS
+    )
+    assert funo.shape == (n_age,)
+    assert np.all(funo >= 0)
+    assert np.all(funo <= 1)
+
+    params = get_params_from_u_params(DEFAULT_BORIS_U_PARAMS)
+    funo2 = _get_funo_from_params_singlegal(
+        logsm, logfburst, logssfr, ssp_lg_age_gyr, params
+    )
+    assert np.allclose(funo, funo2, rtol=1e-3)

{diffsky-0.1.0 → diffsky-0.1.1}/diffsky.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffsky
-Version: 0.1.0
+Version: 0.1.1
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -48,15 +48,15 @@ Requires-Dist: dsps
 diffsky
 ============
 
-Code for producing mock catalogs based on 
+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
 ------------
-The latest release of diffsky is available for installation with pip or conda::
+The latest release of diffsky is available for installation with pip or conda-forge::
 
-    $ conda install diffsky
+    $ conda install -c conda-forge diffsky
 
 
 To install diffsky into your environment from the source code::
@@ -67,9 +67,9 @@ To install diffsky into your environment from the source code::
 
 Conda environment
 ~~~~~~~~~~~~~~~~~
-For a typical development environment in conda::
+For a typical development environment in conda-forge::
 
-    $ conda create -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
+    $ conda create -c conda-forge -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
 
 
 Documentation

{diffsky-0.1.0 → diffsky-0.1.1}/diffsky.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ diffsky/experimental/dspspop/nagaraj22_dust.py
 diffsky/experimental/dspspop/photpop.py
 diffsky/experimental/dspspop/tests/__init__.py
 diffsky/experimental/dspspop/tests/test_attavpop.py
+diffsky/experimental/dspspop/tests/test_boris_dust.py
 diffsky/experimental/dspspop/tests/test_burstshapepop.py
 diffsky/experimental/dspspop/tests/test_dustdeltapop.py
 diffsky/experimental/dspspop/tests/test_lgfburstpop.py

{diffsky-0.1.0 → diffsky-0.1.1}/diffsky.egg-info/top_level.txt

@@ -1,3 +1,2 @@
-build
 diffsky
 dist

diffsky-0.1.1/docs/source/installation.rst

@@ -0,0 +1,31 @@
+Installation instructions
+=========================
+
+To install lsstdesc-diffsky into an existing environment with conda-forge::
+
+    $ conda install -c conda-forge diffsky
+    
+
+To create a new environment from scratch::
+
+    $ conda create -c conda-forge -n diffsky_env python=3.9 numpy jax pytest ipython jupyter matplotlib scipy h5py diffmah diffstar dsps diffsky
+
+
+Managing dependencies
+---------------------
+
+The above commands will install all the latest releases of the diffsky dependency chain. 
+This includes `numpy <https://numpy.org/>`__ and 
+`jax <https://jax.readthedocs.io/en/latest/>`__, 
+and also a collection of libraries implementing 
+the differentiable modeling ingredients: 
+`Diffmah <https://github.com/ArgonneCPAC/diffmah>`_, 
+`Diffstar <https://github.com/ArgonneCPAC/diffstar>`_, 
+and `DSPS <https://github.com/ArgonneCPAC/dsps>`_.
+
+Depending on your analysis, you may need to install a specific branch of diffsky 
+and/one of its dependencies. You can do this by cloning the GitHub repo of the code 
+for which you need a custom  version, checking out the appropriate version, 
+and running::
+
+    $ pip install . --no-deps

diffsky-0.1.0/diffsky/_version.py

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

diffsky-0.1.0/docs/source/installation.rst

@@ -1,48 +0,0 @@
-Installation instructions
-=========================
-
-Dependencies
-------------
-
-``diffsky`` requires `numpy <https://numpy.org/>`__ 
-and `jax <https://jax.readthedocs.io/en/latest/>`__, 
-and also a collection of libraries implementing 
-the differentiable modeling ingredients: 
-`Diffmah <https://github.com/ArgonneCPAC/diffmah>`_, 
-`Diffstar <https://github.com/ArgonneCPAC/diffstar>`_, 
-and `DSPS <https://github.com/ArgonneCPAC/dsps>`_.
-
-Installation
-------------
-
-Installing dependencies
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Beginning from an environment that includes numpy and a recent version of jax, 
-you can install the additional dependencies available on conda-forge as follows:
-
-       conda install -c conda-forge diffmah diffstar dsps
-
-Depending on the mock you are making, 
-note that for one or more of these dependencies, 
-you may need to install the main branch of the code.
-You can do this by cloning the GitHub repository and running the standard::
-
-       python setup.py install
-
-command or its usual variants, such as::
-
-       python setup.py install --prefix=/PATH/TO/INSTALL/DIRECTORY
-
-or::
-
-       pip install .
-
-Installing diffsky
-~~~~~~~~~~~~~~~~~~
-
-Once you have the dependencies installed, 
-``diffsky`` can be installed as usual::
-
-       python setup.py install
-