Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[v1.x] Backport #20428 from v1.9.x #20434

Merged
merged 3 commits into from
Jul 12, 2021
Merged

[v1.x] Backport #20428 from v1.9.x #20434

merged 3 commits into from
Jul 12, 2021

Conversation

josephevans
Copy link
Contributor

Backport license updates and CI stability fixes, also re-enable Windows failing tests mentioned in #20389

@josephevans
[v1.9.x] License updates per feedback (apache#20428)
081a5c2 
* Remove Apache license header from files already containing Caffe license.

* Update license check whitelist for files under Caffe license.

* Update rat check exclude list with Caffe-licensed files.

* Don't install caffe python dependencies, as it overwrites our fixed versions.

* Restrict scipy version in test requirements.txt to avoid issue with scipy 1.7.0 and rand generator test failures.
@josephevans
Revert "[v1.x] Skip windows failing tests (apache#20395)"
5b59fe3 
This reverts commit 02f4942.
@mxnet-bot
Copy link

Hey @josephevans , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [edge, unix-cpu, website, unix-gpu, clang, sanity, centos-cpu, windows-gpu, centos-gpu, windows-cpu, miscellaneous]

Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@mseth10 mseth10 added the pr-awaiting-testing PR is reviewed and waiting CI build and test label Jul 9, 2021
@mseth10 mseth10 added pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress labels Jul 9, 2021
@josephevans
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test labels Jul 9, 2021
@mseth10 mseth10 added pr-work-in-progress PR is still work in progress pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-review PR is waiting for code review and removed pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress labels Jul 10, 2021
Zha0q1
Zha0q1 approved these changes Jul 12, 2021
View reviewed changes
Copy link
Contributor

@Zha0q1 Zha0q1 left a comment

Choose a reason for hiding this comment

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

Thanks for the fixes!

mseth10
mseth10 approved these changes Jul 12, 2021
View reviewed changes
Copy link
Contributor

@mseth10 mseth10 left a comment

Choose a reason for hiding this comment

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

LGTM

@mseth10 mseth10 merged commit 2d02d6f into apache:v1.x Jul 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mseth10 mseth10 mseth10 approved these changes

@Zha0q1 Zha0q1 Zha0q1 approved these changes

@aaronmarkham aaronmarkham Awaiting requested review from aaronmarkham aaronmarkham is a code owner

@marcoabreu marcoabreu Awaiting requested review from marcoabreu marcoabreu is a code owner

@szha szha Awaiting requested review from szha szha is a code owner

Assignees
No one assigned
Labels
pr-awaiting-review PR is waiting for code review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@josephevans @mxnet-bot @Zha0q1 @mseth10