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

[MXNET-67] Sync master with v1.1.0 branch#10031

Merged
marcoabreu merged 4 commits intoapache:masterfrom
yzhliu:master-sync-1.1.0
Mar 8, 2018
Merged

[MXNET-67] Sync master with v1.1.0 branch#10031
marcoabreu merged 4 commits intoapache:masterfrom
yzhliu:master-sync-1.1.0

Conversation

@yzhliu
Copy link
Copy Markdown
Member

@yzhliu yzhliu commented Mar 8, 2018

I have went through the commits and checked all the changes on v1.1.0 branch has been merged into master, except the LICENSE and NEWS below.

But I did see some commits that were pushed into v1.1.0 directly (without PR against either v1.1.0 nor master), thus ping @eric-haibin-lin for double check.

The commits:

commit 31104c9d4b050883467f45f8bf9a164acb93976f
Author: Haibin Lin <linhaibin.eric@gmail.com>
Date:   Tue Feb 6 15:22:53 2018 -0800

    Update NEWS.md


commit 8b3c9ebb7bb4a9e8ee88e7222a718f7fa1c9a6be (tag: 1.1.0.rc0)
Author: Haibin Lin <linhaibin.eric@gmail.com>
Date:   Sat Jan 27 23:23:13 2018 -0800

    Update NEWS.md

commit 3ba84d83105bbc8825ac858f4c9cf81f9ca03d18
Author: Haibin Lin <linhaibin.eric@gmail.com>
Date:   Sat Jan 27 23:18:11 2018 -0800

    Update KEYS


commit 9a5819687f16ea7cd611bca7b4bcb809d4186d9d
Author: Haibin Lin <linhaibin.eric@gmail.com>
Date:   Sat Jan 27 18:18:35 2018 -0800

    update news.md (#191)
    
    * Update NEWS.md
    
    * Update README.md


commit 4c17c030208c67b2f68808d12d5a79996cfaf4ba
Author: Haibin Lin <linhaibin.eric@gmail.com>
Date:   Sat Jan 27 18:22:50 2018 -0800

    Bump 1.1 (#192)
    
    * bump
    
    * also update base.h
    
    * revert website changes
    
    * Update index.html

mbaijal and others added 2 commits March 7, 2018 17:16
@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
@yzhliu
update v1.1.0 change log to NEWS.md
5554e62
@yzhliu yzhliu requested review from eric-haibin-lin and szha March 8, 2018 01:28
@eric-haibin-lin
Copy link
Copy Markdown
Member

eric-haibin-lin commented Mar 8, 2018

Looks good if README is also updated.

marcoabreu
marcoabreu suggested changes Mar 8, 2018
View reviewed changes
Comment thread README.md Outdated
=====

[![Build Status](https://builds.apache.org/job/incubator-mxnet/job/master/badge/icon)](http://jenkins.mxnet-ci.amazon-ml.com/job/incubator-mxnet/job/master/)
[![Build Status](https://builds.apache.org/job/incubator-mxnet/job/master/badge/icon)](https://builds.apache.org/job/incubator-mxnet/job/master/)
Copy link
Copy Markdown
Contributor

@marcoabreu marcoabreu Mar 8, 2018

Choose a reason for hiding this comment

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

Please revert this change. builds.apache.org is the old server

@mbaijal mbaijal mentioned this pull request Mar 8, 2018
Closed
6 tasks
marcoabreu
marcoabreu suggested changes Mar 8, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@marcoabreu marcoabreu left a comment

Choose a reason for hiding this comment

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

Please add a jira ticket id

@yzhliu yzhliu changed the title Sync master with v1.1.0 branch [MXNET-67] Sync master with v1.1.0 branch Mar 8, 2018
@marcoabreu marcoabreu merged commit ccf0469 into apache:master Mar 8, 2018
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
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
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
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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@szha szha Awaiting requested review from szha

@eric-haibin-lin eric-haibin-lin Awaiting requested review from eric-haibin-lin

1 more reviewer

@marcoabreu marcoabreu marcoabreu requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yzhliu @eric-haibin-lin @marcoabreu @mbaijal