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

Cherry-picking 1.2.1 release [full merge, no squash] #6154

Merged
merged 4 commits into from
Feb 24, 2021

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Feb 23, 2021

See title

awaelchli and others added 4 commits February 23, 2021 18:25
* precision fixes

* add amp test model

* fix test

* revert

* move assert to training step

* fix test

* fix test

* remove unrelated changes

* add changelog

* remove unused import
…accelerator (#6089)

* Give priority to plugins to set distributed mode, and then accelerator

* Add CHANGELOG.md

* Update CHANGELOG.md

* Remove very scary line

* Ensure we set cluster environment after slurm configured if necessary

* Simplify the fix with a reset

Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
* fix weird test

* fix apex plugin test

* fix raise

* cpu test

* fix type

* add changelog
@codecov
Copy link

codecov bot commented Feb 23, 2021

Codecov Report

Merging #6154 (0ff0961) into release/1.2.x (3645eb1) will decrease coverage by 2%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##           release/1.2.x   #6154    +/-   ##
==============================================
- Coverage             93%     91%    -2%     
==============================================
  Files                160     160            
  Lines              11402   11402            
==============================================
- Hits               10654   10412   -242     
- Misses               748     990   +242     

Copy link
Contributor

@SeanNaren SeanNaren left a comment

Choose a reason for hiding this comment

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

Regarding changelog, i think the pattern was move them into a new 'unreleased' section right?

@carmocca
Copy link
Contributor Author

carmocca commented Feb 23, 2021

The issue is that as we cherry-pick specific commits from master, we don't have all CHANGELOG changes.

I'll open a PR to master copying the 1.2.1 section so we don't do them all at once when 1.3 arrives

@Borda Borda changed the title Prepare 1.2.1 release Cherry-picking 1.2.1 release [full merge, no squash] Feb 23, 2021
@lexierule lexierule merged commit c219aa4 into release/1.2.x Feb 24, 2021
@lexierule lexierule deleted the 1.2.1-branch branch February 24, 2021 15:24
@carmocca carmocca mentioned this pull request Mar 2, 2021
@carmocca carmocca self-assigned this Nov 1, 2023
@mergify mergify bot added the ready PRs ready to be merged label Nov 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants