You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by je...@apache.org on 2021/10/07 17:58:33 UTC
[incubator-mxnet] branch v1.9.x updated: [v1.9.x] LICENSE and CI
fixes for 1.9 release (#20626)
This is an automated email from the ASF dual-hosted git repository.
jevans pushed a commit to branch v1.9.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.9.x by this push:
new 7d09efc [v1.9.x] LICENSE and CI fixes for 1.9 release (#20626)
7d09efc is described below
commit 7d09efc7c93fd5801e17c370bf0de2b0e89df7b7
Author: Joe Evans <jo...@gmail.com>
AuthorDate: Thu Oct 7 10:56:34 2021 -0700
[v1.9.x] LICENSE and CI fixes for 1.9 release (#20626)
* Update LICENSE to include symlinks in include/dmlc licensed under non-ASF-2.0 licenses.
* Update ca-certificates package on centos7 due to let's encrypt recent issue (see https://blog.devgenius.io/rhel-centos-7-fix-for-lets-encrypt-change-8af2de587fe4)
* Update PDL package before installing PDL::CCS to prevent dependency issue.
* Install latest ca-certificates package on aarch64 as well.
* Change libtiff download URL to http to prevent let's encrypt CA chain issue.
* update Dockerfile.build.ubuntu_cpu_jekyll
* Use http to download libcurl to avoid let's encrypt intermediate CA cert expiration issue.
* Lock down perl PDL version to specific version to prevent test failures.
* No need to source rvm.sh in environment now that we are using a different container.
* Update license_header.py tool to trigger error when two licenses are found.
* Remove expired CA cert from ubuntu14.04 containers.
* Revert "Change libtiff download URL to http to prevent let's encrypt CA chain issue."
This reverts commit 3ae1192b8598e9f68761e196f7ac6d9bee57fbe3.
* Revert "Use http to download libcurl to avoid let's encrypt intermediate CA cert expiration issue."
This reverts commit 92432a66e045c847027daf3eb4da2ef974b796ae.
* Back off retry count for windows builds to reduce cost.
* Split test_hybrid_static_memory_switching() into 3 tests in order to isolate failures.
* Skip mkldnn test, tracking at https://github.com/apache/incubator-mxnet/issues/20643.
* Fix lint
* Attempt to fix windows build parameters with MKLDNN builds - do not use debug builds when linking against MKLDNN.
* Revert "Update ca-certificates package on centos7 due to let's encrypt recent issue (see https://blog.devgenius.io/rhel-centos-7-fix-for-lets-encrypt-change-8af2de587fe4)"
This reverts commit 8b64859589116cb7cea0b42beeaa7d2eb970a0ac.
* Add back change after revert.
* Revert "Fix lint"
This reverts commit 34b430c2636d32a2a168774ca0a7cd19ad834e50.
* Revert "Skip mkldnn test, tracking at https://github.com/apache/incubator-mxnet/issues/20643."
This reverts commit f45a6e37b9440165d60e49545265277425893663.
* Revert "Split test_hybrid_static_memory_switching() into 3 tests in order to isolate failures."
This reverts commit 23db9bac614cf8a543393840afc45cb05dbb96db.
* Revert changing windows build flags.
Co-authored-by: Wei Chu <we...@amazon.com>
---
LICENSE | 2 ++
ci/build_windows.py | 2 +-
ci/docker/Dockerfile.build.centos7_aarch64_cpu | 1 +
ci/docker/Dockerfile.build.ubuntu_cpu_jekyll | 44 ++++++--------------------
ci/docker/install/centos7_core.sh | 1 +
ci/docker/install/ubuntu_perl.sh | 2 +-
ci/docker/install/ubuntu_publish.sh | 4 +++
ci/docker/runtime_functions.sh | 1 -
tools/license_header.py | 2 +-
9 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/LICENSE b/LICENSE
index fd09e5a..c2005d8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -292,6 +292,7 @@
=======================================================================================
3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
+ include/dmlc/concurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h)
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake (Copy of the License available at licenses/BSD2)
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
3rdparty/tvm/3rdparty/picojson/picojson.h
@@ -321,6 +322,7 @@
=======================================================================================
3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
+ include/dmlc/blockingconcurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h)
=======================================================================================
Apache-2.0 license + 3-clause BSD license
diff --git a/ci/build_windows.py b/ci/build_windows.py
index 3d9dbfc..87f1db7 100755
--- a/ci/build_windows.py
+++ b/ci/build_windows.py
@@ -158,7 +158,7 @@ def windows_build(args):
logging.info("Found MXNet root: {}".format(mxnet_root))
# cuda thrust / CUB + VS 2019 is flaky: try multiple times if fail
- MAXIMUM_TRY = 5
+ MAXIMUM_TRY = 2
build_try = 0
while build_try < MAXIMUM_TRY:
diff --git a/ci/docker/Dockerfile.build.centos7_aarch64_cpu b/ci/docker/Dockerfile.build.centos7_aarch64_cpu
index 3641510..be91042 100644
--- a/ci/docker/Dockerfile.build.centos7_aarch64_cpu
+++ b/ci/docker/Dockerfile.build.centos7_aarch64_cpu
@@ -27,6 +27,7 @@ RUN yum -y check-update || true && \
yum -y install epel-release centos-release-scl centos-release-scl-rh && \
yum install -y \
# Utilities
+ ca-certificates \
wget \
unzip \
patchelf \
diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu_jekyll b/ci/docker/Dockerfile.build.ubuntu_cpu_jekyll
index 080039d..cc23aea 100644
--- a/ci/docker/Dockerfile.build.ubuntu_cpu_jekyll
+++ b/ci/docker/Dockerfile.build.ubuntu_cpu_jekyll
@@ -16,54 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
-# Dockerfile to build and run MXNet on Ubuntu 18.04 for CPU
+# Dockerfile to build MXNet main website
-FROM ubuntu:18.04
+FROM ruby:2.6.5-buster
WORKDIR /work/deps
-SHELL ["/bin/bash", "-l", "-c" ]
-
-RUN apt-get update && apt-get install -y \
- build-essential \
- git \
- zlib1g-dev \
- wget \
- gnupg2 \
- curl
-
-# Always last, except here to prevent conflicts with rvm
-ARG USER_ID=0
-ARG GROUP_ID=0
-COPY install/ubuntu_adduser.sh /work/
-RUN /work/ubuntu_adduser.sh
-
-RUN curl -sSL https://rvm.io/mpapis.asc | gpg2 --import - && \
- curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import - && \
- curl -sSL https://get.rvm.io | bash -s stable
-
-RUN source /etc/profile.d/rvm.sh && \
- rvm requirements && \
- rvm install 2.6.3 && \
- rvm use 2.6.3 --default
-
ENV BUNDLE_HOME=/work/deps/bundle
ENV BUNDLE_APP_CONFIG=/work/deps/bundle
ENV BUNDLE_BIN=/work/deps/bundle/bin
ENV GEM_BIN=/work/deps/gem/bin
ENV GEM_HOME=/work/deps/gem
-RUN echo "gem: --no-ri --no-rdoc" > ~/.gemrc
-RUN yes | gem update --system
-RUN yes | gem install --force bundler
-RUN gem install jekyll
+RUN echo "gem: --no-ri --no-rdoc" > ~/.gemrc && \
+ yes | gem update --system && \
+ yes | gem install --force bundler && \
+ gem install jekyll
ENV PATH=$BUNDLE_BIN:$GEM_BIN:$PATH
COPY runtime_functions.sh /work/
-RUN chown -R jenkins_slave /work/ && \
- chown -R jenkins_slave /usr/local/bin && \
- chown -R jenkins_slave /usr/local/rvm
+ARG USER_ID=0
+ARG GROUP_ID=0
+COPY install/ubuntu_adduser.sh /work/
+RUN /work/ubuntu_adduser.sh
WORKDIR /work/mxnet
\ No newline at end of file
diff --git a/ci/docker/install/centos7_core.sh b/ci/docker/install/centos7_core.sh
index 9b2452e..f9aa7a7 100755
--- a/ci/docker/install/centos7_core.sh
+++ b/ci/docker/install/centos7_core.sh
@@ -23,6 +23,7 @@
set -ex
# Multipackage installation does not fail in yum
+yum -y install ca-certificates
yum -y install epel-release
yum -y install git
yum -y install wget
diff --git a/ci/docker/install/ubuntu_perl.sh b/ci/docker/install/ubuntu_perl.sh
index e04141e..1f4a983 100755
--- a/ci/docker/install/ubuntu_perl.sh
+++ b/ci/docker/install/ubuntu_perl.sh
@@ -24,4 +24,4 @@ set -ex
# install libraries for mxnet's perl package on ubuntu
apt-get update || true
apt-get install -y libmouse-perl pdl cpanminus swig libgraphviz-perl
-cpanm -q Function::Parameters Hash::Ordered PDL::CCS
+cpanm -q Function::Parameters Hash::Ordered CHM/PDL-2.019.tar.gz PDL::CCS
diff --git a/ci/docker/install/ubuntu_publish.sh b/ci/docker/install/ubuntu_publish.sh
index 6db7f25..3eb949b 100755
--- a/ci/docker/install/ubuntu_publish.sh
+++ b/ci/docker/install/ubuntu_publish.sh
@@ -53,6 +53,10 @@ apt-get install -y git \
pkg-config \
openjdk-8-jdk
+# disable expired cert that causes download issues with let's encrypt certs
+sed -i 's/mozilla\/DST_Root_CA_X3.crt/!mozilla\/DST_Root_CA_X3.crt/g' /etc/ca-certificates.conf
+update-ca-certificates
+
curl -o apache-maven-3.3.9-bin.tar.gz -L http://www.eu.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz \
|| curl -o apache-maven-3.3.9-bin.tar.gz -L https://search.maven.org/remotecontent?filepath=org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.tar.gz
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index c0047ce..1bd2884 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -1692,7 +1692,6 @@ build_ubuntu_cpu_docs() {
build_jekyll_docs() {
set -ex
- source /etc/profile.d/rvm.sh
pushd .
build_docs_setup
diff --git a/tools/license_header.py b/tools/license_header.py
index c304fc4..f1e7179 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -198,7 +198,7 @@ def _lines_have_multiple_license(lines):
for l in lines:
if any(p in l for p in _APACHE_LICENSE_PATTERNS):
has_apache_license = True
- elif any(p in l for p in _OTHER_LICENSE_PATTERNS):
+ if any(p in l for p in _OTHER_LICENSE_PATTERNS):
has_other_license = True
return (has_apache_license and has_other_license)