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.

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

For release 2025.01.00 #102

Merged
merged 108 commits into from
Jan 24, 2025
Merged

For release 2025.01.00 #102

merged 108 commits into from
Jan 24, 2025

Conversation

fmalatino
Copy link
Contributor

Description
This PR will bring the changes from develop into the main branch for release 2025.01.00

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules
  • New check tests, if applicable, are included

oelbert and others added 30 commits August 27, 2024 13:15
@oelbert
updating 4d handling
b7b84e0
@oelbert
debug 4d test data
bf4e2f2
@oelbert
more iter
dfc4e5f
@oelbert
moving ser_to_nc here
6ab1dd5
@oelbert
merge develop
7bcce4b
@oelbert
updating datatype in translate test
2d7062a
@oelbert
typing works
d44551e
@oelbert
fix dict, lint
ed3d431
@oelbert
remove empty line
2225fd9
@oelbert
change from 4d to Nd
f3cf32d
@FlorianDeconinck
Merge branch 'develop' into feature/4d_data
f894a49
Expose k_start and k_end automatically for any FrozenStencil
ed4ddd4
Fix k_start + utest
5b09a67
lint
b0b2940
Fix for 2d stencils
0c7c902
@fmalatino
Merge pull request #78 from FlorianDeconinck/feature/K_axis_bounds_in…
b5a7fa7 
…_externals

[feature] Expose stencil vertical domain to Frozen Stencil
Add threshold overrides to the multimodal metric
4b8d4b9
@FlorianDeconinck
Merge pull request #71 from oelbert/feature/4d_data
0f1644c 
Support for 4d Data
Always report results, add summary with one liners
720149a
@FlorianDeconinck
Merge branch 'develop' into feature/multimodal_metric_threshold_override
c9da47b
Remove "mmr" from the keys
020a259
Merge remote-tracking branch 'fdeconinck/feature/multimodal_metric_th…
75f886f 
…reshold_override' into feature/multimodal_metric_threshold_override
README in testing
d59918b
Better Latex (?)
4bdc914
Better Latex (?)
bdb3820
@oelbert
fixing a typo that breaks bools in translate tests (#80)
e17539d
@FlorianDeconinck
Merge branch 'develop' into feature/multimodal_metric_threshold_override
0fc563e
@FlorianDeconinck
Fix summary filename
f8105dd
@FlorianDeconinck
Merge remote-tracking branch 'fdeconinck/feature/multimodal_metric_th…
6389638 
…reshold_override' into feature/multimodal_metric_threshold_override
@FlorianDeconinck
Fix report, filename
5ac067f
FlorianDeconinck and others added 20 commits December 22, 2024 14:38
@FlorianDeconinck
Merge branch 'develop' into feature/mpi_allreduce_sum
312b492
@FlorianDeconinck
Make sure the correct allocator backend is used for Quantities
f99914a
@FlorianDeconinck
Add in_place option for Allreduce
760578c
@FlorianDeconinck
Merge pull request #95 from FlorianDeconinck/fix/boilerplate_on_gpu
a8a2e73 
[QOL] Fix for boilerplate to work on GPU
@FlorianDeconinck
Merge branch 'develop' into feature/mpi_allreduce_sum
c758ffb
@FlorianDeconinck
Merge pull request #92 from NOAA-GFDL/feature/mpi_allreduce_sum
9f5e50c 
Implemented `allreduce` & `Allreduce` for Communicator
@romanc
Cleanup ndsl/dsl/dace/utils.py (#96)
4e06ee8 
* Fix typos
* DaCeProgress: avoid double assignment of prefix
* Add type hints/simplify kernel_theoretical_timing

Adding type hints allowed to simplify `kernel_theoretical_timing`.
@FlorianDeconinck
Merge branch 'develop' into refactor/quantity
94b35d0
@FlorianDeconinck
Fix merge
fcfb058
@FlorianDeconinck
Merge pull request #89 from FlorianDeconinck/refactor/quantity
1c7c30c 
Refactor Quantity into a sub-directory
@fmalatino
Hotfix for grid generation use of mpi operators
1fa8d79
@FlorianDeconinck
Merge pull request #98 from fmalatino/fix/reductop
a75a1d7 
Hotfix for grid generation use of mpi operators
@romanc
Merge examples/mpi/.gitignore into top-level .gitignore
3252ec7
@romanc
Remove hard-coded __version__ numbers
04ecf87 
Removes hard-coded version numbers from `__init__` files.
@romanc
Fixing a bunch of typos
4881b34
@fmalatino
Merge pull request #99 from romanc/romanc/cleanup-gitignore
1da613d 
Cleanup: `.gitignore` / `__version__` strings / bunch of typos
@oelbert
hotfix netcdf version for dockerfiles
a51daf3
@fmalatino
Merge pull request #100 from oelbert/develop
acb8c0d 
Hotfix to netcdf python version
@fmalatino
Updated version number in setup.py to reflect new release, 2025.01.00
3f77863
@fmalatino
Merge pull request #101 from fmalatino/rc-2025.01.00
b7db259 
Release candidate: `2025.01.00`
FlorianDeconinck
FlorianDeconinck approved these changes Jan 24, 2025
View reviewed changes
Copy link
Collaborator

@FlorianDeconinck FlorianDeconinck left a comment

Choose a reason for hiding this comment

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

LGTM

The commit list here and yesterday on the develop branch, makes me think we ought to make squash-merge the default for merging into develop and main. That way, in lieu of every commit of every branch, we would have only PR consolidated commits, easier for review of what we are moving in. And we could focus our effort on making sure the messages of those commits are readable and verbose enough.

@FlorianDeconinck
Copy link
Collaborator

LGTM

The commit list here and yesterday on the develop branch, makes me think we ought to make squash-merge the default for merging into develop and main. That way, in lieu of every commit of every branch, we would have only PR consolidated commits, easier for review of what we are moving in. And we could focus our effort on making sure the messages of those commits are readable and verbose enough.

For example - for this release there's 108 commits being merged in release, but only a little more than a dozen PR. I'd rather have a neat list of ~12 PR name + description

@bensonr
Copy link

bensonr commented Jan 24, 2025

I agree with @FlorianDeconinck on the use of squash commits keeping only the relevant info from the actual merge/PR

oelbert
oelbert approved these changes Jan 24, 2025
View reviewed changes
Copy link
Collaborator

@oelbert oelbert left a comment

Choose a reason for hiding this comment

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

Agreed with @FlorianDeconinck as well about squash merging

@fmalatino
Copy link
Contributor Author

@FlorianDeconinck and @bensonr, I have now made squash merge the default method moving forward

@fmalatino fmalatino merged commit 729a2fe into main Jan 24, 2025
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bensonr bensonr bensonr approved these changes

@oelbert oelbert oelbert approved these changes

@FlorianDeconinck FlorianDeconinck FlorianDeconinck approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@fmalatino @FlorianDeconinck @bensonr @oelbert @gmao-ckung @romanc