Skip to content
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.

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

Batched to_tile_catalog #1057

Merged
merged 1 commit into from
Aug 10, 2024
Merged

Batched to_tile_catalog #1057

merged 1 commit into from
Aug 10, 2024

Conversation

YicunDuanUMich
Copy link
Collaborator

@YicunDuanUMich YicunDuanUMich commented Aug 10, 2024

  • remove the for loop over batch_size in to_tile_catalog
  • about 70x speedup for prcessing batch of size 64 (time decreases from about 0.7s to 0.01s)

Copy link

codecov bot commented Aug 10, 2024

Codecov Report

Attention: Patch coverage is 94.20290% with 4 lines in your changes missing coverage. Please review.

Project coverage is 80.75%. Comparing base (017a85c) to head (08ac47b).

Files Patch % Lines
bliss/catalog.py 94.20% 4 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1057      +/-   ##
==========================================
+ Coverage   80.74%   80.75%   +0.01%     
==========================================
  Files          23       23              
  Lines        3048     3061      +13     
==========================================
+ Hits         2461     2472      +11     
- Misses        587      589       +2     
Flag Coverage Δ
unittests 80.75% <94.20%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@jeff-regier jeff-regier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent

@jeff-regier jeff-regier merged commit 295902b into master Aug 10, 2024
3 checks passed
@jeff-regier jeff-regier deleted the yd/dc2_cataloging_08-10 branch August 10, 2024 17:55
timwhite0 added a commit that referenced this pull request Aug 13, 2024
…n script (#1058)

* Batched to_tile_catalog (#1057)

batched to_tile_catalog

Co-authored-by: Yicun Duan <pduan@deeplearning-01.stat.lsa.umich.edu>

* Add lensed ellipticities to tile catalog; ellipticity vs shear notebook

* Organize notebooks

* Script to generate DC2 pkl file with shear, conv, ellipticity, redshift

* Use avg ellipticity as baseline shear estimator; fix MSE bugs; remove baseline convergence estimator

* Try-except block in cached_dataset

* Update catalog and splits paths in config, update plots dir name

---------

Co-authored-by: Yicun Duan <144750316+YicunDuanUMich@users.noreply.github.com>
Co-authored-by: Yicun Duan <pduan@deeplearning-01.stat.lsa.umich.edu>
jeff-regier pushed a commit that referenced this pull request Aug 19, 2024
* WL: average ellipticity baseline estimator, lensing catalog generation script (#1058)

* Batched to_tile_catalog (#1057)

batched to_tile_catalog

Co-authored-by: Yicun Duan <pduan@deeplearning-01.stat.lsa.umich.edu>

* Add lensed ellipticities to tile catalog; ellipticity vs shear notebook

* Organize notebooks

* Script to generate DC2 pkl file with shear, conv, ellipticity, redshift

* Use avg ellipticity as baseline shear estimator; fix MSE bugs; remove baseline convergence estimator

* Try-except block in cached_dataset

* Update catalog and splits paths in config, update plots dir name

---------

Co-authored-by: Yicun Duan <144750316+YicunDuanUMich@users.noreply.github.com>
Co-authored-by: Yicun Duan <pduan@deeplearning-01.stat.lsa.umich.edu>

* merged new workflow changes

* Make lensed ellipticity compatible with new to_tile_catalog

* Remove unnecessary subclass of SimulatedDataset

* Add SDSS-like simulator capabilities to lensing_config

* Update image generation notebook under SDSS-like simulator

* updated vardist and lensing to filter ellip

* Preliminary version of redshift notebook

* fixed mag mask error in lensingdc2

* fixed ellip key set

* Small tweaks to lensing config and ellip/redshift notebooks

* New catalog merge strategy: notebook

* Update variable name for r-band magnitude after new merge strategy

* New catalog merge strategy: script

* Run dc2_generate_lensing_catalog in order

* Update splits path in config

* Squeeze tile dict in lensing_dc2 (like we did before)

* Don't use tract_filter when loading in object_with_truth_match

* Rerun ellipticity and redshift notebooks with new catalog

* fixed vardist nullgating

* Remove old notebooks

* Remove try-catch block from cached_dataset

* Remove print statements from lensing_encoder

* Pass flake8 check in catalog.py

* attempted fixed error with nullgating

---------

Co-authored-by: Yicun Duan <144750316+YicunDuanUMich@users.noreply.github.com>
Co-authored-by: Yicun Duan <pduan@deeplearning-01.stat.lsa.umich.edu>
Co-authored-by: shreyasc <shreyasc@umich.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants