Cherry pick license fixes for 1.6 (apache#17460)

* Update NOTICE to fix copyright years (apache#17330) * Update LICENSE for fonts (apache#17365) * license np_einsum file under bsd (apache#17367) * license under bsd * fix rat exclude * remove unused file with license issue (apache#17371) * [LICENSE] fix cpp predcit license (apache#17377) * fix cpp predcit license * add white list (#210) * fix white list (#211) Co-authored-by: Lai Wei <royweilai@gmail.com> * add disclaimer (apache#17428) * add disclaimer * add white list * fix exclude * remove disclaimer * update tools/pip Co-authored-by: Haibin Lin <linhaibin.eric@gmail.com>
eric-haibin-lin · Jan 29, 2020 · 6eec9da · 6eec9da
1 parent 2c61787
commit 6eec9da
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 329 deletions.
diff --git a/DISCLAIMER b/DISCLAIMER
diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
@@ -0,0 +1,24 @@
+Apache MXNet is an effort undergoing incubation at
+The Apache Software Foundation (ASF), sponsored by the name of Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+Some of the incubating project’s releases may not be fully compliant with ASF policy.
+For example, releases may have incomplete or un-reviewed licensing conditions.
+What follows is a list of known issues the project is currently aware of
+(note that this list, by definition, is likely to be incomplete):
+
+1. https://github.com/apache/incubator-mxnet/issues/17329
+2. https://github.com/apache/incubator-mxnet/issues/15547
+3. https://github.com/apache/incubator-mxnet/issues/15569
+
+If you are planning to incorporate this work into your product/project,
+please be aware that you will need to conduct a thorough licensing review
+to determine the overall implications of including this work.
+For the current status of this project through the Apache Incubator visit:
+https://incubator.apache.org/projects/mxnet.html
diff --git a/LICENSE b/LICENSE
@@ -279,7 +279,8 @@
  Copyright (c) 2009-2018 The MathJax Consortium
  Copyright (c) 2015-2017 Martin Hensel
  Copyright (c) 2007, Apostolos Syropoulos (<asyropoulos@yahoo.com>)
-
+ 28. material-design-icons - For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/material-design-icons-3.0.1/iconfont/
+ 29. Roboto fonts - For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/font/Roboto/
 
  =======================================================================================
  MIT licenses
@@ -334,9 +335,11 @@
  cmake/Modules/FindCUDAToolkit.cmake
  3rdparty/mkldnn/cmake/FindOpenCL.cmake
  Copyright 2000-2019 Kitware, Inc. and Contributors
- 10 ittnotify - For details, see, 3rdparty/mkldnn/src/cpu/jit_utils/jitprofiling/
+ 10. ittnotify - For details, see, 3rdparty/mkldnn/src/cpu/jit_utils/jitprofiling/
  Copyright (c) 2011, Intel Corporation
-
+ 11. Numpy einsum operator - For details, see src/operator/numpy/np_einsum_op-inl.h
+ Copyright (c) 2005-2019, NumPy Developers.
+ Copyright (c) 2019, The Apache Software Foundation.
 
  =======================================================================================
  2-clause BSD licenses
@@ -940,6 +943,15 @@
 
  For more information, please refer to <http://unlicense.org>
 
+ 20. Font-Awesome, SIL Open Font License(OFL)
+
+ For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/webfonts/
+
+ In the Font Awesome Free download, the SIL OFL license applies to all icons packaged as web and desktop font files.
+
+ For more information, please refer to <https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt>
+
+ For full text of the SIL Open Font License, refer to <https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL>
 
  =======================================================================================
  Appendix

diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
  Apache MXNET (incubating)
- Copyright 2017 and onwards The Apache Software Foundation
+ Copyright 2017-2020 The Apache Software Foundation
 
  This product includes software developed at
  The Apache Software Foundation (http://www.apache.org/).
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -152,7 +152,7 @@ gather_licenses() {
  cp tools/dependencies/LICENSE.binary.dependencies licenses/
  cp NOTICE licenses/
  cp LICENSE licenses/
- cp DISCLAIMER licenses/
+ cp DISCLAIMER-WIP licenses/
 }
 
 build_ubuntu_cpu_release() {

diff --git a/example/image-classification/predict-cpp/image-classification-predict.cc b/example/image-classification/predict-cpp/image-classification-predict.cc
@@ -1,20 +1,15 @@
 /*
- * 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
+ * Licensed 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
+ *  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.
+ * 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.
  */
 
 /*!

diff --git a/src/operator/numpy/np_einsum_op-inl.h b/src/operator/numpy/np_einsum_op-inl.h
@@ -1,24 +1,7 @@
-/*
- * 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.
- */
-
 /*
  * Copyright (c) 2005-2019, NumPy Developers.
+ * Copyright (c) 2019, The Apache Software Foundation.
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,6 +36,8 @@
 /*!
  * \file np_einsum_op-inl.h
  * \brief Function definition of numpy-compatible einsum operator
+ * modified by Haozheng Fan(@hzfan) from:
+ * https://github.com/numpy/numpy/blob/master/numpy/core/src/multiarray/einsum.c.src
  */
 
 #ifndef MXNET_OPERATOR_NUMPY_NP_EINSUM_OP_INL_H_

diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes
@@ -76,3 +76,6 @@ searchtools_custom.js
 theme.conf
 LICENSE.binary.dependencies
 cmake/Modules/FindCUDAToolkit.cmake
+image-classification-predict.cc
+np_einsum_op-inl.h
+DISCLAIMER-WIP
diff --git a/tests/nightly/sh2ju.sh b/tests/nightly/sh2ju.sh