diffsky 0.2.5__tar.gz → 0.3.1__tar.gz

{diffsky-0.2.5 → diffsky-0.3.1}/.github/workflows/linting.yaml

@@ -1,4 +1,4 @@
-name: linting
+name: Flake8 test of source code
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: tests
+    name: flake8 diffsky scripts
     runs-on: "ubuntu-latest"
 
     steps:
@@ -32,7 +32,12 @@ jobs:
             flake8 \
             flake8-pyproject
 
-      - name: lint
+      - name: lint source code
         shell: bash -l {0}
         run: |
           flake8 diffsky
+
+      - name: lint scripts
+        shell: bash -l {0}
+        run: |
+          flake8 scripts

diffsky-0.3.1/.github/workflows/mock_generation_test.yaml

@@ -0,0 +1,111 @@
+name: Test mock-production script runs with synthetic halos
+
+on:
+  workflow_dispatch: null
+  schedule:
+    # Runs "every Monday & Thursday at 3:05am Central"
+    - cron: '5 8 * * 1,4'
+  push:
+    branches:
+      - main
+  pull_request: null
+
+jobs:
+  mock-generation:
+    name: python make_dbk_sed_lc_mock_lj.py -synthetic_cores 1
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          python-version: 3.11
+          channels: conda-forge,defaults
+          channel-priority: strict
+          show-channel-urls: true
+          miniforge-version: latest
+
+      - name: configure conda and install code
+        shell: bash -l {0}
+        env:
+          GITHUB_TOKEN: ${{ secrets.CPAC_PRIVATE_REPO_TOKEN }}
+          GITHUB_USER: ${{ secrets.GH_USR_TESTING_TOKEN }}
+
+        run: |
+          conda config --set always_yes yes
+          conda install --quiet \
+            --file=requirements.txt
+          conda install -y -q \
+            pip \
+            setuptools \
+            "setuptools_scm>=7,<8" \
+            matplotlib \
+            astropy \
+            h5py \
+            mpi4py
+          pip install git+https://github.com/ArgonneCPAC/HACCyTrees.git
+          pip uninstall diffmah --yes
+          pip uninstall diffstar --yes
+          pip uninstall dsps --yes
+          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
+          python -m pip install --no-build-isolation --no-deps -e .
+
+      - name: download dsps data
+        shell: bash -l {0}
+        run: |
+          # Create data directory
+          mkdir -p dsps_drn/filters
+
+          # Download data
+          cd dsps_drn
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/ssp_data_fsps_v3.2_lgmet_age.h5
+          cd filters
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_u_transmission.h5
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_g_transmission.h5
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_r_transmission.h5
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_i_transmission.h5
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_z_transmission.h5
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_y_transmission.h5
+          cd ..
+          cd ..
+
+          # Set environment variable
+          export DSPS_DRN="${GITHUB_WORKSPACE}/dsps_drn"
+          echo "DSPS_DRN=${DSPS_DRN}" >> $GITHUB_ENV
+
+      - name: run mock generation script
+        shell: bash -l {0}
+        run: |
+          # Create output directory
+          mkdir -p ci_test_output
+
+          # Run mock production script
+          mpiexec -n 1 python scripts/LJ_LC_MOCKS/make_dbk_sed_lc_mock_lj.py \
+            poboy \
+            0.01 \
+            0.2 \
+            0 \
+            1 \
+            ci_test_output \
+            ci_test_mock \
+            -fn_u_params sfh_model \
+            -sfh_model smdpl_dr1 \
+            -synthetic_cores 1 \
+            -lgmp_min 12.0 \
+            -lgmp_max 13.0
+
+      - name: verify script completed
+        shell: bash -l {0}
+        run: |
+          echo "Mock generation script completed successfully"
+
+      - name: validate mock
+        shell: bash -l {0}
+        run: |
+          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/synthetic_cores/smdpl_dr1
+

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

@@ -1,4 +1,4 @@
-name: Test for Warnings
+name: Monthly test for warnings in diffstuff main branches
 
 on:
   workflow_dispatch: null
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: tests
+    name: pytest with diffmah/diffstar/dsps@main
     runs-on: "ubuntu-latest"
 
     steps:
@@ -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.1}/.github/workflows/test_latest_releases.yaml

@@ -1,4 +1,4 @@
-name: test-latest-diffstuff-releases
+name: Test against latest diffstuff releases
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: test-latest-diffstuff-releases
+    name: pytest with latest releases on conda-forge
     runs-on: "ubuntu-latest"
 
     steps:

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

@@ -1,4 +1,4 @@
-name: test-main-branch-diffstuff
+name: Test with Main Branch Dependencies
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    name: test-main-branch-diffstuff
+    name: pytest with diffmah/diffstar/dsps@main
     runs-on: "ubuntu-latest"
 
     steps:
@@ -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.3.1/.github/workflows/test_new_diffstar.yaml

@@ -0,0 +1,90 @@
+name: Test against updated diffstar
+
+on:
+  push:
+    branches:
+      - main
+  pull_request: null
+
+jobs:
+  tests:
+    name: pytest with diffstar@refs/pull/108/head
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          python-version: 3.11
+          channels: conda-forge,defaults
+          channel-priority: strict
+          show-channel-urls: true
+          miniforge-version: latest
+
+      - name: configure conda and install code
+      # Test against current main branch of all diff+ dependencies
+        shell: bash -l {0}
+        env:
+          GITHUB_TOKEN: ${{ secrets.CPAC_PRIVATE_REPO_TOKEN }}
+          GITHUB_USER: ${{ secrets.GH_USR_TESTING_TOKEN }}
+
+      # Test against updated diffstar
+        run: |
+          conda config --set always_yes yes
+          conda install --quiet \
+            --file=requirements.txt
+          conda install -y -q \
+            flake8 \
+            pytest \
+            pytest-xdist \
+            pytest-cov \
+            pip \
+            setuptools \
+            "setuptools_scm>=7,<8" \
+            matplotlib \
+            astropy \
+            python-build
+          pip uninstall diffmah --yes
+          pip uninstall diffstar --yes
+          pip uninstall dsps --yes
+          pip install --no-deps git+https://github.com/ArgonneCPAC/diffmah.git
+          pip install --no-deps git+https://github.com/ArgonneCPAC/diffstar.git@refs/pull/108/head
+          pip install --no-deps git+https://github.com/ArgonneCPAC/dsps.git
+          python -m pip install --no-build-isolation --no-deps -e .
+
+      - name: test
+        shell: bash -l {0}
+        run: |
+          pytest -v diffsky --cov --cov-report=xml
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: test versions
+        shell: bash -el {0}
+        run: |
+          pip uninstall diffsky --yes
+          [[ $(python setup.py --version) != "0.0.0" ]] || exit 1
+
+          rm -rf dist/*
+          python setup.py sdist
+          pip install --no-deps --no-build-isolation dist/*.tar.gz
+          pushd ..
+          python -c "import diffsky; assert diffsky.__version__ != '0.0.0'"
+          popd
+          pip uninstall diffsky --yes
+
+          rm -rf dist/*
+          python -m build --sdist . --outdir dist
+          pip install --no-deps --no-build-isolation dist/*.tar.gz
+          pushd ..
+          python -c "import diffsky; assert diffsky.__version__ != '0.0.0'"
+          popd
+          pip uninstall diffsky --yes
+
+          python -m pip install -v --no-deps --no-build-isolation -e .

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

@@ -1,4 +1,4 @@
-name: test-main-branch-diffstuff
+name: Weekly cron testing
 
 on:
   workflow_dispatch: null
@@ -12,7 +12,7 @@ on:
 
 jobs:
   tests:
-    name: tests
+    name: pytest with diffmah/diffstar/dsps@main
     runs-on: "ubuntu-latest"
 
     steps:
@@ -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.1}/.gitignore

@@ -2,9 +2,11 @@ diffsky/_version.py
 
 Untitled*.ipynb
 *.h5
+*.hdf5
 *.pdf
 *.npy
 *.png
+*.txt
 
 scripts/*.cfg
 scripts/*.cfg~

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

@@ -1,3 +1,23 @@
+0.3.1 (2025-11-23)
+-------------------
+- Update diffsky to be compatible with diffstar v1.0.2 (https://github.com/ArgonneCPAC/diffsky/pull/277)
+- Add new module to recompute photometry from mock (https://github.com/ArgonneCPAC/diffsky/pull/272)
+- Implement mock-production validation test of recomputed photometry (https://github.com/ArgonneCPAC/diffsky/pull/274)
+- Add kernel to decompose SED into Disk/bulge/knot components (https://github.com/ArgonneCPAC/diffsky/pull/248)
+- Fix memory leak in SED mock production script (https://github.com/ArgonneCPAC/diffsky/pull/244)
+- Parallelize mock-production script (https://github.com/ArgonneCPAC/diffsky/pull/267)
+- Compute mock photometry in batches (https://github.com/ArgonneCPAC/diffsky/pull/269)
+- Add size and orientation of disk and bulge to galaxies in SED mock
+    - https://github.com/ArgonneCPAC/diffsky/pull/254
+    - https://github.com/ArgonneCPAC/diffsky/pull/265
+
+
+
+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.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.2.5
+Version: 0.3.1
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -40,9 +40,8 @@ Description-Content-Type: text/x-rst
 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: diffmah>=0.7.3
+Requires-Dist: diffstar>=1.0.1
 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.1}/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.1/diffsky/_version.py

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

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/__init__.py

@@ -1,5 +1,5 @@
-"""
-"""
+""" """
+
 # flake8: noqa
 
 from .diffburstpop import (

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diagnostics/plot_fburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from matplotlib import pyplot as plt

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diagnostics/plot_tburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from dsps.sfh import diffburst

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diagnostics/tests/test_plot_fburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import os
 

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diagnostics/tests/test_plot_tburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import os
 

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diffburstpop.py

@@ -1,5 +1,5 @@
-"""
-"""
+""" """
+
 from collections import namedtuple
 
 from dsps.sfh.diffburst import BurstParams, calc_bursty_age_weights

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diffqburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 from collections import namedtuple
 

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/diffqburstpop_mono_noise.py

@@ -13,7 +13,7 @@ from .fburstpop_mono import (
     get_fburst_from_fburstpop_params,
     get_unbounded_fburstpop_params,
     _get_bounded_fburstpop_param,
-    _get_unbounded_fburstpop_param
+    _get_unbounded_fburstpop_param,
 )
 from .freqburst_mono import (
     DEFAULT_FREQBURST_PARAMS,
@@ -88,7 +88,9 @@ def calc_bursty_age_weights_from_diffburstpop_params(
         diffburstpop_params.fburstpop_params, logsm, logssfr
     )
     ufburst = _get_unbounded_fburstpop_param(f_burst, FBURST_BOUNDS)
-    noisy_ufburst = _inverse_sigmoid(random_draw_burst, ufburst, scatter_params.fburst_scatter, 0.0, 1.0)
+    noisy_ufburst = _inverse_sigmoid(
+        random_draw_burst, ufburst, scatter_params.fburst_scatter, 0.0, 1.0
+    )
     noisy_fburst = _get_bounded_fburstpop_param(noisy_ufburst, FBURST_BOUNDS)
     lgfburst = jnp.log10(noisy_fburst)
 
@@ -113,7 +115,6 @@ def calc_bursty_age_weights_from_diffburstpop_u_params(
     smooth_age_weights,
     random_draw_burst,
     scatter_params,
-
 ):
     diffburstpop_params = get_bounded_diffburstpop_params(diffburstpop_u_params)
     args = (
@@ -123,7 +124,8 @@ def calc_bursty_age_weights_from_diffburstpop_u_params(
         ssp_lg_age_gyr,
         smooth_age_weights,
         random_draw_burst,
-        scatter_params)
+        scatter_params,
+    )
     age_weights, burst_params = calc_bursty_age_weights_from_diffburstpop_params(*args)
     return age_weights, burst_params
 

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/fburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 from collections import OrderedDict, namedtuple
 from copy import deepcopy

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/freqburst.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 from collections import OrderedDict, namedtuple
 

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tburstpop.py

@@ -1,5 +1,5 @@
-"""
-"""
+""" """
+
 from collections import OrderedDict, namedtuple
 
 from dsps.sfh.diffburst import (

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tests/test_diffburstpop.py

@@ -1,5 +1,5 @@
-"""
-"""
+""" """
+
 import numpy as np
 from dsps.sfh import diffburst
 from jax import random as jran

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tests/test_diffqburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from dsps.sfh import diffburst

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tests/test_fburstpop.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from jax import random as jran

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tests/test_fburstpop_mono.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from jax import nn

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tests/test_freqburst.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from jax import random as jran

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/burstpop/tests/test_tburstpop.py

@@ -1,5 +1,5 @@
-"""
-"""
+""" """
+
 import numpy as np
 from dsps.sfh.diffburst import (
     _pureburst_age_weights_from_params,

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/cosmos_utils/cosmos_mstar_model.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 from collections import OrderedDict, namedtuple
 

{diffsky-0.2.5 → diffsky-0.3.1}/diffsky/cosmos_utils/tests/test_cosmos_mstar_model.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import numpy as np
 from jax import random as jran

diffsky-0.3.1/diffsky/data_loaders/hacc_utils/data/DiscoveryLCDM/cosmo.txt

@@ -0,0 +1,7 @@
+3.069021325408406442e-01
+-1.000000000000000000e+00
+0.000000000000000000e+00
+6.796999999999999709e-01
+4.870213254084068688e-02
+8.135000000000000009e-01
+9.679999999999999716e-01