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

Cherry pick license fixes for 1.6 #17460

Merged
merged 6 commits into from
Jan 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions DISCLAIMER

This file was deleted.

24 changes: 24 additions & 0 deletions DISCLAIMER-WIP
Original file line number Diff line number Diff line change
@@ -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
18 changes: 15 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@
Copyright (c) 2009-2018 The MathJax Consortium
Copyright (c) 2015-2017 Martin Hensel
Copyright (c) 2007, Apostolos Syropoulos (<[email protected]>)

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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -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/).
2 changes: 1 addition & 1 deletion ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*/

/*!
Expand Down
23 changes: 4 additions & 19 deletions src/operator/numpy/np_einsum_op-inl.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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_
Expand Down
3 changes: 3 additions & 0 deletions tests/nightly/apache_rat_license_check/rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -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
149 changes: 0 additions & 149 deletions tests/nightly/sh2ju.sh

This file was deleted.

Loading