apache · josephevans · Oct 7, 2021 · Oct 1, 2021 · Oct 2, 2021 · Oct 2, 2021
diff --git 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

@@ -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:

@@ -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 \

@@ -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
@@ -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

@@ -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
@@ -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
 

@@ -1692,7 +1692,6 @@ build_ubuntu_cpu_docs() {
 
 build_jekyll_docs() {
     set -ex
-    source /etc/profile.d/rvm.sh
 
     pushd .
     build_docs_setup

@@ -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)