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

Commit 6eec9da

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

File tree

13 files changed

+63
-329
lines changed

13 files changed

+63
-329
lines changed

DISCLAIMER

Lines changed: 0 additions & 12 deletions
This file was deleted.

DISCLAIMER-WIP

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Apache MXNet is an effort undergoing incubation at
2+
The Apache Software Foundation (ASF), sponsored by the name of Apache Incubator PMC.
3+
4+
Incubation is required of all newly accepted projects until a further review
5+
indicates that the infrastructure, communications, and decision making process
6+
have stabilized in a manner consistent with other successful ASF projects.
7+
8+
While incubation status is not necessarily a reflection of the completeness
9+
or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
10+
11+
Some of the incubating project’s releases may not be fully compliant with ASF policy.
12+
For example, releases may have incomplete or un-reviewed licensing conditions.
13+
What follows is a list of known issues the project is currently aware of
14+
(note that this list, by definition, is likely to be incomplete):
15+
16+
1. https://github.com/apache/incubator-mxnet/issues/17329
17+
2. https://github.com/apache/incubator-mxnet/issues/15547
18+
3. https://github.com/apache/incubator-mxnet/issues/15569
19+
20+
If you are planning to incorporate this work into your product/project,
21+
please be aware that you will need to conduct a thorough licensing review
22+
to determine the overall implications of including this work.
23+
For the current status of this project through the Apache Incubator visit:
24+
https://incubator.apache.org/projects/mxnet.html

LICENSE

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@
279279
Copyright (c) 2009-2018 The MathJax Consortium
280280
Copyright (c) 2015-2017 Martin Hensel
281281
Copyright (c) 2007, Apostolos Syropoulos (<asyropoulos@yahoo.com>)
282-
282+
28. material-design-icons - For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/material-design-icons-3.0.1/iconfont/
283+
29. Roboto fonts - For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/font/Roboto/
283284

284285
=======================================================================================
285286
MIT licenses
@@ -334,9 +335,11 @@
334335
cmake/Modules/FindCUDAToolkit.cmake
335336
3rdparty/mkldnn/cmake/FindOpenCL.cmake
336337
Copyright 2000-2019 Kitware, Inc. and Contributors
337-
10 ittnotify - For details, see, 3rdparty/mkldnn/src/cpu/jit_utils/jitprofiling/
338+
10. ittnotify - For details, see, 3rdparty/mkldnn/src/cpu/jit_utils/jitprofiling/
338339
Copyright (c) 2011, Intel Corporation
339-
340+
11. Numpy einsum operator - For details, see src/operator/numpy/np_einsum_op-inl.h
341+
Copyright (c) 2005-2019, NumPy Developers.
342+
Copyright (c) 2019, The Apache Software Foundation.
340343

341344
=======================================================================================
342345
2-clause BSD licenses
@@ -940,6 +943,15 @@
940943

941944
For more information, please refer to <http://unlicense.org>
942945

946+
20. Font-Awesome, SIL Open Font License(OFL)
947+
948+
For details, see ./docs/python_docs/themes/mx-theme/mxtheme/static/webfonts/
949+
950+
In the Font Awesome Free download, the SIL OFL license applies to all icons packaged as web and desktop font files.
951+
952+
For more information, please refer to <https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt>
953+
954+
For full text of the SIL Open Font License, refer to <https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL>
943955

944956
=======================================================================================
945957
Appendix

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache MXNET (incubating)
2-
Copyright 2017 and onwards The Apache Software Foundation
2+
Copyright 2017-2020 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

ci/docker/runtime_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ gather_licenses() {
152152
cp tools/dependencies/LICENSE.binary.dependencies licenses/
153153
cp NOTICE licenses/
154154
cp LICENSE licenses/
155-
cp DISCLAIMER licenses/
155+
cp DISCLAIMER-WIP licenses/
156156
}
157157

158158
build_ubuntu_cpu_release() {

example/image-classification/predict-cpp/image-classification-predict.cc

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed under the Apache License, Version 2.0 (the "License");
3+
* you may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
95
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* http://www.apache.org/licenses/LICENSE-2.0
117
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
1813
*/
1914

2015
/*!

src/operator/numpy/np_einsum_op-inl.h

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
1-
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
18-
*/
19-
201
/*
212
* Copyright (c) 2005-2019, NumPy Developers.
3+
* Copyright (c) 2019, The Apache Software Foundation.
4+
*
225
* All rights reserved.
236
*
247
* Redistribution and use in source and binary forms, with or without
@@ -53,6 +36,8 @@
5336
/*!
5437
* \file np_einsum_op-inl.h
5538
* \brief Function definition of numpy-compatible einsum operator
39+
* modified by Haozheng Fan(@hzfan) from:
40+
* https://github.com/numpy/numpy/blob/master/numpy/core/src/multiarray/einsum.c.src
5641
*/
5742

5843
#ifndef MXNET_OPERATOR_NUMPY_NP_EINSUM_OP_INL_H_

tests/nightly/apache_rat_license_check/rat-excludes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,6 @@ searchtools_custom.js
7676
theme.conf
7777
LICENSE.binary.dependencies
7878
cmake/Modules/FindCUDAToolkit.cmake
79+
image-classification-predict.cc
80+
np_einsum_op-inl.h
81+
DISCLAIMER-WIP

tests/nightly/sh2ju.sh

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)