Merge pull request #605 from LLNL/task/copyright-changes

Task/copyright changes
LLNL · May 17, 2019 · 6b0e35d · 6b0e35d
2 parents 288fe16 + 65d5a3d
commit 6b0e35d
Show file tree

Hide file tree

Showing 1,162 changed files with 160,902 additions and 4,364 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,16 +1,8 @@
 ###############################################################################
-# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC.
-#
-# Produced at the Lawrence Livermore National Laboratory
-#
-# LLNL-CODE-689114
-#
-# All rights reserved.
-#
-# This file is part of RAJA.
-#
-# For details about use and distribution, please read RAJA/LICENSE.
+# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
 #
+# SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
 cmake_policy(SET CMP0048 NEW)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,16 +1,10 @@
 
 [comment]: # (#################################################################)
-[comment]: # (Copyright 2016-19, Lawrence Livermore National Security, LLC.)
-
-[comment]: # (Produced at the Lawrence Livermore National Laboratory)
-
-[comment]: # (LLNL-CODE-689114)
-
-[comment]: # (All rights reserved.)
-
-[comment]: # (This file is part of RAJA.)
-
-[comment]: # (For details about use and distribution, please read RAJA/LICENSE.)
+[comment]: # (Copyright 2016-19, Lawrence Livermore National Security, LLC)
+[comment]: # (and RAJA project contributors. See the RAJA/COPYRIGHT file)
+[comment]: # (for details.)
+[comment]: # 
+[comment]: # (# SPDX-License-Identifier: (BSD-3-Clause))
 [comment]: # (#################################################################)
 
 # Contributing to RAJA

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -0,0 +1,39 @@
+Intellectual Property Notice
+------------------------------
+
+RAJA is licensed under the BSD 3-Clause license,
+(BSD-3-Clause or https://opensource.org/licenses/BSD-3-Clause).
+
+See the files RAJA/LICENSE and RAJA/RELEASE for details.
+
+Copyrights and patents in the RAJA project are retained by contributors.
+No copyright assignment is required to contribute to RAJA.
+
+
+SPDX usage
+------------
+
+Individual files contain SPDX tags instead of the full license text.
+This enables machine processing of license information based on the SPDX
+License Identifiers that are available here: https://spdx.org/licenses/
+
+Files that are licensed as BSD 3-Clause contain the following
+text in the license header:
+
+    SPDX-License-Identifier: (BSD-3-Clause)
+
+
+External Packages
+-------------------
+RAJA has some external dependencies, some of which are included as Git 
+submodules and others are bundled in the RAJA repository. These
+packages are covered by various permissive licenses. A summary listing
+follows. See the license included with each package for full details.
+
+PackageName: BLT
+PackageHomePage: https://github.com/LLNL/blt/
+PackageLicenseDeclared: BSD-3-Clause
+
+PackageName: CUB
+PackageHomePage: http://nvlabs.github.com/cub/
+PackageLicenseDeclared: BSD-3-Clause
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,10 @@
+###############################################################################
+# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+###############################################################################
+
 #
 #Builds and installs RAJA using the gcc8 compiler
 #

diff --git a/LICENSE b/LICENSE
@@ -26,3 +26,25 @@ 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 SOFTWARE, 
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Additional BSD Notice
+
+1. This notice is required to be provided under our contract with the U.S.
+Department of Energy (DOE). This work was produced at Lawrence Livermore
+National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
+
+2. Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express or
+implied, or assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or
+process disclosed, or represents that its use would not infringe
+privately-owned rights.
+
+3. Also, reference herein to any specific commercial products, process,
+or services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or favoring
+by the United States Government or Lawrence Livermore National Security, LLC.
+The views and opinions of authors expressed herein do not necessarily state
+or reflect those of the United States Government or Lawrence Livermore
+National Security, LLC, and shall not be used for advertising or product
+endorsement purposes.
diff --git a/NOTICE b/NOTICE
diff --git a/README.md b/README.md
@@ -1,19 +1,13 @@
 
 [comment]: # (#################################################################)
-[comment]: # (Copyright 2016-19, Lawrence Livermore National Security, LLC.)
-
-[comment]: # (Produced at the Lawrence Livermore National Laboratory)
-
-[comment]: # (LLNL-CODE-689114)
-
-[comment]: # (All rights reserved.)
-
-[comment]: # (This file is part of RAJA.)
-
-[comment]: # (For details about use and distribution, please read RAJA/LICENSE.)
+[comment]: # (Copyright 2016-19, Lawrence Livermore National Security, LLC)
+[comment]: # (and RAJA project contributors. See the RAJA/COPYRIGHT file)
+[comment]: # (for details.)
+[comment]: # 
+[comment]: # (# SPDX-License-Identifier: (BSD-3-Clause))
 [comment]: # (#################################################################)
 
-RAJA v0.7.0
+RAJA v0.8.0
 ============
 
 [![Build Status](https://travis-ci.org/LLNL/RAJA.svg?branch=develop)](https://travis-ci.org/LLNL/RAJA)

diff --git a/RELEASE b/RELEASE
@@ -1,28 +1,25 @@
 *******************************************************************************
 
-RAJA: ................................, version 0.7.0
+RAJA: ................................, version 0.8.0
 
 Copyright (c) 2016-19, Lawrence Livermore National Security, LLC. 
 Produced at the Lawrence Livermore National Laboratory.
-All rights reserved. See details in RAJA/LICENSE and RAJA/NOTICE files.
+All rights reserved. See details in the RAJA/LICENSE file.
 
 Unlimited Open Source - BSD Distribution
 LLNL-CODE-689114
 OCEC-16-063
 
-The original developers of RAJA are:
+The RAJA development team and contributors are:
 
 Rich Hornung (hornung1@llnl.gov)
-Jeff Keasler (keasler1@llnl.gov)
-
-Contributors include:
-
 David Beckingsale (beckingsale1@llnl.gov)
 Jason Burmark (burmark1@llnl.gov)
 Robert Chen (chen59@llnl.gov)
 Matt Cordery (cordery1@llnl.gov)
 Jeff Hammond (jeff.science@gmail.com)
 Holger Jones (jones19@llnl.gov)
+Jeff Keasler (keasler1@llnl.gov)
 Will Killian (killian4@llnl.gov)
 Adam Kunen (kunen1@llnl.gov)
 Olga Pearce (pearce8@llnl.gov)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,16 +1,10 @@
 
 [comment]: # (#################################################################)
-[comment]: # (Copyright 2016-19, Lawrence Livermore National Security, LLC.)
-
-[comment]: # (Produced at the Lawrence Livermore National Laboratory)
-
-[comment]: # (LLNL-CODE-689114)
-
-[comment]: # (All rights reserved.)
-
-[comment]: # (This file is part of RAJA.)
-
-[comment]: # (For details about use and distribution, please read RAJA/LICENSE.)
+[comment]: # (Copyright 2016-19, Lawrence Livermore National Security, LLC)
+[comment]: # (and RAJA project contributors. See the RAJA/COPYRIGHT file)
+[comment]: # (for details.)
+[comment]: # 
+[comment]: # (# SPDX-License-Identifier: (BSD-3-Clause))
 [comment]: # (#################################################################)
 
 RAJA v0.8.0 Release Notes

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -1,3 +1,10 @@
+###############################################################################
+# Copyright (c) 2016-19, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+###############################################################################
+
 if (ENABLE_CUDA)
   raja_add_benchmark(
     NAME benchmark-host-device-lambda

diff --git a/benchmark/host-device-lambda-benchmark.cpp b/benchmark/host-device-lambda-benchmark.cpp
@@ -1,3 +1,9 @@
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
+// Copyright (c) 2016-19, Lawrence Livermore National Security, LLC
+// and RAJA project contributors. See the RAJA/COPYRIGHT file for details.
+//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
+
 #include <iostream>
 
 #include "benchmark/benchmark_api.h"