This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
Updates python setup.py for recent license changes #14778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zachgk
suggested changes
Apr 23, 2019
tools/staticbuild/build_lib.sh
Outdated
| @@ -34,6 +34,7 @@ $MAKE DEPS_PATH=$DEPS_PATH $PWD/3rdparty/tvm/nnvm/lib/libnnvm.a | |||
| $MAKE DEPS_PATH=$DEPS_PATH PSLITE | |||
|
|
|||
| if [[ $VARIANT == *mkl ]]; then | |||
| MKLDNN_LICENSE='license.txt' | |||
There was a problem hiding this comment.
These licenses are included as part of the source LICENSE. There is no need to re-add them
| @@ -66,12 +66,8 @@ def has_ext_modules(self): | |||
| shutil.copy(LIB_PATH[0], os.path.join(CURRENT_DIR, 'mxnet')) | |||
|
|
|||
| # copy license and notice | |||
| shutil.copy(os.path.join(CURRENT_DIR, 'mxnet-build/LICENSE'), | |||
| os.path.join(CURRENT_DIR, 'mxnet/LICENSE')) | |||
| shutil.copy(os.path.join(CURRENT_DIR, 'mxnet-build/DISCLAIMER'), | |||
There was a problem hiding this comment.
We do not currently add this DISCLAIMER. Can you add it to the build similarly to https://github.com/apache/incubator-mxnet/pull/14726/files#diff-2c9b07f53d24caa1ac38f1eb9c371118R70?
perdasilva
force-pushed
the
setup_py_fix
branch
from
23fd22b
to
9ce0727
Compare
perdasilva
force-pushed
the
setup_py_fix
branch
from
2454923
to
7ebb560
Compare
|
@zachgk I've addressed your comments ^^ thanks for taking a look! |
edisongustavo
approved these changes
Apr 25, 2019
haohuanw
pushed a commit
to haohuanw/incubator-mxnet
that referenced
this pull request
Jun 23, 2019
* Updates license packing * Adds DISCLAIMER to static build licenses
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
A recent PR #14726 has altered the way the static build deals with licenses. This has broken the
setup.pyscript for building the release pip packages. This PR fixes this problem.I've re-added some of the removed licenses, this should be confirmed to be OK by the submitters of the aforementioned PR. @lanking520 could you please take a look?