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

[PIP] update manifest to include lib_api.cc #19850

Merged
merged 3 commits into from
Feb 7, 2021
Merged

[PIP] update manifest to include lib_api.cc #19850

merged 3 commits into from
Feb 7, 2021

Conversation

szha
Copy link
Member

@szha szha commented Feb 5, 2021

Description

update manifest to include lib_api.cc

Checklist

Essentials

  • PR's title starts with a category (e.g. [BUGFIX], [MODEL], [TUTORIAL], [FEATURE], [DOC], etc)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage
  • Code is well-documented

Changes

  • update manifest to include lib_api.cc

Comments

  • If this change is a backward incompatible change, why must this change be made.
  • Interesting edge cases to note here

@szha
update manifest to include lib_api.cc
c3532b8 
Signed-off-by: Sheng Zha <zhasheng@amazon.com>
@szha szha requested a review from samskalicky February 5, 2021 17:58
@mxnet-bot
Copy link

Hey @szha , 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: [sanity, windows-gpu, miscellaneous, clang, website, unix-cpu, centos-cpu, edge, unix-gpu, windows-cpu, centos-gpu]

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.

@lanking520 lanking520 added the pr-awaiting-testing PR is reviewed and waiting CI build and test label Feb 5, 2021
samskalicky
samskalicky reviewed Feb 5, 2021
View reviewed changes
tools/pip/MANIFEST.in
@@ -29,4 +29,5 @@ recursive-include mxnet *_LICENSE
recursive-include mxnet *.h
recursive-include mxnet *.hpp
recursive-include mxnet *.cuh
recursive-include mxnet *.cpp
Copy link
Contributor

Choose a reason for hiding this comment

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

does *.cpp include *.cc files?
https://github.com/apache/incubator-mxnet/blob/master/src/lib_api.cc

Copy link
Member Author

Choose a reason for hiding this comment

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

actually no, let me include cc as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

cool, were you able to package the wheel and unzip it and confirm the lib_api.cc was inside?

@samskalicky
Copy link
Contributor

Which setup.py do we use (or do we want to use) on master moving forward:
https://github.com/apache/incubator-mxnet/blob/master/tools/pip/setup.py
https://github.com/apache/incubator-mxnet/blob/master/python/setup.py

Can we remove the other one?

@szha
add cc
958ad7f 
Signed-off-by: Sheng Zha <zhasheng@amazon.com>
@szha
Copy link
Member Author

szha commented Feb 5, 2021

@samskalicky I think both need to be kept for now. The needs for packaging is quite different from setting up the package locally.

@samskalicky
Copy link
Contributor

@samskalicky I think both need to be kept for now. The needs for packaging is quite different from setting up the package locally.

makes sense, so the one in tools/pip/setup.py is the one we use for building wheels, everywhere (dist.mxnet.io, releases, etc)?

@samskalicky samskalicky mentioned this pull request Feb 5, 2021
Merged
6 tasks
@lanking520 lanking520 added pr-awaiting-review PR is waiting for code review and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Feb 5, 2021
@samskalicky
Copy link
Contributor

everything else looks good to me, can you confirm packaging the wheel now includes the lib_api.cc?

@szha
fix lib_api.cc packaging
bfdfdf7 
Signed-off-by: Sheng Zha <zhasheng@amazon.com>
szha
szha commented Feb 5, 2021
View reviewed changes
tools/pip/setup.py Show resolved Hide resolved
@lanking520 lanking520 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-awaiting-review PR is waiting for code review labels Feb 5, 2021
@szha
Copy link
Member Author

szha commented Feb 5, 2021

And now we are good.

samskalicky
samskalicky approved these changes Feb 5, 2021
View reviewed changes
Copy link
Contributor

@samskalicky samskalicky left a comment

Choose a reason for hiding this comment

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

Thanks @szha !

@lanking520 lanking520 added pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Feb 6, 2021
@samskalicky
Copy link
Contributor

@mxnet-bot run ci [unix-cpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-cpu]

@lanking520 lanking520 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-awaiting-merge Review and CI is complete. Ready to Merge 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 Feb 7, 2021
@szha szha merged commit c459127 into apache:master Feb 7, 2021
@szha szha deleted the cc_dist branch February 7, 2021 21:00
access2rohit pushed a commit to access2rohit/incubator-mxnet that referenced this pull request Feb 17, 2021
@szha
[PIP] update manifest to include lib_api.cc (apache#19850)
9ef0fe9 
* update manifest to include lib_api.cc

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* add cc

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* fix lib_api.cc packaging

Signed-off-by: Sheng Zha <zhasheng@amazon.com>
This was referenced Feb 17, 2021
Closed
Merged
access2rohit pushed a commit to access2rohit/incubator-mxnet that referenced this pull request Feb 17, 2021
@szha
[PIP] update manifest to include lib_api.cc (apache#19850)
1570096 
* update manifest to include lib_api.cc

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* add cc

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* fix lib_api.cc packaging

Signed-off-by: Sheng Zha <zhasheng@amazon.com>
szha added a commit that referenced this pull request Feb 22, 2021
@access2rohit @szha
[PIP] update manifest to include lib_api.cc (#19850) (#19912)
01d78f5 
* update manifest to include lib_api.cc

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* add cc

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* fix lib_api.cc packaging

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

Co-authored-by: Sheng Zha <szha@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@samskalicky samskalicky samskalicky approved these changes

Assignees
No one assigned
Labels
pr-awaiting-merge Review and CI is complete. Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@szha @mxnet-bot @samskalicky @lanking520