Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5597739
Create gd_bugfix_test.yaml
zaidikumail May 13, 2026
d566ee3
make phot predictions use obs_mags_weighted from gd_phot_kernels_merging
zaidikumail May 13, 2026
c7eac55
rename workflow gd_bugfix_test
zaidikumail May 13, 2026
f0b4337
update test_all_diffsky_u_param_grads_stay_nonzero_multistep to retur…
zaidikumail May 13, 2026
cdc08f9
spspop_fields
zaidikumail May 13, 2026
3b69f94
Update test_Np_specphot_opt.py
zaidikumail May 13, 2026
f9a73b9
Update test_Np_specphot_opt.py
zaidikumail May 13, 2026
5fe1494
perform grad tests separately on diffstarpop, spspop, etc.
zaidikumail May 13, 2026
3bd72da
parametrize grad test
zaidikumail May 13, 2026
b3ba954
Update test_Np_specphot_opt.py
zaidikumail May 14, 2026
1febba2
magthresh=25.
zaidikumail May 14, 2026
26ac0b2
streamline zero_grad_params extraction
zaidikumail May 14, 2026
25a163b
update satquench plotting
zaidikumail May 14, 2026
e86a036
LH_D_MAG = 0.5 --> 0.7 for feniks
zaidikumail May 14, 2026
df21444
update config
zaidikumail May 14, 2026
8be65f6
frac_N_centroids instead of N_centroids
zaidikumail May 14, 2026
6b14b4b
Update load_feniks.py
zaidikumail May 14, 2026
b0ab7ba
revert to N_centroids
zaidikumail May 14, 2026
d4c86be
plot_sat_tquench
zaidikumail May 15, 2026
f28ab21
update load_feniks
zaidikumail May 16, 2026
7ce78e3
LH_D_MAG
zaidikumail May 16, 2026
65022ec
Update load_feniks.py
zaidikumail May 17, 2026
b92c437
FENIKS_Z
zaidikumail May 17, 2026
84468fb
LH_N_CEN
zaidikumail May 17, 2026
9e3f880
LH_D_MAG=0.5
zaidikumail May 17, 2026
61e0294
supply lh_d_mag through config file to fit_diffsky
zaidikumail May 17, 2026
cbf2bce
LH_N_CENTROIDS=15000
zaidikumail May 17, 2026
c4737e3
FENIKS_MAGOTHER_THRESH = 26.0
zaidikumail May 17, 2026
334c245
FENIKS_MAGOTHER_THRESH = 27.0
zaidikumail May 17, 2026
5328e79
FENIKS_MAGOTHER_THRESH = 26.0
zaidikumail May 17, 2026
66a1c53
diffsky@gd_bugfix_rapid_q test workflow
zaidikumail May 19, 2026
6c5e90a
Merge branch 'main' into gd_bugfix_test
zaidikumail May 19, 2026
7692c1a
fix conftest
zaidikumail May 19, 2026
956af0d
Merge branch 'gd_bugfix_test' of https://github.com/ArgonneCPAC/diffh…
zaidikumail May 19, 2026
898c0d5
Update load_feniks.py
zaidikumail May 19, 2026
3430ce1
lh_d_mag default arg into get_feniks_data
zaidikumail May 19, 2026
1bf8e7b
load_sdss
zaidikumail May 19, 2026
f0ef4bd
LH_D_MAG=0.02 for sdss
zaidikumail May 19, 2026
52b8350
LH_D_MAG = 0.1 sdss
zaidikumail May 19, 2026
6f56ce0
add u band in fit dim sdss
zaidikumail May 20, 2026
8c96470
get_param_collection_from_u_theta_npz
zaidikumail May 20, 2026
b3e77af
plot_fburstpop
zaidikumail May 20, 2026
e7a68cc
sample sdss finely
zaidikumail May 20, 2026
f31eb7f
remove shifts in lh cens sdss
zaidikumail May 20, 2026
f9b7e18
plot_lgfburst_mh_z
zaidikumail May 22, 2026
74f0579
remove fit_hizels for now
zaidikumail May 24, 2026
2e64aa0
update load sdss feniks
zaidikumail May 25, 2026
88c8f1c
sample feniks bright end better
zaidikumail May 25, 2026
f758aeb
same sdss bright end better
zaidikumail May 25, 2026
153b48a
Update load_sdss.py
zaidikumail May 25, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions .github/workflows/gd_bugfix_rapid_q.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: pytest against diffsky:gd_bugfix

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:
tests:
name: pytest with diffsky@gd_bugfix_rapid_q
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}
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" \
scipy \
python-build
pip uninstall diffsky --yes
pip install --no-deps git+https://github.com/ArgonneCPAC/diffsky.git@gd_bugfix_rapid_q

python -m pip install --no-build-isolation --no-deps -e .

- name: test
shell: bash -l {0}
run: |
pytest -v diffhtwo --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 diffhtwo --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 diffhtwo; assert diffhtwo.__version__ != '0.0.0'"
popd
pip uninstall diffhtwo --yes

rm -rf dist/*
python -m build --sdist . --outdir dist
pip install --no-deps --no-build-isolation dist/*.tar.gz
pushd ..
python -c "import diffhtwo; assert diffhtwo.__version__ != '0.0.0'"
popd
pip uninstall diffhtwo --yes

python -m pip install -v --no-deps --no-build-isolation -e .
35 changes: 19 additions & 16 deletions diffhtwo/experimental/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
ZOUT = "feniks_zout_selected_for_testing.ecsv"


@pytest.fixture(scope="session")
def ran_key():
return jran.key(0)


@pytest.fixture(scope="session")
def fake_subset_ssp_data():
ssp_data = retrieve_fake_fsps_data.load_fake_ssp_data()
Expand All @@ -33,9 +38,9 @@ def fake_subset_ssp_data():


@pytest.fixture(scope="session")
def feniks(fake_subset_ssp_data):
def feniks(ran_key, fake_subset_ssp_data):
ssp_data, emline_wave_aa = fake_subset_ssp_data
ran_key = jran.key(0)

feniks = load_feniks.get_feniks_data(
FENIKS_DRN,
ran_key,
Expand All @@ -47,9 +52,9 @@ def feniks(fake_subset_ssp_data):


@pytest.fixture(scope="session")
def hizels(fake_subset_ssp_data, feniks_tcurves):
def hizels(ran_key, fake_subset_ssp_data, feniks_tcurves):
ssp_data, emline_wave_aa = fake_subset_ssp_data
ran_key = jran.key(0)

hizels = load_hizels.get_hizels_data(
HIZELS_DRN,
ran_key,
Expand All @@ -71,14 +76,13 @@ def feniks_tcurves():


@pytest.fixture(scope="session")
def feniks_single_z_data(fake_subset_ssp_data, feniks):
def feniks_single_z_data(ran_key, fake_subset_ssp_data, feniks):
ssp_data, emline_wave_aa = fake_subset_ssp_data

z_min = 0.2
z_max = 1.0
N_centroids = 100

ran_key = jran.key(0)
feniks_meta_data, feniks_fitting_data = lhu.get_single_zbin_lh_lc(
ran_key,
feniks,
Expand All @@ -91,15 +95,16 @@ def feniks_single_z_data(fake_subset_ssp_data, feniks):


@pytest.fixture(scope="session")
def feniks_multi_z_data(fake_subset_ssp_data, feniks):
def feniks_multi_z_data(ran_key, fake_subset_ssp_data, feniks):
ssp_data, emline_wave_aa = fake_subset_ssp_data

ran_key = jran.key(0)
feniks_z_min = [0.2, 1]
feniks_z_max = [1, 2]

z_mins = [0.2, 1.0]
z_maxs = [1.0, 2.0]
z_mins = feniks_z_min[:2]
z_maxs = feniks_z_max[:2]

N_centroids = 200
N_centroids = 100
num_halos = 100
feniks_meta_data, feniks_fitting_data = lhu.get_zbins_lh_lc(
ran_key,
Expand All @@ -114,22 +119,20 @@ def feniks_multi_z_data(fake_subset_ssp_data, feniks):


@pytest.fixture(scope="session")
def feniks_lc_data(fake_subset_ssp_data, feniks):
def feniks_lc_data(ran_key, fake_subset_ssp_data, feniks):
ssp_data, emline_wave_aa = fake_subset_ssp_data
tcurves = feniks.filter_info.tcurves

ran_key = jran.key(0)

z_min = 0.2
z_max = 0.5
z_max = 1.0
n_z_phot_table = 15
z_phot_table = 10 ** jnp.linspace(
jnp.log10(z_min), jnp.log10(z_max), n_z_phot_table
)

num_halos = 100
lgmp_min = 10.0
lgmp_max = 15
lgmp_max = 15.0
lc_sky_area_degsq = 100

lc_data = generate_lc_data(
Expand Down
Loading
Loading