diffsky 0.3.5__tar.gz → 0.3.6__tar.gz

diffsky-0.3.5/.github/workflows/mockgen_opencosmo_release.yaml → diffsky-0.3.6/.github/workflows/mockgen_opencosmo_main.yaml

@@ -1,4 +1,4 @@
-name: make_lj_mock.py synthetic halos (opencosmo latest)
+name: make_lj_mock.py synthetic halos (opencosmo main)
 
 on:
   workflow_dispatch: null
@@ -57,7 +57,6 @@ jobs:
             mpich \
             pytest \
             opencosmo
-          conda install hdf5plugin=5.0
           conda uninstall diffmah --force
           conda uninstall diffstar --force
           conda uninstall dsps --force
@@ -67,42 +66,38 @@ jobs:
           pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/dsps.git
           pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/diffhalos.git
 
+          pip install git+https://github.com/ArgonneCPAC/opencosmo.git
           pip install git+https://github.com/AstroPatty/diffpipe.git
 
           python -m pip install --no-build-isolation --no-deps -e .
 
-      - name: check opencosmo version
+      - name: check download IP addresses
         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
-
+          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://portal.nersc.gov/project/hacc/aphearin/DSPS_data/ssp_data_fsps_v3.2_emlines.sparse.hdf5
+          wget $WGET_OPTS 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
+
           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://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_u_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_g_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_r_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_i_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_z_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_y_transmission.h5
           cd ..
           cd ..
 
@@ -129,29 +124,29 @@ jobs:
         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: 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: 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: 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}
         run: |
           rm -rf ci_test_output
-

diffsky-0.3.5/.github/workflows/mockgen_opencosmo_main.yaml → diffsky-0.3.6/.github/workflows/mockgen_opencosmo_release.yaml

@@ -1,4 +1,4 @@
-name: make_lj_mock.py synthetic halos (opencosmo main)
+name: make_lj_mock.py synthetic halos (opencosmo latest)
 
 on:
   workflow_dispatch: null
@@ -57,6 +57,7 @@ jobs:
             mpich \
             pytest \
             opencosmo
+          conda install hdf5plugin=5.0
           conda uninstall diffmah --force
           conda uninstall diffstar --force
           conda uninstall dsps --force
@@ -66,29 +67,31 @@ jobs:
           pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/dsps.git
           pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/diffhalos.git
 
-          pip install git+https://github.com/ArgonneCPAC/opencosmo.git
           pip install git+https://github.com/AstroPatty/diffpipe.git
 
           python -m pip install --no-build-isolation --no-deps -e .
 
+
       - 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://portal.nersc.gov/project/hacc/aphearin/DSPS_data/ssp_data_fsps_v3.2_emlines.sparse.hdf5
+          wget $WGET_OPTS 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
           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://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_u_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_g_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_r_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_i_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_z_transmission.h5
+          wget $WGET_OPTS https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_y_transmission.h5
           cd ..
           cd ..
 
@@ -115,29 +118,29 @@ jobs:
         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
+      - 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
         shell: bash -l {0}
         run: |
           rm -rf ci_test_output
+

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

@@ -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.6}/.github/workflows/test_latest_releases.yaml

@@ -56,6 +56,10 @@ 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
 

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

@@ -64,6 +64,10 @@ 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
 

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

@@ -67,6 +67,10 @@ 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
 

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

@@ -68,6 +68,10 @@ 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
 

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

@@ -1,3 +1,8 @@
+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.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.3.5
+Version: 0.3.6
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License

diffsky-0.3.6/diffsky/_version.py

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