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

Jump to bottom

Update Association Catalog #145

Merged

smcguire-cmu merged 13 commits into main from sean/new-association-catalog

Oct 18, 2023

Contributor

smcguire-cmu commented Oct 11, 2023 •

edited

Loading

Change Description

Updates Association catalog to the new structure described in this design doc, changing the structure to be partitioned only by the left pixel.

Solution Description

Refactors code to read partition info from the Catalog class to a new HealpixDataset class, meant to be an abstract class used for any type of catalog that uses Healpix Partitioning.
Changes Catalog and AssociationCatalog class to inherit from this class instead of the base Dataset.
Updates AssociationCatalog loading and unit tests to the new format.
Removes paths.py methods used with old format.

Code Quality

I have read the Contribution Guide
My code follows the code style of this project
My code builds (or compiles) cleanly without any errors or warnings
My code contains relevant comments and necessary documentation

Project-Specific Pull Request Checklists

New Feature Checklist

I have added or updated the docstrings associated with my feature using the NumPy docstring format
I have updated the tutorial to highlight my new feature (if appropriate)
I have added unit/End-to-End (E2E) test cases to cover my new feature
My change includes a breaking change
- My change includes backwards compatibility and deprecation warnings (if possible)

smcguire-cmu added 5 commits

October 11, 2023 16:18


          Refactor healpix dataset from catalog

0022a03


          update association catalog to new format

2b6b932


          update association catalog unit tests

87466cf


          run black

7db88c7


          remove old paths

707b558

smcguire-cmu changed the title ~~Sean/new association catalog~~ Update Association Catalog

codecov bot commented Oct 11, 2023 •

edited

Loading

Codecov Report

Merging #145 (0fb0103) into main (f811ab3) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##              main      #145   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           46        47    +1     
  Lines         1523      1534   +11     
=========================================
+ Hits          1523      1534   +11

Files	Coverage Δ
src/hipscat/catalog/__init__.py	`100.00% <100.00%> (ø)`
...catalog/association_catalog/association_catalog.py	`100.00% <100.00%> (ø)`
src/hipscat/catalog/catalog.py	`100.00% <100.00%> (ø)`
src/hipscat/catalog/dataset/dataset.py	`100.00% <ø> (ø)`
...hipscat/catalog/healpix_dataset/healpix_dataset.py	`100.00% <100.00%> (ø)`
src/hipscat/inspection/almanac.py	`100.00% <100.00%> (ø)`
src/hipscat/inspection/almanac_info.py	`100.00% <100.00%> (ø)`
src/hipscat/io/__init__.py	`100.00% <ø> (ø)`
src/hipscat/io/file_io/__init__.py	`100.00% <ø> (ø)`
src/hipscat/io/file_io/file_io.py	`100.00% <100.00%> (ø)`
... and 3 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

github-actions bot commented Oct 11, 2023

Before	After	Ratio	Method
[`5603b17`]	[`3dedb51`]
215±5ms	215±2ms	1	benchmarks.time_test_alignment_even_sky
1.27±0.02s	1.25±0.01s	0.99	benchmarks.Suite.time_pixel_tree_creation
175±6ms	170±3ms	0.97	benchmarks.time_test_cone_filter_multiple_order

Click here to view all benchmarks.


          remove unused import

f640223

github-actions bot commented Oct 11, 2023

Before	After	Ratio	Method
[`5603b17`]	[`c426ddb`]
1.15±0s	1.22±0.02s	1.05	benchmarks.Suite.time_pixel_tree_creation
164±4ms	163±0.4ms	0.99	benchmarks.time_test_cone_filter_multiple_order
221±2ms	216±3ms	0.98	benchmarks.time_test_alignment_even_sky

Click here to view all benchmarks.


          fix coverage

360e2a5

github-actions bot commented Oct 11, 2023

Before	After	Ratio	Method
[`5603b17`]	[`2e61946`]
135±0.5ms	138±0.6ms	1.02	benchmarks.time_test_cone_filter_multiple_order
973±2ms	978±7ms	1	benchmarks.Suite.time_pixel_tree_creation
180±0.2ms	180±0.6ms	1	benchmarks.time_test_alignment_even_sky

Click here to view all benchmarks.


          run isort

31f0131

github-actions bot commented Oct 11, 2023

Before	After	Ratio	Method
[`5603b17`]	[`420acab`]
179±0.4ms	183±0.8ms	1.02	benchmarks.time_test_alignment_even_sky
977±1ms	974±1ms	1	benchmarks.Suite.time_pixel_tree_creation
136±0.5ms	135±0.6ms	1	benchmarks.time_test_cone_filter_multiple_order

Click here to view all benchmarks.


          run black

cb797a3

github-actions bot commented Oct 11, 2023

Before	After	Ratio	Method
[`5603b17`]	[`7f0c31e`]
180±0.3ms	187±5ms	1.04	benchmarks.time_test_alignment_even_sky
979±5ms	970±3ms	0.99	benchmarks.Suite.time_pixel_tree_creation
140±8ms	135±0.5ms	0.97	benchmarks.time_test_cone_filter_multiple_order

Click here to view all benchmarks.


          Merge branch 'main' into sean/new-association-catalog

1b84049

# Conflicts:
#	tests/hipscat/conftest.py
#	tests/hipscat/io/conftest.py
#	tests/hipscat/io/file_io/test_file_pointers.py

github-actions bot commented Oct 12, 2023

Before	After	Ratio	Method
[`f811ab3`]	[`7eacc16`]
180±0.2ms	182±2ms	1.01	benchmarks.time_test_alignment_even_sky
135±1ms	135±0.8ms	1	benchmarks.time_test_cone_filter_multiple_order
981±3ms	980±3ms	1	benchmarks.Suite.time_pixel_tree_creation

Click here to view all benchmarks.

smcguire-cmu requested a review from delucchi-cmu

October 12, 2023 20:04

delucchi-cmu reviewed

View reviewed changes

tests/hipscat/catalog/association_catalog/test_association_catalog.py Outdated Show resolved Hide resolved


          Update tests/hipscat/catalog/association_catalog/test_association_cat…

…alog.py

Co-authored-by: Melissa DeLucchi <[email protected]>

github-actions bot commented Oct 16, 2023

Before	After	Ratio	Method
[`f811ab3`]	[`f94549f`]
132±0.7ms	132±0.5ms	1	benchmarks.time_test_cone_filter_multiple_order
953±3ms	951±8ms	1	benchmarks.Suite.time_pixel_tree_creation
160±0.4ms	159±0.9ms	1	benchmarks.time_test_alignment_even_sky

Click here to view all benchmarks.


          update association catalog tests

28063ae

github-actions bot commented Oct 16, 2023

Before	After	Ratio	Method
[`f811ab3`]	[`6117b8f`]
180±0.4ms	181±0.8ms	1.01	benchmarks.time_test_alignment_even_sky
137±0.8ms	135±1ms	0.99	benchmarks.time_test_cone_filter_multiple_order
993±2ms	967±3ms	0.97	benchmarks.Suite.time_pixel_tree_creation

Click here to view all benchmarks.


          remove unused import

0fb0103

github-actions bot commented Oct 16, 2023

Before	After	Ratio	Method
[`f811ab3`]	[`4976127`]
130±0.5ms	130±0.4ms	1	benchmarks.time_test_cone_filter_multiple_order
160±2ms	159±0.2ms	0.99	benchmarks.time_test_alignment_even_sky
941±3ms	934±2ms	0.99	benchmarks.Suite.time_pixel_tree_creation

Click here to view all benchmarks.

smcguire-cmu requested a review from delucchi-cmu

October 17, 2023 17:03

delucchi-cmu approved these changes

View reviewed changes

smcguire-cmu merged commit a15734c into main

12 checks passed

smcguire-cmu deleted the sean/new-association-catalog branch

October 19, 2023 20:50

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet