This is an automated email from the ASF dual-hosted git repository.
lausen pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new d144edd 1.x: Stop packaging GPL libquadmath.so (#19055)
d144edd is described below
commit d144edd46c8adba63b3a5caadeb03a0f94d20ff9
Author: Leonard Lausen <[email protected]>
AuthorDate: Tue Sep 1 11:03:17 2020 -0700
1.x: Stop packaging GPL libquadmath.so (#19055)
* Stop packaging GPL libquadmath.so (#19053)
libquadmath.so is GPL and must not be distributed by Apache projects. Users
will need to ensure that libquadmath.so is present on their systems if they use
binary builds of MXNet. libquadmath.so has not yet undergone any ABI changes,
thus all versions of libquadmath.so are ABI compatible and user just needs to
install system version of libquadmath.so.
libgfortran.so can be packaged thanks to GCC Runtime Library Exception.
See https://www.apache.org/legal/resolved.html#category-x
* Remove unmaintained pip packages
* Workaround https://github.com/pypa/setuptools/issues/2352
---
cd/mxnet_lib/static/Jenkins_pipeline.groovy | 4 +--
ci/docker/install/requirements | 2 +-
tools/pip/doc/CPU_ADDITIONAL.md | 13 ++++++---
tools/pip/doc/CU100_ADDITIONAL.md | 14 ++++++---
tools/pip/doc/CU101_ADDITIONAL.md | 14 ++++++---
tools/pip/doc/CU102_ADDITIONAL.md | 13 +++++++--
tools/pip/doc/CU75_ADDITIONAL.md | 38 ------------------------
tools/pip/doc/CU80_ADDITIONAL.md | 38 ------------------------
tools/pip/doc/CU90_ADDITIONAL.md | 45 -----------------------------
tools/pip/doc/CU92_ADDITIONAL.md | 8 +++++
tools/pip/doc/NATIVE_ADDITIONAL.md | 13 +++++++--
tools/pip/setup.py | 2 --
12 files changed, 61 insertions(+), 143 deletions(-)
diff --git a/cd/mxnet_lib/static/Jenkins_pipeline.groovy
b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
index abbafdb..fe2e71c 100644
--- a/cd/mxnet_lib/static/Jenkins_pipeline.groovy
+++ b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
@@ -32,8 +32,8 @@ libmxnet = 'lib/libmxnet.so'
licenses = 'licenses/*'
// libmxnet dependencies
-mx_native_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0'
-mx_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0,
3rdparty/mkldnn/build/install/include/dnnl_version.h,
3rdparty/mkldnn/build/install/include/dnnl_config.h'
+mx_native_deps = 'lib/libgfortran.so.3'
+mx_deps = 'lib/libgfortran.so.3,
3rdparty/mkldnn/build/install/include/dnnl_version.h,
3rdparty/mkldnn/build/install/include/dnnl_config.h'
// library type
// either static or dynamic - depending on how it links to its dependencies
diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements
index 9d04e4b..40364de 100644
--- a/ci/docker/install/requirements
+++ b/ci/docker/install/requirements
@@ -32,4 +32,4 @@ astroid==2.3.3 # pylint and astroid need to be aligned
requests<2.19.0,>=2.18.4
scipy==1.2.1
six==1.11.0
-setuptools
+setuptools<50
diff --git a/tools/pip/doc/CPU_ADDITIONAL.md b/tools/pip/doc/CPU_ADDITIONAL.md
index ef95888..035ef4c 100644
--- a/tools/pip/doc/CPU_ADDITIONAL.md
+++ b/tools/pip/doc/CPU_ADDITIONAL.md
@@ -18,15 +18,20 @@
Prerequisites
-------------
This package supports Linux, Mac OSX, and Windows platforms. You may also want
to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100/) with CUDA-10.0
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
- [mxnet-native](https://pypi.python.org/pypi/mxnet-native/) CPU variant
without MKLDNN.
+To use this package on Linux you need the `libquadmath.so.0` shared library. On
+Debian based systems, including Ubuntu, run `sudo apt install libquadmath0` to
+install the shared library. On RHEL based systems, including CentOS, run `sudo
+yum install libquadmath` to install the shared library. As `libquadmath.so.0`
is
+a GPL library and MXNet part of the Apache Software Foundation, MXNet must not
+redistribute `libquadmath.so.0` as part of the Pypi package and users must
+manually install it.
+
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
Installation
diff --git a/tools/pip/doc/CU100_ADDITIONAL.md
b/tools/pip/doc/CU100_ADDITIONAL.md
index 36455ea..439d900 100644
--- a/tools/pip/doc/CU100_ADDITIONAL.md
+++ b/tools/pip/doc/CU100_ADDITIONAL.md
@@ -18,15 +18,21 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
+- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
+To use this package on Linux you need the `libquadmath.so.0` shared library. On
+Debian based systems, including Ubuntu, run `sudo apt install libquadmath0` to
+install the shared library. On RHEL based systems, including CentOS, run `sudo
+yum install libquadmath` to install the shared library. As `libquadmath.so.0`
is
+a GPL library and MXNet part of the Apache Software Foundation, MXNet must not
+redistribute `libquadmath.so.0` as part of the Pypi package and users must
+manually install it.
+
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
Installation
diff --git a/tools/pip/doc/CU101_ADDITIONAL.md
b/tools/pip/doc/CU101_ADDITIONAL.md
index 36ea4d3..c983c73 100644
--- a/tools/pip/doc/CU101_ADDITIONAL.md
+++ b/tools/pip/doc/CU101_ADDITIONAL.md
@@ -18,15 +18,21 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
+- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.0
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
+To use this package on Linux you need the `libquadmath.so.0` shared library. On
+Debian based systems, including Ubuntu, run `sudo apt install libquadmath0` to
+install the shared library. On RHEL based systems, including CentOS, run `sudo
+yum install libquadmath` to install the shared library. As `libquadmath.so.0`
is
+a GPL library and MXNet part of the Apache Software Foundation, MXNet must not
+redistribute `libquadmath.so.0` as part of the Pypi package and users must
+manually install it.
+
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.incubator.apache.org/versions/master/install/index.html)
for instructions on building from source.
Installation
diff --git a/tools/pip/doc/CU102_ADDITIONAL.md
b/tools/pip/doc/CU102_ADDITIONAL.md
index ffb034a..8417db1 100644
--- a/tools/pip/doc/CU102_ADDITIONAL.md
+++ b/tools/pip/doc/CU102_ADDITIONAL.md
@@ -18,14 +18,21 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
+- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
+- [mxnet-cu100](https://pypi.python.org/pypi/mxnet-cu100/) with CUDA-10.0
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
+To use this package on Linux you need the `libquadmath.so.0` shared library. On
+Debian based systems, including Ubuntu, run `sudo apt install libquadmath0` to
+install the shared library. On RHEL based systems, including CentOS, run `sudo
+yum install libquadmath` to install the shared library. As `libquadmath.so.0`
is
+a GPL library and MXNet part of the Apache Software Foundation, MXNet must not
+redistribute `libquadmath.so.0` as part of the Pypi package and users must
+manually install it.
+
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.incubator.apache.org/versions/master/install/index.html)
for instructions on building from source.
Installation
diff --git a/tools/pip/doc/CU75_ADDITIONAL.md b/tools/pip/doc/CU75_ADDITIONAL.md
deleted file mode 100644
index ae382f9..0000000
--- a/tools/pip/doc/CU75_ADDITIONAL.md
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-**CUDA 7.5 package for MXNet is no longer maintained for new releases.**
-
-Prerequisites
--------------
-This package supports Linux only, up to 1.2.1. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu75
-```
diff --git a/tools/pip/doc/CU80_ADDITIONAL.md b/tools/pip/doc/CU80_ADDITIONAL.md
deleted file mode 100644
index 5ce06d7..0000000
--- a/tools/pip/doc/CU80_ADDITIONAL.md
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-**CUDA 8.0 package for MXNet is no longer maintained for new releases.**
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu90](https://pypi.python.org/pypi/mxnet-cu90/) with CUDA-9.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Raspberry Pi/ARM) or other versions of
CUDA, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu80
-```
diff --git a/tools/pip/doc/CU90_ADDITIONAL.md b/tools/pip/doc/CU90_ADDITIONAL.md
deleted file mode 100644
index 770914b..0000000
--- a/tools/pip/doc/CU90_ADDITIONAL.md
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--- Licensed to the Apache Software Foundation (ASF) under one -->
-<!--- or more contributor license agreements. See the NOTICE file -->
-<!--- distributed with this work for additional information -->
-<!--- regarding copyright ownership. The ASF licenses this file -->
-<!--- to you under the Apache License, Version 2.0 (the -->
-<!--- "License"); you may not use this file except in compliance -->
-<!--- with the License. You may obtain a copy of the License at -->
-
-<!--- http://www.apache.org/licenses/LICENSE-2.0 -->
-
-<!--- Unless required by applicable law or agreed to in writing, -->
-<!--- software distributed under the License is distributed on an -->
-<!--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
-<!--- KIND, either express or implied. See the License for the -->
-<!--- specific language governing permissions and limitations -->
-<!--- under the License. -->
-
-**CUDA 9.0 package for MXNet is no longer maintained for new releases.**
-
-Prerequisites
--------------
-This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
-- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet-cu80](https://pypi.python.org/pypi/mxnet-cu80/) with CUDA-8.0 support.
-- [mxnet-cu75](https://pypi.python.org/pypi/mxnet-cu75/) with CUDA-7.5 support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/).
-
-To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
-
-To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
-
-Installation
-------------
-To install:
-```bash
-pip install mxnet-cu90
-```
-
-Nightly Builds
---------------
-To install the latest nightly build, use:
-```bash
-pip install --pre mxnet-cu90 -f https://dist.mxnet.io/python
-```
diff --git a/tools/pip/doc/CU92_ADDITIONAL.md b/tools/pip/doc/CU92_ADDITIONAL.md
index 15c2211..ea2c299 100644
--- a/tools/pip/doc/CU92_ADDITIONAL.md
+++ b/tools/pip/doc/CU92_ADDITIONAL.md
@@ -26,6 +26,14 @@ This package supports Linux and Windows platforms. You may
also want to check:
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
+To use this package on Linux you need the `libquadmath.so.0` shared library. On
+Debian based systems, including Ubuntu, run `sudo apt install libquadmath0` to
+install the shared library. On RHEL based systems, including CentOS, run `sudo
+yum install libquadmath` to install the shared library. As `libquadmath.so.0`
is
+a GPL library and MXNet part of the Apache Software Foundation, MXNet must not
+redistribute `libquadmath.so.0` as part of the Pypi package and users must
+manually install it.
+
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
Installation
diff --git a/tools/pip/doc/NATIVE_ADDITIONAL.md
b/tools/pip/doc/NATIVE_ADDITIONAL.md
index a2e48b0..f420955 100644
--- a/tools/pip/doc/NATIVE_ADDITIONAL.md
+++ b/tools/pip/doc/NATIVE_ADDITIONAL.md
@@ -18,12 +18,21 @@
Prerequisites
-------------
This package supports Linux and Windows platforms. You may also want to check:
-- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.2
support.
+- [mxnet-cu102](https://pypi.python.org/pypi/mxnet-cu102/) with CUDA-10.2
support.
+- [mxnet-cu101](https://pypi.python.org/pypi/mxnet-cu101/) with CUDA-10.1
support.
- [mxnet-cu92](https://pypi.python.org/pypi/mxnet-cu92/) with CUDA-9.2 support.
-- [mxnet](https://pypi.python.org/pypi/mxnet/) CPU build with MKLDNN.
+- [mxnet](https://pypi.python.org/pypi/mxnet/).
To download CUDA, check [CUDA
download](https://developer.nvidia.com/cuda-downloads). For more instructions,
check [CUDA Toolkit online
documentation](http://docs.nvidia.com/cuda/index.html).
+To use this package on Linux you need the `libquadmath.so.0` shared library. On
+Debian based systems, including Ubuntu, run `sudo apt install libquadmath0` to
+install the shared library. On RHEL based systems, including CentOS, run `sudo
+yum install libquadmath` to install the shared library. As `libquadmath.so.0`
is
+a GPL library and MXNet part of the Apache Software Foundation, MXNet must not
+redistribute `libquadmath.so.0` as part of the Pypi package and users must
+manually install it.
+
To install for other platforms (e.g. Windows, Raspberry Pi/ARM) or other
versions, check [Installing
MXNet](https://mxnet.apache.org/versions/master/install/index.html) for
instructions on building from source.
Installation
diff --git a/tools/pip/setup.py b/tools/pip/setup.py
index afc7a4f..d9183f9 100644
--- a/tools/pip/setup.py
+++ b/tools/pip/setup.py
@@ -167,8 +167,6 @@ if platform.system() == 'Linux':
else:
shutil.copy(os.path.join(libdir, 'libgfortran.so.4'), mxdir)
package_data['mxnet'].append('mxnet/libgfortran.so.4')
- shutil.copy(os.path.join(libdir, 'libquadmath.so.0'), mxdir)
- package_data['mxnet'].append('mxnet/libquadmath.so.0')
if os.path.exists(os.path.join(libdir, 'libopenblas.so.0')):
shutil.copy(os.path.join(libdir, 'libopenblas.so.0'), mxdir)
package_data['mxnet'].append('mxnet/libquadmath.so.0')
