diffsky 0.3.5__tar.gz → 0.3.7__tar.gz

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/linting.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - uses: conda-incubator/setup-miniconda@v4
         with:

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/mockgen_opencosmo_main.yaml

@@ -15,6 +15,10 @@ jobs:
     name: python make_lj_mock.py testing_lj_mock_config.yaml
     runs-on: "ubuntu-latest"
 
+    env:
+      # Force UCX to use standard TCP/shared memory
+      UCX_TLS: "tcp,self,sm"
+
     steps:
       - name: free disk space
         uses: endersonmenezes/free-disk-space@v3
@@ -24,7 +28,7 @@ jobs:
           remove_haskell: true
           rm_cmd: "rmz"
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -71,27 +75,38 @@ jobs:
 
           python -m pip install --no-build-isolation --no-deps -e .
 
+      - name: check download IP addresses
+        shell: bash -l {0}
+        run: |
+          curl -4 https://api.ipify.org
+          curl -6 https://api6.ipify.org || echo "No IPv6"
+
       - name: download dsps data
+        timeout-minutes: 5
         shell: bash -l {0}
         run: |
+          WGET_OPTS="-4 --tries=3 --timeout=30 --waitretry=5 --retry-connrefused"
+
           # 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_emlines.sparse.hdf5
-          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/fsps_v0.4.7_mist_c3k_a_kroupa_wNE_logGasU-2.0_logGasZ0.0.sparse.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/ssp-data-v1/fsps_v0.4.7_mist_c3k_a_kroupa_wNE_logGasU-2.0_logGasZ0.0.sparse.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
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_u_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_g_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_r_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_i_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_z_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_y_transmission.h5
           cd ..
           cd ..
 
+          # download lc_cores-decomposition.txt
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/hacc-data-lastjourney-v1/lc_cores-decomposition.txt
+
           # Set environment variable
           export DSPS_DRN="${GITHUB_WORKSPACE}/dsps_drn"
           echo "DSPS_DRN=${DSPS_DRN}" >> $GITHUB_ENV
@@ -105,6 +120,8 @@ jobs:
           # Run mock production script
           mpiexec -n 1 python scripts/LJ_LC_MOCKS/make_lj_mock.py scripts/LJ_LC_MOCKS/testing_lj_mock_config.yaml
 
+          mv lc_cores-decomposition.txt ci_test_output/dummy_version_name/
+
       - name: verify script completed
         shell: bash -l {0}
         run: |
@@ -113,29 +130,29 @@ jobs:
       - name: validate mock
         shell: bash -l {0}
         run: |
-          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/dummy_version_name
-
-      # - name: Create dummy diffsky galaxies for OpenCosmo
-      #   shell: bash -l {0}
-      #   run: |
-      #     python scripts/LJ_LC_MOCKS/create_dummy_mock_data.py ci_test_output/dummy_version_name
-
-      # - name: OpenCosmo toolkit data conversion
-      #   shell: bash -l {0}
-      #   run: |
-      #     mkdir -p ci_test_output/oc_dummy_version_name
-      #     cp ci_test_output/dummy_version_name/* ci_test_output/oc_dummy_version_name/
-      #     rm -rf ci_test_output/oc_dummy_version_name/lc_cores*.hdf5
-      #     diffpipe run ci_test_output/dummy_version_name ci_test_output/oc_dummy_version_name -n 2
-
-      # - name: Run tests on OpenCosmo-formatted data
-      #   shell: bash -l {0}
-      #   run: |
-      #     echo "ci_test_output/oc_dummy_version_name ready for testing"
-      #     # Here we can execute a testing script of ci_test_output/oc_dummy_version_name
-      #     export RUN_OPENCOSMO_TESTS="true"
-      #     export OPENCOSMO_DIFFSKY_DATA_PATH="ci_test_output/oc_dummy_version_name"
-      #     pytest diffsky/data_loaders/opencosmo_utils/test
+          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py scripts/LJ_LC_MOCKS/testing_lj_mock_config.yaml
+
+      - name: Create dummy diffsky galaxies for OpenCosmo
+        shell: bash -l {0}
+        run: |
+          python scripts/LJ_LC_MOCKS/create_dummy_mock_data.py ci_test_output/dummy_version_name
+
+      - name: OpenCosmo toolkit data conversion
+        shell: bash -l {0}
+        run: |
+          mkdir -p ci_test_output/oc_dummy_version_name
+          cp ci_test_output/dummy_version_name/* ci_test_output/oc_dummy_version_name/
+          rm -rf ci_test_output/oc_dummy_version_name/lc_cores*.hdf5
+          diffpipe run ci_test_output/dummy_version_name ci_test_output/oc_dummy_version_name -n 2
+
+      - name: Run tests on OpenCosmo-formatted data
+        shell: bash -l {0}
+        run: |
+          echo "ci_test_output/oc_dummy_version_name ready for testing"
+          # Here we can execute a testing script of ci_test_output/oc_dummy_version_name
+          export RUN_OPENCOSMO_TESTS="true"
+          export OPENCOSMO_DIFFSKY_DATA_PATH="ci_test_output/oc_dummy_version_name"
+          pytest diffsky/data_loaders/opencosmo_utils/test
 
       - name: remove cosmos_fit mock
         shell: bash -l {0}

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/mockgen_opencosmo_release.yaml

@@ -15,6 +15,10 @@ jobs:
     name: python make_lj_mock.py testing_lj_mock_config.yaml
     runs-on: "ubuntu-latest"
 
+    env:
+      # Force UCX to use standard TCP/shared memory
+      UCX_TLS: "tcp,self,sm"
+
     steps:
       - name: free disk space
         uses: endersonmenezes/free-disk-space@v3
@@ -24,7 +28,7 @@ jobs:
           remove_haskell: true
           rm_cmd: "rmz"
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -71,41 +75,33 @@ jobs:
 
           python -m pip install --no-build-isolation --no-deps -e .
 
-      - name: check opencosmo version
-        shell: bash -l {0}
-        env:
-          GH_TOKEN: ${{ secrets.CPAC_PRIVATE_REPO_TOKEN }}
-        run: |
-          OPENCOSMO_CURRENT_VERSION=$(gh release view --repo ArgonneCPAC/OpenCosmo --json tagName --jq .tagName)
-          OPENCOSMO_INSTALLED_VERSION=$(conda list opencosmo | awk 'NR==4 {print $2}')
-          if [[ "$OPENCOSMO_CURRENT_VERSION" != "$OPENCOSMO_INSTALLED_VERSION" ]]; then
-            echo "Error: installed opencosmo ${OPENCOSMO_LATEST_VERSION} but latest version is ${OPENCOSMO_CURRENT_VERSION}"
-            exit 1
-          else
-            echo "Successfully installed opencosmo ${OPENCOSMO_LATEST_VERSION}"
-          fi
-
 
       - name: download dsps data
+        timeout-minutes: 5
         shell: bash -l {0}
         run: |
+          WGET_OPTS="-4 --tries=3 --timeout=30 --waitretry=5 --retry-connrefused"
+
           # 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_emlines.sparse.hdf5
-          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/fsps_v0.4.7_mist_c3k_a_kroupa_wNE_logGasU-2.0_logGasZ0.0.sparse.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/ssp-data-v1/fsps_v0.4.7_mist_c3k_a_kroupa_wNE_logGasU-2.0_logGasZ0.0.sparse.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
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_u_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_g_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_r_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_i_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_z_transmission.h5
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_y_transmission.h5
           cd ..
           cd ..
 
+          # download lc_cores-decomposition.txt
+          wget $WGET_OPTS https://github.com/ArgonneCPAC/diffsky-data/releases/download/hacc-data-lastjourney-v1/lc_cores-decomposition.txt
+
           # Set environment variable
           export DSPS_DRN="${GITHUB_WORKSPACE}/dsps_drn"
           echo "DSPS_DRN=${DSPS_DRN}" >> $GITHUB_ENV
@@ -119,6 +115,8 @@ jobs:
           # Run mock production script
           mpiexec -n 1 python scripts/LJ_LC_MOCKS/make_lj_mock.py scripts/LJ_LC_MOCKS/testing_lj_mock_config.yaml
 
+          mv lc_cores-decomposition.txt ci_test_output/dummy_version_name/
+
       - name: verify script completed
         shell: bash -l {0}
         run: |
@@ -127,27 +125,27 @@ jobs:
       - name: validate mock
         shell: bash -l {0}
         run: |
-          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/dummy_version_name
-
-      # - name: Create dummy diffsky galaxies for OpenCosmo
-      #   shell: bash -l {0}
-      #   run: |
-      #     python scripts/LJ_LC_MOCKS/create_dummy_mock_data.py ci_test_output/dummy_version_name
-
-      # - name: OpenCosmo toolkit data conversion
-      #   shell: bash -l {0}
-      #   run: |
-      #     mkdir -p ci_test_output/oc_dummy_version_name
-      #     cp ci_test_output/dummy_version_name/* ci_test_output/oc_dummy_version_name/
-      #     rm -rf ci_test_output/oc_dummy_version_name/lc_cores*.hdf5
-      #     diffpipe run ci_test_output/dummy_version_name ci_test_output/oc_dummy_version_name -n 2
-
-      # - name: Run tests on OpenCosmo-formatted data
-      #   shell: bash -l {0}
-      #   run: |
-      #     export RUN_OPENCOSMO_TESTS="true"
-      #     export OPENCOSMO_DIFFSKY_DATA_PATH="ci_test_output/oc_dummy_version_name"
-      #     pytest diffsky/data_loaders/opencosmo_utils/test
+          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py scripts/LJ_LC_MOCKS/testing_lj_mock_config.yaml
+
+      - name: Create dummy diffsky galaxies for OpenCosmo
+        shell: bash -l {0}
+        run: |
+          python scripts/LJ_LC_MOCKS/create_dummy_mock_data.py ci_test_output/dummy_version_name
+
+      - name: OpenCosmo toolkit data conversion
+        shell: bash -l {0}
+        run: |
+          mkdir -p ci_test_output/oc_dummy_version_name
+          cp ci_test_output/dummy_version_name/* ci_test_output/oc_dummy_version_name/
+          rm -rf ci_test_output/oc_dummy_version_name/lc_cores*.hdf5
+          diffpipe run ci_test_output/dummy_version_name ci_test_output/oc_dummy_version_name -n 2
+
+      - name: Run tests on OpenCosmo-formatted data
+        shell: bash -l {0}
+        run: |
+          export RUN_OPENCOSMO_TESTS="true"
+          export OPENCOSMO_DIFFSKY_DATA_PATH="ci_test_output/oc_dummy_version_name"
+          pytest diffsky/data_loaders/opencosmo_utils/test
 
 
       - name: remove cosmos_fit mock

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/monthly-warning-test.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -64,6 +64,10 @@ jobs:
 
       - name: test that no warnings are raised
         shell: bash -l {0}
+        env:
+          OMP_NUM_THREADS: "1"
+          MKL_NUM_THREADS: "1"
+          OPENBLAS_NUM_THREADS: "1"
         run: |
           export PYTHONWARNINGS=error
-          pytest -v diffsky --cov --cov-report=xml
+          pytest -v diffsky --cov --cov-report=xml

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/test_latest_releases.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -56,11 +56,15 @@ jobs:
 
       - name: test
         shell: bash -l {0}
+        env:
+          OMP_NUM_THREADS: "1"
+          MKL_NUM_THREADS: "1"
+          OPENBLAS_NUM_THREADS: "1"
         run: |
           pytest -v diffsky --cov --cov-report=xml
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/test_main_branch.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -64,11 +64,15 @@ jobs:
 
       - name: test
         shell: bash -l {0}
+        env:
+          OMP_NUM_THREADS: "1"
+          MKL_NUM_THREADS: "1"
+          OPENBLAS_NUM_THREADS: "1"
         run: |
           pytest -v diffsky --cov --cov-report=xml
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/test_main_branch_no_extra_deps.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -67,11 +67,15 @@ jobs:
 
       - name: test
         shell: bash -l {0}
+        env:
+          OMP_NUM_THREADS: "1"
+          MKL_NUM_THREADS: "1"
+          OPENBLAS_NUM_THREADS: "1"
         run: |
           pytest -v diffsky --cov --cov-report=xml
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

{diffsky-0.3.5 → diffsky-0.3.7}/.github/workflows/tests_cron.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -68,11 +68,15 @@ jobs:
 
       - name: test
         shell: bash -l {0}
+        env:
+          OMP_NUM_THREADS: "1"
+          MKL_NUM_THREADS: "1"
+          OPENBLAS_NUM_THREADS: "1"
         run: |
           pytest -v diffsky --cov --cov-report=xml
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

{diffsky-0.3.5 → diffsky-0.3.7}/.gitignore

@@ -10,6 +10,7 @@ Untitled*.ipynb
 
 scripts/*.cfg
 scripts/*.cfg~
+docs/source/mock_download_dir
 
 .DS_Store
 **/.DS_Store
@@ -17,6 +18,7 @@ scripts/*.cfg~
 docs/source/drn_dsps_temp/*
 ci_test_output/*
 docs/source/download_dir/*
+docs/source/mock_download_dir/*
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diffsky-0.3.7/.readthedocs.yml

@@ -0,0 +1,53 @@
+version: 2
+
+sphinx:
+  configuration: docs/source/conf.py
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "miniconda-latest"
+  jobs:
+    pre_build:
+      # Download DSPS SSP data and LSST filter curves
+      - mkdir -p docs/source/dsps_drn/filters
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/ssp-data-v1/fsps_v0.4.7_mist_c3k_a_kroupa_wNE_logGasU-2.0_logGasZ0.0.sparse.h5 -P docs/source/dsps_drn
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_u_transmission.h5 -P docs/source/dsps_drn/filters
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_g_transmission.h5 -P docs/source/dsps_drn/filters
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_r_transmission.h5 -P docs/source/dsps_drn/filters
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_i_transmission.h5 -P docs/source/dsps_drn/filters
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_z_transmission.h5 -P docs/source/dsps_drn/filters
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/filters-v1/lsst_y_transmission.h5 -P docs/source/dsps_drn/filters
+      - export DSPS_DRN="dsps_drn"
+
+      # Download a pre-computed example mock for use in demo notebooks
+      - mkdir -p docs/source/mock_download_dir
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/hacc-data-lastjourney-v1/lc_cores-decomposition.txt -P docs/source/mock_download_dir
+
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/mock-galaxies-v1/diffsky_cosmos_260316_05_03_2026_param_collection.hdf5 -P docs/source/mock_download_dir
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/mock-galaxies-v1/diffsky_cosmos_260316_05_03_2026_ssp_data.hdf5 -P docs/source/mock_download_dir
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/mock-galaxies-v1/diffsky_cosmos_260316_05_03_2026_transmission_curves.hdf5 -P docs/source/mock_download_dir
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/mock-galaxies-v1/diffsky_cosmos_260316_05_03_2026_t_table.hdf5 -P docs/source/mock_download_dir
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/mock-galaxies-v1/lc_cores-442.0.diffsky_gals.hdf5 -P docs/source/mock_download_dir
+      - wget -q https://github.com/ArgonneCPAC/diffsky-data/releases/download/mock-galaxies-v1/lc_cores-453.0.diffsky_gals.hdf5 -P docs/source/mock_download_dir
+
+      # # Generate the mock
+      # - export DSPS_DRN="${PWD}/dsps_drn" && python scripts/LJ_LC_MOCKS/make_lj_mock.py scripts/LJ_LC_MOCKS/testing_lj_mock_config.yaml
+      # - export DSPS_DRN="${PWD}/dsps_drn" && python scripts/LJ_LC_MOCKS/create_dummy_mock_data.py ci_test_output/dummy_version_name
+
+      # # Copy mock data to where the notebook expects it
+      # - cp ci_test_output/dummy_version_name/* docs/source/mock_download_dir/
+
+      # Use the toolkit to create OpenCosmo-formatted data
+      - mkdir -p docs/source/oc_download_dir
+      - diffpipe run docs/source/mock_download_dir docs/source/oc_download_dir -n 2
+      - cp docs/source/mock_download_dir/diffsky_*.hdf5 docs/source/oc_download_dir/
+      - cp docs/source/mock_download_dir/lc_cores-decomposition.txt docs/source/oc_download_dir/
+
+conda:
+  environment: docs/source/rtd_environment.yaml
+
+python:
+  install:
+    - method: pip
+      path: .

{diffsky-0.3.5 → diffsky-0.3.7}/CHANGES.rst

@@ -1,3 +1,24 @@
+0.3.7 (2026-08-05)
+-------------------
+- Reinstate OpenCosmo docs (https://github.com/ArgonneCPAC/diffsky/pull/439)
+- Migrate top-level modules into subdirectories
+    - phot_utils.py: https://github.com/ArgonneCPAC/diffsky/pull/449
+    - soft_histograms: https://github.com/ArgonneCPAC/diffsky/pull/450
+- Fix bug in `ra, dec`. This bug created a 180 degree offset in RA/phi co-ordinates, which rotated the galaxies away from the dark matter, leading to zero gg-lensing signal (https://github.com/ArgonneCPAC/diffsky/pull/456)
+- Add documentation of Monte Carlo lightcone generators based on diffhalos (https://github.com/ArgonneCPAC/diffsky/pull/458)
+- Ship physical km/s peculiar velocity instead of comoving km/s (https://github.com/ArgonneCPAC/diffsky/pull/464)
+- Remove obsolete prototype calibrations and bring in new models (https://github.com/ArgonneCPAC/diffsky/pull/466)
+- Fix bug in `ra, dec` for synthetic halos (https://github.com/ArgonneCPAC/diffsky/pull/469)
+- Fix bug in ellipsoidal shapes (https://github.com/ArgonneCPAC/diffsky/pull/468)
+- Retune disk axis ratio distribution and size--mass relation (https://github.com/ArgonneCPAC/diffsky/pull/470)
+- Version of code used to produce `c260710_08_02_2026`
+
+
+0.3.6 (2026-06-12)
+-------------------
+- Version of code used to produce cosmos_260316_06_05_2026
+
+
 0.3.5 (2026-05-29)
 -------------------
 - Update requirements for dsps>=0.4.8 and diffstar>=1.0.3 (https://github.com/ArgonneCPAC/diffsky/pull/428)

{diffsky-0.3.5/diffsky.egg-info → diffsky-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.3.5
+Version: 0.3.7
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -86,10 +86,8 @@ Latest version of diffsky mocks
 
 See `this OpenCosmo tutorial <https://github.com/ArgonneCPAC/opencosmo-examples/blob/main/03-Diffsky/demo_diffmah_diffstar.ipynb/>`_
 for information about how to access the latest mock with OpenCosmo.
-All the publicly available mocks are located at the following path on NERSC::
+The latest release of the mocks is publicly available on NERSC:
 
-    /global/cfs/cdirs/hacc/OpenCosmo/LastJourney/synthetic_galaxies/
+    /global/cfs/cdirs/hacc/OpenCosmo/LastJourney/synthetic_galaxies/c260710_08_02_2026
 
-For the most recent version of the mocks::
-
-    cosmos_260316_05_03_2026 (30 deg^2)
+See  `this PR <https://github.com/ArgonneCPAC/diffsky/pull/472/>`_ for further information about the latest mock.

{diffsky-0.3.5 → diffsky-0.3.7}/README.rst

@@ -36,10 +36,8 @@ Latest version of diffsky mocks
 
 See `this OpenCosmo tutorial <https://github.com/ArgonneCPAC/opencosmo-examples/blob/main/03-Diffsky/demo_diffmah_diffstar.ipynb/>`_
 for information about how to access the latest mock with OpenCosmo.
-All the publicly available mocks are located at the following path on NERSC::
+The latest release of the mocks is publicly available on NERSC:
 
-    /global/cfs/cdirs/hacc/OpenCosmo/LastJourney/synthetic_galaxies/
+    /global/cfs/cdirs/hacc/OpenCosmo/LastJourney/synthetic_galaxies/c260710_08_02_2026
 
-For the most recent version of the mocks::
-
-    cosmos_260316_05_03_2026 (30 deg^2)
+See  `this PR <https://github.com/ArgonneCPAC/diffsky/pull/472/>`_ for further information about the latest mock.

diffsky-0.3.7/diffsky/__init__.py

@@ -0,0 +1,8 @@
+""" """
+
+# flake8: noqa
+
+from ._version import __version__
+from .mass_functions.mc_diffmah_tpeak import mc_subhalos
+from .soft_histograms import diffndhist, diffndhist_lomem, signdhist, signdhist_lomem
+from .utils import phot_utils, tw_utils

diffsky-0.3.7/diffsky/_version.py

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

{diffsky-0.3.5 → diffsky-0.3.7}/diffsky/data_loaders/hacc_utils/data_validation/validate_lc_mock.py

@@ -2,17 +2,16 @@
 
 import os
 from glob import glob
-from jax import vmap
+
 import h5py
 import numpy as np
 import yaml
 from dsps.photometry import photometry_kernels as phk
-
+from jax import vmap
 
 from ....param_utils import diffsky_param_wrapper as dpw
 from .. import lc_mock as lcmp
-from .. import sed_from_mock
-from .. import load_flat_hdf5, load_lc_cf, load_lc_mock
+from .. import lightcone_utils, load_flat_hdf5, load_lc_cf, load_lc_mock, sed_from_mock
 
 REQUIRED_METADATA_ATTRS = ("creation_date", "README", "mock_version_name")
 REQUIRED_SOFTWARE_VERSION_INFO = (
@@ -29,7 +28,7 @@ BNPAT_LC_MOCK = "data-{0}.{1}.diffsky_gals.hdf5"
 YAML_REQ_LIST = ("drn_out", "z_min", "z_max")
 HLINE = "----------"
 
-
+BNAME_LC_PATCH_DECOMPOSITION = "lc_cores-decomposition.txt"
 BATCH_SIZE = 50
 
 
@@ -248,6 +247,9 @@ def check_metadata(fn_lc_mock):
         msg.append(s)
         return msg
 
+    _msg = check_lc_cores_decomposition(fn_lc_mock)
+    msg.extend(_msg)
+
     # Check for `index` in metadata
     try:
         assert "index" in all_metadata.keys()
@@ -298,16 +300,8 @@ def check_metadata(fn_lc_mock):
             # Check z_phot_table is reasonable
             z_phot_table = lcmp.load_diffsky_z_phot_table(fn_lc_mock)
             assert z_phot_table.size >= 2
-            # assert np.all(z_phot_table > -1)
-            # assert np.all(z_phot_table < 100)
-
-            # Check has ssp_data
-            # drn_mock = os.path.dirname(fn_lc_mock)
-            # check_has_ssp_data(drn_mock, mock_version_name)
-            # check_has_transmission_curves(drn_mock, mock_version_name)
-
-            # # Check has param_collection
-            # check_has_param_collection(drn_mock, mock_version_name)
+            assert np.all(z_phot_table > -1)
+            assert np.all(z_phot_table < 100)
 
         except:  # noqa
             s = "metadata is incorrect"
@@ -316,6 +310,25 @@ def check_metadata(fn_lc_mock):
     return msg
 
 
+def check_lc_cores_decomposition(fn_lc_mock, bn=BNAME_LC_PATCH_DECOMPOSITION):
+    msg = []
+    drn_mock = os.path.dirname(fn_lc_mock)
+    fn = os.path.join(drn_mock, bn)
+    try:
+        assert os.path.isfile(fn)
+    except AssertionError:
+        s = f"{fn} is missing"
+        msg.append(s)
+
+    try:
+        lightcone_utils.read_lc_ra_dec_patch_decomposition(fn)
+    except:  # noqa
+        s = f"Failure to read {fn} with read_lc_ra_dec_patch_decomposition"
+        msg.append(s)
+
+    return msg
+
+
 def check_host_pos_is_near_galaxy_pos(fn_lc_mock, data=None):
     """host position should be reasonably close to galaxy position"""
     if data is None: