Skip to content

Commit

Permalink
License fixes (#8873)
Browse files Browse the repository at this point in the history
* Add nnvm commit tag to current master to get rid of jar file

* Add license for tvm and its dependencies

* License headers

* Remove licnese from FindJEMalloc.cmake

* fix commits for submodules

* ignore FindJeMalloc.cmake

* Add Apache license headers to R files

* Apache license for matlab files

* Add jquery license

* Remove CODEOWNERS

* Re-add executable flag to sh files

* Trigger build

* Trigger build

* Revert "Remove CODEOWNERS"

This reverts commit 911d402e250cd98b84ab7c41e506d3e035f83e55.

* Remove Apache header

* ignore FindJeMalloc.cmake

* [MERGE into v1.0.0 ONLY] Fix license for 1.0.0 (#8876)

* Remove ASF Licenses from some files

* typo

* typo 2

* whitelisting files for header check
  • Loading branch information
cjolivier01 committed Nov 30, 2017
1 parent 74be98b commit 4306d43
Show file tree
Hide file tree
Showing 104 changed files with 1,485 additions and 296 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Committers
----------
Committers are people who have made substantial contribution to the project and being active.
The committers are the granted write access to the project.
A full list of committers can be found here: http://incubator.apache.org/projects/mxnet.html

* [Bing Xu](https://github.com/antinucleon)
- Bing is the initiator and major contributor of operators and ndarray modules of mxnet.
Expand Down Expand Up @@ -39,6 +40,7 @@ The committers are the granted write access to the project.
- Zixuan is one of major maintainers of mxnet scala package.
* [Yuan Tang](https://github.com/terrytangyuan)
- Yuan is one of major maintainers of mxnet scala package.
* [Chris Olivier](https://github.com/cjolivier01)

### Become a Committer
MXNet is a opensource project and we are actively looking for new committers
Expand Down
12 changes: 8 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices

stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
Expand Down Expand Up @@ -224,8 +225,10 @@
7. mshadow - For details, see, mshadow/LICENSE
8. nnvm/dmlc-core - For details, see, nnvm/dmlc-core/LICENSE
9. nnvm - For details, see, nnvm/LICENSE
10. nnvm-fusion - For details, see, nnvm/plugin/nnvm-fusion/LICENSE
11. ps-lite - For details, see, ps-lite/LICENSE
10. nnvm/tvm - For details, see, nnvm/tvm/LICENSE
11. nnvm/tvm/HalideIR/LICENSE - For details, see, nnvm/tvm/HalideIR/LICENSE
12. nnvm-fusion - For details, see, nnvm/plugin/nnvm-fusion/LICENSE
13. ps-lite - For details, see, ps-lite/LICENSE

========================================================================
MIT licenses
Expand All @@ -234,7 +237,7 @@
1. Fast R-CNN - For details, see example/rcnn/LICENSE
2. Faster R-CNN - For details, see example/rcnn/LICENSE
3. tree_lstm - For details, see example/gluon/tree_lstm/LICENSE

4. JQuery - For details, see http://jquery.org/license

========================================================================
NVIDIA Licenses
Expand Down Expand Up @@ -350,7 +353,8 @@
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF TH
E USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

The views and conclusions contained in the software and documentation are those
Expand Down
16 changes: 16 additions & 0 deletions amalgamation/prep_nnvm.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#! /bin/bash
# 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.
DMLC_CORE=$(pwd)/../dmlc-core
cd ../nnvm/amalgamation
make clean
Expand Down
24 changes: 0 additions & 24 deletions cmake/Modules/FindJeMalloc.cmake
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
# 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) 2014 Thomas Heller
# Copyright (c) 2007-2012 Hartmut Kaiser
# Copyright (c) 2010-2011 Matt Anderson
# Copyright (c) 2011 Bryce Lelbach
#
#----
# Distributed under the Boost Software License, Version 1.0.
# Boost Software License - Version 1.0 - August 17th, 2003
#
Expand Down
Empty file modified docker/run.sh
100644 → 100755
Empty file.
20 changes: 20 additions & 0 deletions docs/_static/cn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 20 additions & 1 deletion docs/_static/js/auto_module_index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

function auto_index(module) {
$(document).ready(function () {
// find all classes or functions
Expand All @@ -21,4 +40,4 @@ function auto_index(module) {
html += "</ul>";
li_node.append(html);
});
}
}
21 changes: 20 additions & 1 deletion docs/_static/js/clipboard.min.js
100755 → 100644

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions docs/_static/js/copycode.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

/*Copy code to clipboard*/
LANG_GP = {'default':'>>> ', 'python':'>>> ' , 'scala':'scala>', 'julia':'julia> ', 'r':'> ', 'perl':'pdl>' , 'cpp':'', 'bash':'$ '};

Expand Down
21 changes: 20 additions & 1 deletion docs/_static/js/navbar.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

var searchBox = $("#search-input-wrap");
var TITLE = ['/get_started/', '/tutorials/', '/gluon/' , '/api/', '/community/contribute.html', ];
var DOC_TITLE = ['/faq/', '/architecture/', '/model_zoo/'];
Expand Down Expand Up @@ -87,4 +106,4 @@ $(document).ready(function () {
if($("body").prop("clientWidth") < 1000 || $('div.sphinxsidebar').css('visibility') == 'hidden') $('div.content').css('width', '100%');
else $('div.content').css('width', 'calc(100% - 300px)');
});
});
});
19 changes: 19 additions & 0 deletions docs/_static/js/options.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

$(document).ready(function () {
function label(lbl) {
return lbl.replace(/[ .]/g, '-').toLowerCase();
Expand Down
21 changes: 20 additions & 1 deletion docs/_static/js/page.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

/* Generate url tracking for each page */
var protocol = location.protocol.concat("//");
var host = protocol.concat(window.location.host);
Expand Down Expand Up @@ -67,4 +86,4 @@ if ($('div.download-btn').length > 0) {
var footerHeight = 252;
if ($('div.content-block').height() > $(window).height() - footerHeight) {
$('div.footer').css('position', 'relative');
}
}
21 changes: 20 additions & 1 deletion docs/_static/js/search.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

$(document).ready(function () {
var searchForm = $("#search-input-wrap").children("form").first();
searchForm.append('<div class="form-group searchBtn"><input type="submit" class="form-control" value="Go"></div>');
Expand All @@ -16,4 +35,4 @@ $(document).ready(function () {
$('#searchIcon span').addClass('glyphicon-search');
}
});
});
});
21 changes: 20 additions & 1 deletion docs/_static/js/sidebar.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* 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.
*/

/*Preprocess*/
var LANG = ['python', 'scala', 'r', 'julia', 'c++', 'perl'];
var TITLE_WITH_LANG = ['/get_started/', '/tutorials/', '/faq/', '/architecture/', '/community/'];
Expand Down Expand Up @@ -251,4 +270,4 @@ $(document).ready(function () {
if ($('div.sphinxsidebar').css('visibility') == 'hidden') $('.content').css('width', '100%');
return;
}
});
});
21 changes: 20 additions & 1 deletion docs/_static/mxnet-theme/footer.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<!--
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.
-->

<div class="footer">
<div class="section-disclaimer">
<div class="container">
Expand All @@ -13,4 +32,4 @@
</div>
</div>
</div>
</div>
</div>
19 changes: 19 additions & 0 deletions docs/_static/mxnet-theme/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<!--
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.
-->

<div id="splash">
<div class="container">
<div class="row">
Expand Down
Loading

0 comments on commit 4306d43

Please sign in to comment.