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

[REVIEW REQUIRED] Revert PR #9484 & add additional dependency licenses to LICENSE file#9701

Merged
eric-haibin-lin merged 4 commits intoapache:v1.1.0from
mbaijal:fixLicense_RevertfromReleaseBranch
Feb 8, 2018
Merged

[REVIEW REQUIRED] Revert PR #9484 & add additional dependency licenses to LICENSE file#9701
eric-haibin-lin merged 4 commits intoapache:v1.1.0from
mbaijal:fixLicense_RevertfromReleaseBranch

Conversation

@mbaijal
Copy link
Contributor

@mbaijal mbaijal commented Feb 6, 2018 •
edited
Loading

@hen @eric-haibin-lin Please Review these changes.

  1. This reverted commit 8930d96.
  2. Revisited some comments from previous release which are now relevant and made appropriate changes.
    based on [points 8-11 and 13 to 19 in this wiki, section E] (https://cwiki.apache.org/confluence/display/MXNET/MXNet+Source+Licenses)
  3. ran a search for additional dependencies with a separate license (around 27 ) and added to LICENSE file.

Description

As discussed on the general vote thread, reverted the LICENSE file to previous version and added some more packages to various licenses as needed.

Checklist

Essentials

  • Passed code style checking (make lint)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage:
  • Unit tests are added for small changes to verify correctness (e.g. adding a new operator)
  • Nightly tests are added for complicated/long-running ones (e.g. changing distributed kvstore)
  • Build tests will be added for build configuration changes (e.g. adding a new build option with NCCL)
  • Code is well-documented:

Changes

  • Reverts PR [Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file #9484
  • Added some packages to various licenses.
    • Added HalideIR to LICENSE (MIT)
    • Added googlemock scripts/generator to LICENSE (Apache)
    • Fixed error which named moderngpu license as warp-ctc
    • Added FindCrypto.cmake to Other licenses with link
    • Added Googlemock to LICENSE with text and link
    • Added Googletest to LICENSE with text and link
    • Added OpenMP testsuite to LICENSE with text and link
    • Added blockingconcurrentqueue to LICENSE (BSD)
    • Added Semaphore Implementaion of blockingconcurrentqueue to LICENSE (zlib license)

@mbaijal mbaijal mentioned this pull request Feb 6, 2018
Closed
@mbaijal mbaijal changed the title Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (#9484)" Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (#9484)" & other Fixes Feb 6, 2018
@mbaijal mbaijal changed the title Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (#9484)" & other Fixes Revert PR #9484 & add additional dependency licenses to LICENSE file Feb 6, 2018
@mbaijal mbaijal changed the title Revert PR #9484 & add additional dependency licenses to LICENSE file [REVIEW REQUIRED] Revert PR #9484 & add additional dependency licenses to LICENSE file Feb 6, 2018
@hyandell
Copy link
Contributor

hyandell commented Feb 7, 2018

Looks good to me. +1 to merge.

@mbaijal
Copy link
Contributor Author

mbaijal commented Feb 7, 2018

Thanks Henri!
@eric-haibin-lin Can you please merge this PR.

@eric-haibin-lin eric-haibin-lin merged commit 6deba93 into apache:v1.1.0 Feb 8, 2018
yzhliu pushed a commit to yzhliu/mxnet that referenced this pull request Mar 8, 2018
@mbaijal @yzhliu
[REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency l…
920760a 
…icenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies
marcoabreu pushed a commit that referenced this pull request Mar 8, 2018
@yzhliu @marcoabreu
[MXNET-67] Sync master with v1.1.0 branch (#10031)
ccf0469 
* [REVIEW REQUIRED] Revert PR #9484 & add additional dependency licenses to LICENSE file (#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update v1.1.0 change log to NEWS.md

* sync README.md from v1.1.0 branch

* revert to correct jenkins url in README
szha pushed a commit that referenced this pull request Mar 15, 2018
@astonzhang @szha
Add vocabulary and embedding (#10074)
092df8f 
* [MXNET-67] Sync master with v1.1.0 branch (#10031)

* [REVIEW REQUIRED] Revert PR #9484 & add additional dependency licenses to LICENSE file (#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update v1.1.0 change log to NEWS.md

* sync README.md from v1.1.0 branch

* revert to correct jenkins url in README

* Parallelization for ROIpooling OP (#9958)

* parallelization for roipooling

* remove some useless computation

* remove useless muls

* add author and retriggering

* retrigger again

* comments to copy and copyto are corrected (#10040)

* Bug Fix and performance optimized for rtc (#10018)

* Bug Fix and performance optimized for rtc

1. "super().__init__()" bug is fixed in python 2.
2. Kernel is initialized in the stage of operator init.

* Update custom_softmax_rtc.py

fix unnessesary format

* set embedding

* Code and test revised

* api implementation done

* license and news

* readme and cpp

* pylint disable

* Add API doc

* less pylint disable

* remove contrib

* move to gluon, revise api doc

* fix import order

* re-test

* relative imports

* re-run test

* revise implementation, test case, and api doc

* re-test
szha pushed a commit to szha/mxnet that referenced this pull request Mar 15, 2018
@astonzhang
Add vocabulary and embedding (apache#10074)
9e4f9d1 
* [MXNET-67] Sync master with v1.1.0 branch (apache#10031)

* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update v1.1.0 change log to NEWS.md

* sync README.md from v1.1.0 branch

* revert to correct jenkins url in README

* Parallelization for ROIpooling OP (apache#9958)

* parallelization for roipooling

* remove some useless computation

* remove useless muls

* add author and retriggering

* retrigger again

* comments to copy and copyto are corrected (apache#10040)

* Bug Fix and performance optimized for rtc (apache#10018)

* Bug Fix and performance optimized for rtc

1. "super().__init__()" bug is fixed in python 2.
2. Kernel is initialized in the stage of operator init.

* Update custom_softmax_rtc.py

fix unnessesary format

* set embedding

* Code and test revised

* api implementation done

* license and news

* readme and cpp

* pylint disable

* Add API doc

* less pylint disable

* remove contrib

* move to gluon, revise api doc

* fix import order

* re-test

* relative imports

* re-run test

* revise implementation, test case, and api doc

* re-test
eric-haibin-lin added a commit that referenced this pull request Mar 27, 2018
@eric-haibin-lin
[MXNET-72] Improve sparse.adam_update (#10062)
f0f745d 
* Bump 1.1 (#192)

* bump

* also update base.h

* revert website changes

* Update index.html

* update news.md (#191)

* Update NEWS.md

* Update README.md

* refactor regression ops to nnvm interface (#9540)

* refactor regression ops

* fix err for instantiation of minus_sign

* remove useless header file init_op.h

* replace with macro and address other comments

* update

* minor revise docs

* add mae test

* Update KEYS

* Update NEWS.md

* fixed links that were missng ndarray folder path (#9618)

* Fixed 4 broken links (#9698)

* Fixed 4 broken links

* fixed pylint for long line disable and 1 broken link

* Update NEWS.md

* Update NOTICE (#9706)

* revert acc changes (#9731)

* Revert "avoid per-batch blocking in metric (#9636)"

This reverts commit 3fe694e.

* Revert "proper flatten in acc (#9619)"

This reverts commit ed823b2.

* Revert "use nd for accuracy calculation (#9583)"

This reverts commit f5f1b91.

* keep doc change

* PGP keys add liuyizhi AT apache.org (#9728)

* Add my key (#9736)

* [REVIEW REQUIRED] Revert PR #9484 & add additional dependency licenses to LICENSE file (#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update navbar model zoo link (#9749)

* update navbar model zoo link

* update

* initial commit

* clean up

* refactor

* fix test
jinhuang415 pushed a commit to jinhuang415/incubator-mxnet that referenced this pull request Mar 30, 2018
@yzhliu
[MXNET-67] Sync master with v1.1.0 branch (apache#10031)
d52ec4f 
* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update v1.1.0 change log to NEWS.md

* sync README.md from v1.1.0 branch

* revert to correct jenkins url in README
jinhuang415 pushed a commit to jinhuang415/incubator-mxnet that referenced this pull request Mar 30, 2018
@eric-haibin-lin
[MXNET-72] Improve sparse.adam_update (apache#10062)
d3725e7 
* Bump 1.1 (apache#192)

* bump

* also update base.h

* revert website changes

* Update index.html

* update news.md (apache#191)

* Update NEWS.md

* Update README.md

* refactor regression ops to nnvm interface (apache#9540)

* refactor regression ops

* fix err for instantiation of minus_sign

* remove useless header file init_op.h

* replace with macro and address other comments

* update

* minor revise docs

* add mae test

* Update KEYS

* Update NEWS.md

* fixed links that were missng ndarray folder path (apache#9618)

* Fixed 4 broken links (apache#9698)

* Fixed 4 broken links

* fixed pylint for long line disable and 1 broken link

* Update NEWS.md

* Update NOTICE (apache#9706)

* revert acc changes (apache#9731)

* Revert "avoid per-batch blocking in metric (apache#9636)"

This reverts commit 3fe694e.

* Revert "proper flatten in acc (apache#9619)"

This reverts commit ed823b2.

* Revert "use nd for accuracy calculation (apache#9583)"

This reverts commit f5f1b91.

* keep doc change

* PGP keys add liuyizhi AT apache.org (apache#9728)

* Add my key (apache#9736)

* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update navbar model zoo link (apache#9749)

* update navbar model zoo link

* update

* initial commit

* clean up

* refactor

* fix test
rahul003 pushed a commit to rahul003/mxnet that referenced this pull request Jun 4, 2018
@yzhliu @marcoabreu
[MXNET-67] Sync master with v1.1.0 branch (apache#10031)
eebddd4 
* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update v1.1.0 change log to NEWS.md

* sync README.md from v1.1.0 branch

* revert to correct jenkins url in README
rahul003 pushed a commit to rahul003/mxnet that referenced this pull request Jun 4, 2018
@eric-haibin-lin
[MXNET-72] Improve sparse.adam_update (apache#10062)
83ce1e5 
* Bump 1.1 (apache#192)

* bump

* also update base.h

* revert website changes

* Update index.html

* update news.md (apache#191)

* Update NEWS.md

* Update README.md

* refactor regression ops to nnvm interface (apache#9540)

* refactor regression ops

* fix err for instantiation of minus_sign

* remove useless header file init_op.h

* replace with macro and address other comments

* update

* minor revise docs

* add mae test

* Update KEYS

* Update NEWS.md

* fixed links that were missng ndarray folder path (apache#9618)

* Fixed 4 broken links (apache#9698)

* Fixed 4 broken links

* fixed pylint for long line disable and 1 broken link

* Update NEWS.md

* Update NOTICE (apache#9706)

* revert acc changes (apache#9731)

* Revert "avoid per-batch blocking in metric (apache#9636)"

This reverts commit 3fe694e.

* Revert "proper flatten in acc (apache#9619)"

This reverts commit ed823b2.

* Revert "use nd for accuracy calculation (apache#9583)"

This reverts commit f5f1b91.

* keep doc change

* PGP keys add liuyizhi AT apache.org (apache#9728)

* Add my key (apache#9736)

* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update navbar model zoo link (apache#9749)

* update navbar model zoo link

* update

* initial commit

* clean up

* refactor

* fix test
zheng-da pushed a commit to zheng-da/incubator-mxnet that referenced this pull request Jun 28, 2018
@yzhliu @zheng-da
[MXNET-67] Sync master with v1.1.0 branch (apache#10031)
e0176b9 
* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update v1.1.0 change log to NEWS.md

* sync README.md from v1.1.0 branch

* revert to correct jenkins url in README
zheng-da pushed a commit to zheng-da/incubator-mxnet that referenced this pull request Jun 28, 2018
@eric-haibin-lin @zheng-da
[MXNET-72] Improve sparse.adam_update (apache#10062)
ab2c362 
* Bump 1.1 (apache#192)

* bump

* also update base.h

* revert website changes

* Update index.html

* update news.md (apache#191)

* Update NEWS.md

* Update README.md

* refactor regression ops to nnvm interface (apache#9540)

* refactor regression ops

* fix err for instantiation of minus_sign

* remove useless header file init_op.h

* replace with macro and address other comments

* update

* minor revise docs

* add mae test

* Update KEYS

* Update NEWS.md

* fixed links that were missng ndarray folder path (apache#9618)

* Fixed 4 broken links (apache#9698)

* Fixed 4 broken links

* fixed pylint for long line disable and 1 broken link

* Update NEWS.md

* Update NOTICE (apache#9706)

* revert acc changes (apache#9731)

* Revert "avoid per-batch blocking in metric (apache#9636)"

This reverts commit 3fe694e.

* Revert "proper flatten in acc (apache#9619)"

This reverts commit ed823b2.

* Revert "use nd for accuracy calculation (apache#9583)"

This reverts commit f5f1b91.

* keep doc change

* PGP keys add liuyizhi AT apache.org (apache#9728)

* Add my key (apache#9736)

* [REVIEW REQUIRED] Revert PR apache#9484 & add additional dependency licenses to LICENSE file (apache#9701)

* Revert "[Review Required] Fixing Licenses: Cleaning up the Top Level LICENSE file (apache#9484)"

This reverts commit 8930d96.

* Some more LICENSE fixes

* Adding some more packages to the LICENSE file

* Adding dependencies of dependencies

* update navbar model zoo link (apache#9749)

* update navbar model zoo link

* update

* initial commit

* clean up

* refactor

* fix test
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mbaijal @hyandell @eric-haibin-lin