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

Commit 7d09efc

Browse files
josephevansWei Chu
andauthored
[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 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 #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 #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 <weichu@amazon.com>
1 parent 7b2c0c8 commit 7d09efc

9 files changed

Lines changed: 21 additions & 38 deletions

LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@
292292
=======================================================================================
293293

294294
3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
295+
include/dmlc/concurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h)
295296
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake (Copy of the License available at licenses/BSD2)
296297
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
297298
3rdparty/tvm/3rdparty/picojson/picojson.h
@@ -321,6 +322,7 @@
321322
=======================================================================================
322323

323324
3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
325+
include/dmlc/blockingconcurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h)
324326

325327
=======================================================================================
326328
Apache-2.0 license + 3-clause BSD license

ci/build_windows.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def windows_build(args):
158158
logging.info("Found MXNet root: {}".format(mxnet_root))
159159

160160
# cuda thrust / CUB + VS 2019 is flaky: try multiple times if fail
161-
MAXIMUM_TRY = 5
161+
MAXIMUM_TRY = 2
162162
build_try = 0
163163

164164
while build_try < MAXIMUM_TRY:

ci/docker/Dockerfile.build.centos7_aarch64_cpu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ RUN yum -y check-update || true && \
2727
yum -y install epel-release centos-release-scl centos-release-scl-rh && \
2828
yum install -y \
2929
# Utilities
30+
ca-certificates \
3031
wget \
3132
unzip \
3233
patchelf \

ci/docker/Dockerfile.build.ubuntu_cpu_jekyll

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,54 +16,30 @@
1616
# specific language governing permissions and limitations
1717
# under the License.
1818
#
19-
# Dockerfile to build and run MXNet on Ubuntu 18.04 for CPU
19+
# Dockerfile to build MXNet main website
2020

21-
FROM ubuntu:18.04
21+
FROM ruby:2.6.5-buster
2222

2323
WORKDIR /work/deps
2424

25-
SHELL ["/bin/bash", "-l", "-c" ]
26-
27-
RUN apt-get update && apt-get install -y \
28-
build-essential \
29-
git \
30-
zlib1g-dev \
31-
wget \
32-
gnupg2 \
33-
curl
34-
35-
# Always last, except here to prevent conflicts with rvm
36-
ARG USER_ID=0
37-
ARG GROUP_ID=0
38-
COPY install/ubuntu_adduser.sh /work/
39-
RUN /work/ubuntu_adduser.sh
40-
41-
RUN curl -sSL https://rvm.io/mpapis.asc | gpg2 --import - && \
42-
curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import - && \
43-
curl -sSL https://get.rvm.io | bash -s stable
44-
45-
RUN source /etc/profile.d/rvm.sh && \
46-
rvm requirements && \
47-
rvm install 2.6.3 && \
48-
rvm use 2.6.3 --default
49-
5025
ENV BUNDLE_HOME=/work/deps/bundle
5126
ENV BUNDLE_APP_CONFIG=/work/deps/bundle
5227
ENV BUNDLE_BIN=/work/deps/bundle/bin
5328
ENV GEM_BIN=/work/deps/gem/bin
5429
ENV GEM_HOME=/work/deps/gem
5530

56-
RUN echo "gem: --no-ri --no-rdoc" > ~/.gemrc
57-
RUN yes | gem update --system
58-
RUN yes | gem install --force bundler
59-
RUN gem install jekyll
31+
RUN echo "gem: --no-ri --no-rdoc" > ~/.gemrc && \
32+
yes | gem update --system && \
33+
yes | gem install --force bundler && \
34+
gem install jekyll
6035

6136
ENV PATH=$BUNDLE_BIN:$GEM_BIN:$PATH
6237

6338
COPY runtime_functions.sh /work/
6439

65-
RUN chown -R jenkins_slave /work/ && \
66-
chown -R jenkins_slave /usr/local/bin && \
67-
chown -R jenkins_slave /usr/local/rvm
40+
ARG USER_ID=0
41+
ARG GROUP_ID=0
42+
COPY install/ubuntu_adduser.sh /work/
43+
RUN /work/ubuntu_adduser.sh
6844

6945
WORKDIR /work/mxnet

ci/docker/install/centos7_core.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
set -ex
2424

2525
# Multipackage installation does not fail in yum
26+
yum -y install ca-certificates
2627
yum -y install epel-release
2728
yum -y install git
2829
yum -y install wget

ci/docker/install/ubuntu_perl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ set -ex
2424
# install libraries for mxnet's perl package on ubuntu
2525
apt-get update || true
2626
apt-get install -y libmouse-perl pdl cpanminus swig libgraphviz-perl
27-
cpanm -q Function::Parameters Hash::Ordered PDL::CCS
27+
cpanm -q Function::Parameters Hash::Ordered CHM/PDL-2.019.tar.gz PDL::CCS

ci/docker/install/ubuntu_publish.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ apt-get install -y git \
5353
pkg-config \
5454
openjdk-8-jdk
5555

56+
# disable expired cert that causes download issues with let's encrypt certs
57+
sed -i 's/mozilla\/DST_Root_CA_X3.crt/!mozilla\/DST_Root_CA_X3.crt/g' /etc/ca-certificates.conf
58+
update-ca-certificates
59+
5660
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 \
5761
|| 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
5862

ci/docker/runtime_functions.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,6 @@ build_ubuntu_cpu_docs() {
16921692

16931693
build_jekyll_docs() {
16941694
set -ex
1695-
source /etc/profile.d/rvm.sh
16961695

16971696
pushd .
16981697
build_docs_setup

tools/license_header.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def _lines_have_multiple_license(lines):
198198
for l in lines:
199199
if any(p in l for p in _APACHE_LICENSE_PATTERNS):
200200
has_apache_license = True
201-
elif any(p in l for p in _OTHER_LICENSE_PATTERNS):
201+
if any(p in l for p in _OTHER_LICENSE_PATTERNS):
202202
has_other_license = True
203203
return (has_apache_license and has_other_license)
204204

0 commit comments

Comments
 (0)