Skip to content

diffsky optimization testing #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zaidikumail merged 1 commit into from
Jun 1, 2026
Merged

diffsky optimization testing #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion diffhtwo/experimental/data_loaders/load_feniks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def get_lh_centroids(dataset, lh_d_mag):
lh_centroids[:, -1] < (FENIKS_Z_MAX - (LH_D_Z / 2))
)
k_mask = lh_centroids[:, -2] < FENIKS_MAGK_THRESH
u_mask = lh_centroids[:, -3] < 25
u_mask = lh_centroids[:, -3] < 24.9
lh_centroids = lh_centroids[redshift_mask & k_mask & u_mask]

redshift_centers = [0.45, 0.95, 1.45, 1.95, 2.45, 2.95, 3.45, 3.95]
Expand Down
1 change: 0 additions & 1 deletion diffhtwo/experimental/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
FENIKS_Z_MIN = 0.2
FENIKS_Z_MAX = 3.0
FENIKS_MAGK_THRESH = 24.3 # col mag
FENIKS_MAGOTHER_THRESH = 27.0

SDSS_AREA_DEG2 = 7199
SDSS_Z_MIN = 0.02
Expand Down
10 changes: 5 additions & 5 deletions diffhtwo/experimental/optimizers/Np_specphot_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from jax import lax, value_and_grad, vmap
from jax.example_libraries import optimizers as jax_opt

from ..loss_kernels.emline_loss import _loss_emline_kern_multi_line_multi_z
# from ..loss_kernels.emline_loss import _loss_emline_kern_multi_line_multi_z
from ..loss_kernels.phot_loss import _loss_phot_kern

_L_pk = (
Expand Down Expand Up @@ -58,10 +58,10 @@ def _opt_update(opt_state, i):
)

# clip gradients
global_norm = jnp.sqrt(sum(jnp.sum(g**2) for g in grads))
tau = 1.0
scale = jnp.minimum(1.0, tau / (global_norm + 1e-6))
grads = tuple(g * scale for g in grads)
# global_norm = jnp.sqrt(sum(jnp.sum(g**2) for g in grads))
# tau = 1.0
# scale = jnp.minimum(1.0, tau / (global_norm + 1e-6))
# grads = tuple(g * scale for g in grads)

opt_state = opt_update(i, grads, opt_state)
return opt_state, loss
Expand Down
6 changes: 3 additions & 3 deletions scripts/config_diagnostics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
model_drn: /Users/kumail/diffdir/fits/run121
model_nickname: run121_diffstarpop+spspop+merging
fit_diagnostics_save_drn: /Users/kumail/diffdir/fits/run121/diagnostic_plots/diffstarpop+spspop+merging
model_drn: /Users/kumail/diffdir/fits/run122
model_nickname: run122_all
fit_diagnostics_save_drn: /Users/kumail/diffdir/fits/run122/diagnostic_plots/all

feniks_drn: /Users/kumail/diffdir/feniks
sdss_drn: /Users/kumail/diffdir/sdss
Expand Down
Loading