Skip to content

Commit

Permalink
[v1.9.x] LICENSE and CI fixes for 1.9 release (apache#20626)
Browse files Browse the repository at this point in the history
* 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 3ae1192.

* Revert "Use http to download libcurl to avoid let's encrypt intermediate CA cert expiration issue."

This reverts commit 92432a6.

* 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 apache#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 8b64859.

* Add back change after revert.

* Revert "Fix lint"

This reverts commit 34b430c.

* Revert "Skip mkldnn test, tracking at apache#20643."

This reverts commit f45a6e3.

* Revert "Split test_hybrid_static_memory_switching() into 3 tests in order to isolate failures."

This reverts commit 23db9ba.

* Revert changing windows build flags.

Co-authored-by: Wei Chu <[email protected]>
  • Loading branch information
josephevans and Wei Chu committed Oct 7, 2021
1 parent 695ff99 commit 127669b
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 38 deletions.
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/build_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions ci/docker/Dockerfile.build.centos7_aarch64_cpu
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
44 changes: 10 additions & 34 deletions ci/docker/Dockerfile.build.ubuntu_cpu_jekyll
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ci/docker/install/centos7_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/install/ubuntu_perl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions ci/docker/install/ubuntu_publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1692,7 +1692,6 @@ build_ubuntu_cpu_docs() {

build_jekyll_docs() {
set -ex
source /etc/profile.d/rvm.sh

pushd .
build_docs_setup
Expand Down
2 changes: 1 addition & 1 deletion tools/license_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,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)

Expand Down

0 comments on commit 127669b

Please sign in to comment.