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

Port top-level-project updates from v1.x branch #21162

Merged
merged 5 commits into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
[v1.9.x] TLP Updates (#21148) (#21149)
* Update repo URLs and website to remove Incubating references.

* Update repo to remove references to Apache Incubator, update website, remove DISCLAIMER.

* Update license check configuration.

* Update license check configuration.

* Update license check configuration.

* Update license check configuration.

* Update license check configuration.

* Add Apache 2.0 license to files without it.

* Add Apache 2.0 license to files without it.

* Remove references to DISCLAIMER in build scripts / configs.

* Rearrange dependencies for ubuntu_tutorials to prevent pip hangs.

* Change node type for Cpp: MKLDNN+GPU builds.

* Update node type

* Add missing node assign for G4 node type.
  • Loading branch information
josephevans committed Jan 3, 2023
commit dbc3b3411f3b5e9d186afb627b2e0254e8056626
7 changes: 7 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ header:
- '.gitmodules'
- '.licenserc.yaml'
- '.asf.yaml'
- 'CODEOWNERS'
- 'python/mxnet/_cy3/README.md'
- 'tools/dependencies/LICENSE.binary.dependencies'
# files not distributed in source archive (listed in tools/source-exclude-artifacts.txt)
- 'docs'
- 'R-package'
# files licensed under apache-2.0 license but do not include full license headers recognized by skywalking-eyes
- '**/*.ipynb'
- 'src/operator/deformable_convolution-inl.h'
Expand Down Expand Up @@ -68,6 +74,7 @@ header:
- 'include/dmlc' # symlink to 3rdparty/dmlc-core/include/dmlc
- 'include/mshadow' # symlink to 3rdparty/mshadow/mshadow
- 'include/onednn' # symlinks to 3rdparty/onednn
- 'include/nnvm' # symlinks to 3rdparty/tvm/nnvm/include/nnvm
# test/build data
- 'tests/python/dnnl/data/test_dnnl_test_dnnl_model_model1.json'

Expand Down
17 changes: 17 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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.

cmake_minimum_required(VERSION 3.13)

# workaround to store CMAKE_CROSSCOMPILING because is getting reset by the project command
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
~
-->

Contributors of Apache MXNet (incubating)
Contributors of Apache MXNet
=========================================
Apache MXNet adopts the Apache way and governs by merit. We believe that it is important to create
an inclusive community where everyone can use, contribute to, and influence the direction of
Expand Down Expand Up @@ -143,7 +143,7 @@ healthy project. The PPMC actively seeks to appoint new committers from the list

List of Contributors
--------------------
* [Top-100 Contributors](https://github.com/apache/incubator-mxnet/graphs/contributors)
* [Top-100 Contributors](https://github.com/apache/mxnet/graphs/contributors)
- To contributors: please add your name to the list when you submit a patch to the project:)
* [Aditya Trivedi](https://github.com/iadi7ya)
* [Feng Wang](https://github.com/happynear)
Expand Down Expand Up @@ -314,5 +314,5 @@ Label Bot
- @mxnet-label-bot update [specify comma separated labels here]
(i.e. @mxnet-label-bot update [Bug, Python])

- Available label names which are supported: [Labels](https://github.com/apache/incubator-mxnet/labels)
- Available label names which are supported: [Labels](https://github.com/apache/mxnet/labels)
- For further details: [My Wiki Page](https://cwiki.apache.org/confluence/display/MXNET/Machine+Learning+Based+GitHub+Bot)
10 changes: 0 additions & 10 deletions DISCLAIMER

This file was deleted.

4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@
limitations under the License.

======================================================================================
Apache MXNET (incubating) Subcomponents:
Apache MXNET Subcomponents:

The Apache MXNET (incubating) project contains subcomponents with separate
The Apache MXNET project contains subcomponents with separate
copyright notices and license terms. Your use of the source code for the
these subcomponents is subject to the terms and conditions of the following
licenses. See licenses/ for text of these licenses.
Expand Down
96 changes: 48 additions & 48 deletions NEWS.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache MXNET (incubating)
Copyright 2017-2021 The Apache Software Foundation
Apache MXNET
Copyright 2017-2023 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand Down
Loading