You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by la...@apache.org on 2020/12/23 20:19:53 UTC

[incubator-mxnet] branch master updated: CI: fix test_rat_check (#19711)

This is an automated email from the ASF dual-hosted git repository.

lausen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 28a4b1f  CI: fix test_rat_check (#19711)
28a4b1f is described below

commit 28a4b1fb232f3675787972057efac9e740dfbd9d
Author: Leonard Lausen <la...@amazon.com>
AuthorDate: Wed Dec 23 15:18:24 2020 -0500

    CI: fix test_rat_check (#19711)
---
 ci/docker/Dockerfile.build.ubuntu                   |  1 +
 ci/docker/runtime_functions.sh                      |  1 +
 cmake/libmxnet.sym                                  | 17 +++++++++++++++++
 cmake/libmxnet.ver                                  | 13 -------------
 example/automatic-mixed-precision/common            |  1 -
 tests/nightly/apache_rat_license_check/rat-excludes |  6 ++++++
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu
index 139b870..37ddfa1 100644
--- a/ci/docker/Dockerfile.build.ubuntu
+++ b/ci/docker/Dockerfile.build.ubuntu
@@ -50,6 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         git \
         protobuf-compiler \
         libprotobuf-dev \
+        default-jdk \
         clang-6.0 \
         python-yaml \
         clang-10 \
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 1a307f3..d913325 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -991,6 +991,7 @@ unittest_ubuntu_python3_arm() {
 #Runs Apache RAT Check on MXNet Source for License Headers
 test_rat_check() {
     set -e
+    set -o pipefail
     pushd .
 
     cd /usr/local/src/apache-rat-0.13
diff --git a/cmake/libmxnet.sym b/cmake/libmxnet.sym
index 9f45fb7..79acdb1 100644
--- a/cmake/libmxnet.sym
+++ b/cmake/libmxnet.sym
@@ -1,3 +1,20 @@
+# 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.
+
 *MX*
 *NN*
 *mx*
diff --git a/cmake/libmxnet.ver b/cmake/libmxnet.ver
deleted file mode 100644
index 82e8036..0000000
--- a/cmake/libmxnet.ver
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    global:
-        *NN*;
-        *MX*;
-        *nn*;
-        *mx*;
-        *NDArray*;
-        *Engine*Get*;
-        *Storage*Get*;
-        *on_enter_api*;
-        *on_exit_api*;
-    local: *;
-};
diff --git a/example/automatic-mixed-precision/common b/example/automatic-mixed-precision/common
deleted file mode 120000
index cafb914..0000000
--- a/example/automatic-mixed-precision/common
+++ /dev/null
@@ -1 +0,0 @@
-../image-classification/common
\ No newline at end of file
diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes
index 2c29f00..8efc825 100755
--- a/tests/nightly/apache_rat_license_check/rat-excludes
+++ b/tests/nightly/apache_rat_license_check/rat-excludes
@@ -13,6 +13,12 @@ target/*
 site/*
 xml/*
 
+# AL2 License header not a beginning of file
+doap.rdf
+
+# licenses
+licenses/*
+
 # Separate licenses, refer to LICENSE in each folder or header
 
 # Sphinx themes