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

[v1.x] Cherry-pick #17776 #17681 #18465

Merged
merged 3 commits into from
Jun 15, 2020
Merged

[v1.x] Cherry-pick #17776 #17681 #18465

merged 3 commits into from
Jun 15, 2020

Conversation

mseth10
Copy link
Contributor

@mseth10 mseth10 commented Jun 2, 2020

Description

Cherry-pick #17776 #17681 to update PyPI description

This fixes #18462

leezu and others added 2 commits June 1, 2020 17:59
* Fix cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy

Fixes a regression in CD introduced by
apache#17645

* Fix whitespace

* Add NATIVE_ADDITIONAL.md

Fixes a regression in CD introduced by
apache#16899

* Update other $TYPE_ADDITIONAL.MD

* Fix cd/python/docker

Fixes regression introduced by
apache#15990
* update pypi description, setup.py, use manylinux2010, use unified dist link for nightly

* Use manylinux2014

Co-authored-by: Leonard Lausen <leonard@lausen.nl>
@mseth10 mseth10 requested a review from szha as a code owner June 2, 2020 01:03
@mxnet-bot
Copy link

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


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
Copy link
Contributor Author

mseth10 commented Jun 3, 2020

@leezu please help review and merge this PR. This fixes #18462

@@ -24,7 +24,7 @@

// NOTE: the following variables are referenced in the mxnet_lib_pipeline jenkins file imported bellow
// libmxnet location
libmxnet = 'lib/libmxnet.so'
Copy link
Contributor

@leezu leezu Jun 3, 2020

Choose a reason for hiding this comment

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

Thank you Manu. As with the 1.7 PR: Changing this line is done when switching to cmake build on CD. I don't think it's done yet (but we certainly want to do it at some point to decrease the infrastructure code divergence between 1.x and master branch)

So I suggest to remove this line in the PR and have a separate PR for the build change later

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I reverted this line. Rest of the code changes look good?

@leezu
Copy link
Contributor

leezu commented Jun 3, 2020

Did you look at the docker build pipeline in more detail? From the last time I checked it, I believe the pipeline always publishes to a "latest" tag. Running the pipeline as is on both the master and 1.x branch would thus lead to a race condition and it'd be unclear if the 1.x or master version of the image is published.

Besides the technical issue, I'm currently not sure about the legal status of the pipeline. But that can be discussed in a separate issue.

@ciyongch
Copy link
Contributor

ciyongch commented Jun 5, 2020

Hi @mseth10 @leezu , seems v1.7.x branch also need this PR to update the pypi desc, can you help to backport to v1.7.x as well. Thanks.

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 6, 2020

@ciyongch Created another PR for 1.7 branch #18464

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 6, 2020

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 8, 2020

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 8, 2020

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 9, 2020

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 9, 2020

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 9, 2020

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@mseth10
Copy link
Contributor Author

mseth10 commented Jun 10, 2020

@leezu please merge.

@ciyongch
Copy link
Contributor

Ping @TaoLv , @pengzhao-intel to help merge :)

@leezu leezu merged commit 3b2c9ad into apache:v1.x Jun 15, 2020
@mseth10 mseth10 deleted the cherry-pick-1.x branch June 16, 2020 08:47
ChaiBapchya pushed a commit to ChaiBapchya/mxnet that referenced this pull request Aug 15, 2020
* Fix CD (apache#17776)

* Fix cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy

Fixes a regression in CD introduced by
apache#17645

* Fix whitespace

* Add NATIVE_ADDITIONAL.md

Fixes a regression in CD introduced by
apache#16899

* Update other $TYPE_ADDITIONAL.MD

* Fix cd/python/docker

Fixes regression introduced by
apache#15990

* [CD] update pypi description, setup.py (apache#17681)

* update pypi description, setup.py, use manylinux2010, use unified dist link for nightly

* Use manylinux2014

Co-authored-by: Leonard Lausen <leonard@lausen.nl>

* reverting .so path as per MAKE flow

Co-authored-by: Leonard Lausen <lausen@amazon.com>
Co-authored-by: Sheng Zha <szha@users.noreply.github.com>
Co-authored-by: Leonard Lausen <leonard@lausen.nl>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants