You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2020/04/09 09:11:59 UTC
[singa] branch master updated: record third-party files in LICENSE
and fix errors from rat check due to missing license in some files.
This is an automated email from the ASF dual-hosted git repository.
wangwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/singa.git
The following commit(s) were added to refs/heads/master by this push:
new 32015f0 record third-party files in LICENSE and fix errors from rat check due to missing license in some files.
new 673d005 Merge pull request #668 from nudles/master
32015f0 is described below
commit 32015f0052c224a47fc308f1f066b818f908c144
Author: wang wei <wa...@gmail.com>
AuthorDate: Thu Apr 9 11:22:19 2020 +0800
record third-party files in LICENSE and fix errors from rat check due to missing license in some files.
---
.readthedocs.yml | 17 ++++++
LICENSE | 130 +++++++++++++++++++++++-----------------
java/pom.xml | 6 +-
src/core/scheduler/scheduler.cc | 1 -
4 files changed, 96 insertions(+), 58 deletions(-)
diff --git a/.readthedocs.yml b/.readthedocs.yml
index f243c00..f5ad977 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -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.
+#
+
# .readthedocs.yml
build:
image: stable
diff --git a/LICENSE b/LICENSE
index 7beb610..38a240c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright [yyyy] [name of copyright owner]
+ Copyright 2015-2020 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -200,12 +200,13 @@
See the License for the specific language governing permissions and
limitations under the License.
============================================================================
-The SINGA 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
+
+The SINGA project contains subcomponents and dependencies 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.
-=====================================================================
+============================================================================
SINGA bundles the following under BSD 2-clause license:
include/singa/utils/tinydir.h
@@ -296,7 +297,6 @@ license and copyright terms herein.
=====================================================================
SINGA bundles the following under MIT license:
cmake/ThirdParty/FindOpenCL.cmake
-Open Neural Network Exchange
Copyright (c) 2010-2016 Institute for Microelectronics,
Institute for Analysis and Scientific Computing, TU Wien.
@@ -305,8 +305,6 @@ Argonne National Laboratory, with facilities in the state of Illinois,
is owned by The United States Government, and operated by UChicago Argonne, LLC
under provision of a contract with the Department of Energy.
-Copyright (c) ONNX Project Contributors.
-All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -393,7 +391,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=====================================================================
SINGA bundles the following under New BSD license: src/api/numpy.i
-Copyright (c) 2005-2016, NumPy Developers.
+Copyright (c) 2005-2020, NumPy Developers.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -425,57 +423,31 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=====================================================================
-SINGA bundles the following under Apache License v2.0:
-mkl-dnn
-
-Copyright 2017-2018 Intel Corporation
-
-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
-
-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.
-
-
-=====================================================================
-SINGA bundles the following under Apache License v2.0:
-examples/imagenet/inception/convert.py
-
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-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
-
-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.
-
-
-=====================================================================
-SINGA bundles the following under New BSD license:
-doc/en/docs/notebook/utils.py
+SINGA bundles the following dependency under Apache License v2.0:
+oneDNN
-Copyright (c) 2008–2013, Theano Development Team All rights reserved.
+Copyright 2016-2019 Intel Corporation
+ Copyright 2018 YANDEX LLC
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 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
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- Neither the name of Theano nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ http://www.apache.org/licenses/LICENSE-2.0
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ‘’AS IS’’ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) [...]
+ 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.
+ This distribution includes third party software ("third party programs").
+ This third party software, even if included with the distribution of
+ the Intel software, may be governed by separate license terms, including
+ without limitation, third party license terms, other Intel software license
+ terms, and open source software license terms. These separate license terms
+ govern your use of the third party programs as set forth in the
+ "THIRD-PARTY-PROGRAMS" file.
=====================================================================
SINGA bundles the following under New BSD license:
@@ -505,3 +477,51 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+=======================================================================
+SINGA bundles the following file and dependency under MIT license:
+examples/onnx/test_onnx_backend.py
+ONNX
+
+MIT License
+
+Copyright (c) ONNX Project Contributors
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+===========================================================================
+SINGA bundles the following under Apache License Version 2.0:
+examples/onnx/tokenization.py
+examples/onnx/run_onnx_squad.py
+examples/onnx/inputs.json
+
+# Copyright 2018 The Google AI Language Team Authors.
+#
+# 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
+#
+# 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/java/pom.xml b/java/pom.xml
index 1b1428b..cc55ce3 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -65,6 +65,8 @@
<excludes combine.children="append">
<exclude>rafiki/**</exclude>
<exclude>test/gtest/**</exclude>
+ <exclude>examples/onnx/bert/inputs.json</exclude>
+ <exclude>examples/onnx/test_onnx_backend.py</exclude>
<exclude>include/singa/utils/tinydir.h</exclude>
<exclude>include/singa/utils/cuda_utils.h</exclude>
<exclude>src/core/tensor/distribution.cl</exclude>
@@ -73,9 +75,9 @@
<exclude>src/proto/caffe.proto</exclude>
<exclude>cmake/Thirdparty/FindViennaCL.cmake</exclude>
<exclude>cmake/Thirdparty/FindOpenCL.cmake</exclude>
+ <exclude>cmake/Thirdparty/GetGitRevisionDescription.cmake.in</exclude>
+ <exclude>cmake/Thirdparty/GetGitRevisionDescription.cmake</exclude>
<exclude>src/api/numpy.i</exclude>
- <exclude>doc/en/docs/notebook/utils.py</exclude>
- <exclude>examples/imagenet/inception/convert.py</exclude>
<exclude>tool/cpplint.py</exclude>
<exclude>travis*.log</exclude>
<exclude>.gitmodules</exclude>
diff --git a/src/core/scheduler/scheduler.cc b/src/core/scheduler/scheduler.cc
index 2f0bb34..e32af86 100644
--- a/src/core/scheduler/scheduler.cc
+++ b/src/core/scheduler/scheduler.cc
@@ -207,7 +207,6 @@ void Graph::Debug() {
id = blkInfo->last_node_->id_;
}
ss << " last_node[" << std::setw(w) << id << "]" << std::endl;
- ;
}
printf("%s", ss.str().c_str());