diff --git a/COPYRIGHT.md b/COPYRIGHT.md new file mode 100644 index 00000000..1c0a89ea --- /dev/null +++ b/COPYRIGHT.md @@ -0,0 +1,143 @@ +# Copyright Contributors to the Kokkos Project + +This file contains a (partial) list of people who contributed to the Kokkos Project +and retain applicable copyrights to their contributions. + +For each contributor, we list their organization (if known) and the email +address associated with their commits. + +Contributors are listed for specific date ranges reflecting major Kokkos versions. +These lists are generated using `git shortlog -sne --since="YYYY-MM-DD" --until="YYYY-MM-DD"` +commands. + +## Kokkos 5 + +Date Range: present -- 2025-08-11 + +### Sandia National Laboratories (SNL) + + Under the terms of Contract DE-NA0003525 with NTESS, + the U.S. Government retains certain rights in this software. + +- Christian Trott; SNL; crtrott@sandia.gov +- Luc Berger-Vergiat; SNL; lberge@sandia.gov +- Dong Hun Lee; SNL; donlee@sandia.gov +- Carl Pearson; SNL; cwpears@sandia.gov + +### Oak Ridge National Laboratory (ORNL) + +- Damien Lebrun-Grandie; ORNL; dalg24@gmail.com +- Seyong Lee; ORNL; lees2@ornl.gov + +### Commissariat à l’Energie Atomique et aux Energies Alternatives (CEA) + +- Trévis Morvany; CEA; trevis.morvany@cea.fr +- Thomas Padioleau; CEA; thomas.padioleau@cea.fr +- Adrien Taberner; CEA; adrien.taberner@cea.fr + +### Los Alamos National Laboratory (LANL) + +- Patrick Diehl; LANL; diehlpk@lanl.gov + +## Kokkos 4 + +Date Range: 2025-08-11 -- 2022-09-20 + +### Sandia National Laboratories (SNL) + + Kokkos v. 4.0 + Copyright (2022) National Technology & Engineering + Solutions of Sandia, LLC (NTESS). + + Under the terms of Contract DE-NA0003525 with NTESS, + the U.S. Government retains certain rights in this software. + +- Christian Trott; SNL; crtrott@sandia.gov +- Luc Berger-Vergiat; SNL; lberge@sandia.gov +- Dong Hun Lee; SNL; donlee@sandia.gov +- Nicolas Morales; SNL; nmmoral@sandia.gov +- Conrad Clevenger ; SNL; tccleve@sandia.gov +- Brian Kelley ; SNL; bmkelle@sandia.gov +- Jan Ciesko; SNL; jan.ciesko@gmail.com + +### Oak Ridge National Laboratory (ORNL) + +- Damien Lebrun-Grandie; ORNL; dalg24@gmail.com +- Daniel Arndt; ORNL; arndtd@ornl.gov +- Bruno Turcksin; ORNL; bruno.turcksin@gmail.com +- Jakob Bludau; ORNL; bludauj@ornl.gov + +### Commissariat à l’Energie Atomique et aux Energies Alternatives (CEA) + +- Thomas Padioleau; CEA; thomas.padioleau@cea.fr +- Pierre Kestener; CEA; pierre.kestener@cea.fr +- Cédric Chevalier; CEA; cedric.chevalier@cea.fr + +### Individual Contributors (OTHER) + +- Nevin ":-)" Liber; OTHER; nliber@anl.gov +- Patrick Diehl; OTHER; diehlpk@ddlanl.gov +- Baptiste Legouix; OTHER; stilynx51@gmail.com +- AnhBe0; OTHER; phamt123@gator.uhd.edu +- deegan; OTHER; philip.deegan@gmail.com + +## Kokkos 3 + +Date Range: 2022-09-20 -- 2019-06-24 + +### Sandia National Laboratories (SNL) + + Kokkos v. 3.0 + Copyright (2020) National Technology & Engineering + Solutions of Sandia, LLC (NTESS). + + Under the terms of Contract DE-NA0003525 with NTESS, + the U.S. Government retains certain rights in this software. + +- Christian Trott; SNL; crtrott@sandia.gov +- Luc Berger-Vergiat; SNL; lberge@sandia.gov +- D. S. Hollman; SNL; dshollm@sandia.gov +- Nathan Ellingwood; SNL; ndellin@sandia.gov +- Evan Harvey; SNL; eharvey@sandia.gov +- Jeff Miles; SNL; jsmiles@sandia.gov +- Jeremiah Wilke; SNL; jjwilke@sandia.gov +- Brian Kelley; SNL; bmkelle@sandia.gov +- Vinh Dang; SNL; vqdang@sandia.gov +- CA Lewis; SNL; canlewi@sandia.gov +- Kyungjoo Kim; SNL; kyukim@sandia.gov +- Seher Acer; SNL; sacer@sandia.gov +- Jan Ciesko; SNL; jan.ciesko@gmail.com + +### Oak Ridge National Laboratories (ORNL) + +- Damien Lebrun-Grandie; ORNL; dalg24@gmail.com +- Daniel Arndt; ORNL; arndtd@ornl.gov + +### Individual Contributors (OTHER) + +- Jonathan R. Madsen; OTHER; jonathanrmadsen@gmail.com +- Axel Huebl; OTHER; axel.huebl@plasma.ninja +- Daniel Waters; OTHER; dwaters@lbl.gov + +## Kokkos 2 + +### Sandia National Laboratories (SNL) + + Kokkos v. 2.0 + Copyright (2014) Sandia Corporation + + Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, + the U.S. Government retains certain rights in this software. + +- Christian Trott; SNL; crtrott@sandia.gov +- Carter Edwards; SNL; hcedwar@sandia.gov +- Dan Ibanez; SNL; daibane@sandia.gov +- Nathan Ellingwood; SNL; ndellin@sandia.gov +- David Hollman; SNL; dshollm@sandia.gov +- Dan Sunderland; SNL; dsunder@sandia.gov +- Siva Rajamanickam; SNL; srajama@sandia.gov + +### Individual Contributors (OTHER) + +- Michel de Messieres; OTHER; michel@demessieres.com + diff --git a/Exercises/01/Begin/exercise_1_begin.cpp b/Exercises/01/Begin/exercise_1_begin.cpp index d448b9c7..d108e515 100644 --- a/Exercises/01/Begin/exercise_1_begin.cpp +++ b/Exercises/01/Begin/exercise_1_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 1 Goal: // Use Kokkos to parallelize the outer loop of using Kokkos::parallel_reduce. diff --git a/Exercises/01/Solution/exercise_1_solution.cpp b/Exercises/01/Solution/exercise_1_solution.cpp index d375cae2..f37df564 100644 --- a/Exercises/01/Solution/exercise_1_solution.cpp +++ b/Exercises/01/Solution/exercise_1_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/02/Begin/exercise_2_begin.cpp b/Exercises/02/Begin/exercise_2_begin.cpp index fa6d22d5..c8d4c14d 100644 --- a/Exercises/02/Begin/exercise_2_begin.cpp +++ b/Exercises/02/Begin/exercise_2_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 2 Goal: // Replace raw allocations with Kokkos Views. diff --git a/Exercises/02/Solution/exercise_2_solution.cpp b/Exercises/02/Solution/exercise_2_solution.cpp index 3c342238..5b4863c0 100644 --- a/Exercises/02/Solution/exercise_2_solution.cpp +++ b/Exercises/02/Solution/exercise_2_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/03/Begin/exercise_3_begin.cpp b/Exercises/03/Begin/exercise_3_begin.cpp index e305ab51..08afe5b9 100644 --- a/Exercises/03/Begin/exercise_3_begin.cpp +++ b/Exercises/03/Begin/exercise_3_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 3 Goal: // Manage data transfers from Host to Device manually. diff --git a/Exercises/03/Solution/exercise_3_solution.cpp b/Exercises/03/Solution/exercise_3_solution.cpp index 523f234c..9a864917 100644 --- a/Exercises/03/Solution/exercise_3_solution.cpp +++ b/Exercises/03/Solution/exercise_3_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/04/Begin/exercise_4_begin.cpp b/Exercises/04/Begin/exercise_4_begin.cpp index 40669b80..2d7b1ed4 100644 --- a/Exercises/04/Begin/exercise_4_begin.cpp +++ b/Exercises/04/Begin/exercise_4_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 4 Goals: // Add custom Spaces, Layouts to Views. diff --git a/Exercises/04/Solution/exercise_4_solution.cpp b/Exercises/04/Solution/exercise_4_solution.cpp index 6601fb77..f8099270 100644 --- a/Exercises/04/Solution/exercise_4_solution.cpp +++ b/Exercises/04/Solution/exercise_4_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/advanced_reductions/Begin/advanced_reductions.cpp b/Exercises/advanced_reductions/Begin/advanced_reductions.cpp index fa199d8d..a5151587 100644 --- a/Exercises/advanced_reductions/Begin/advanced_reductions.cpp +++ b/Exercises/advanced_reductions/Begin/advanced_reductions.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/advanced_reductions/Solution/advanced_reductions.cpp b/Exercises/advanced_reductions/Solution/advanced_reductions.cpp index 49e46b42..c0514632 100644 --- a/Exercises/advanced_reductions/Solution/advanced_reductions.cpp +++ b/Exercises/advanced_reductions/Solution/advanced_reductions.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/dualview/Begin/dual_view_exercise.cpp b/Exercises/dualview/Begin/dual_view_exercise.cpp index c8d18ab3..b5fac095 100644 --- a/Exercises/dualview/Begin/dual_view_exercise.cpp +++ b/Exercises/dualview/Begin/dual_view_exercise.cpp @@ -1,45 +1,5 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER - */ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project #include #include "functors.hpp" diff --git a/Exercises/dualview/Begin/functors.hpp b/Exercises/dualview/Begin/functors.hpp index a3558e83..26576208 100644 --- a/Exercises/dualview/Begin/functors.hpp +++ b/Exercises/dualview/Begin/functors.hpp @@ -1,46 +1,5 @@ - -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER - */ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project #include #include diff --git a/Exercises/dualview/Solution/dual_view_exercise.cpp b/Exercises/dualview/Solution/dual_view_exercise.cpp index 7160873c..d5a5f5a1 100644 --- a/Exercises/dualview/Solution/dual_view_exercise.cpp +++ b/Exercises/dualview/Solution/dual_view_exercise.cpp @@ -1,45 +1,5 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER - */ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project #include #include "functors.hpp" diff --git a/Exercises/dualview/Solution/functors.hpp b/Exercises/dualview/Solution/functors.hpp index b09dcc60..a7bd1d79 100644 --- a/Exercises/dualview/Solution/functors.hpp +++ b/Exercises/dualview/Solution/functors.hpp @@ -1,46 +1,5 @@ - -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER - */ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project #include #include diff --git a/Exercises/graph/Begin/graph_begin.cpp b/Exercises/graph/Begin/graph_begin.cpp index 4ad9ee29..6a04cebc 100644 --- a/Exercises/graph/Begin/graph_begin.cpp +++ b/Exercises/graph/Begin/graph_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/graph/Solution/graph_solution.cpp b/Exercises/graph/Solution/graph_solution.cpp index 7820f6ba..72a3404a 100644 --- a/Exercises/graph/Solution/graph_solution.cpp +++ b/Exercises/graph/Solution/graph_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/instances/Begin/instances_begin.cpp b/Exercises/instances/Begin/instances_begin.cpp index 0c80e735..5c080290 100644 --- a/Exercises/instances/Begin/instances_begin.cpp +++ b/Exercises/instances/Begin/instances_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/instances/Solution/instances_solution.cpp b/Exercises/instances/Solution/instances_solution.cpp index f022f128..85fb58cc 100644 --- a/Exercises/instances/Solution/instances_solution.cpp +++ b/Exercises/instances/Solution/instances_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/kokkoskernels/CGSolve/Begin/cgsolve.cpp b/Exercises/kokkoskernels/CGSolve/Begin/cgsolve.cpp index f98da80b..4ba53d8b 100644 --- a/Exercises/kokkoskernels/CGSolve/Begin/cgsolve.cpp +++ b/Exercises/kokkoskernels/CGSolve/Begin/cgsolve.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE Goal: Implement conjugate gradient solver for square, symmetric, positive-definite sparse matrix using: // - KokkosKernels BLAS functions diff --git a/Exercises/kokkoskernels/CGSolve/Solution/cgsolve.cpp b/Exercises/kokkoskernels/CGSolve/Solution/cgsolve.cpp index 5d386970..9955b9fb 100644 --- a/Exercises/kokkoskernels/CGSolve/Solution/cgsolve.cpp +++ b/Exercises/kokkoskernels/CGSolve/Solution/cgsolve.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE Goal: Implement conjugate gradient solver for square, symmetric, positive-definite sparse matrix using: // - KokkosKernels BLAS functions diff --git a/Exercises/kokkoskernels/InnerProduct/Begin/innerproduct.cpp b/Exercises/kokkoskernels/InnerProduct/Begin/innerproduct.cpp index e43136f3..0351103a 100644 --- a/Exercises/kokkoskernels/InnerProduct/Begin/innerproduct.cpp +++ b/Exercises/kokkoskernels/InnerProduct/Begin/innerproduct.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE Goals: // - Implement inner product in two separate sub-exercises using: diff --git a/Exercises/kokkoskernels/InnerProduct/Solution/innerproduct.cpp b/Exercises/kokkoskernels/InnerProduct/Solution/innerproduct.cpp index 2fae8684..6a38804b 100644 --- a/Exercises/kokkoskernels/InnerProduct/Solution/innerproduct.cpp +++ b/Exercises/kokkoskernels/InnerProduct/Solution/innerproduct.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE Goal: // - Implement inner product in two separate sub-exercises using: diff --git a/Exercises/mdrange/Begin/exercise_mdrange_begin.cpp b/Exercises/mdrange/Begin/exercise_mdrange_begin.cpp index b8141a4c..7a47b328 100644 --- a/Exercises/mdrange/Begin/exercise_mdrange_begin.cpp +++ b/Exercises/mdrange/Begin/exercise_mdrange_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE mdrange Goals: // Use EXERCISE 2 Solution as a starting point diff --git a/Exercises/mdrange/Solution/exercise_mdrange_solution.cpp b/Exercises/mdrange/Solution/exercise_mdrange_solution.cpp index 509e343c..fcc30804 100644 --- a/Exercises/mdrange/Solution/exercise_mdrange_solution.cpp +++ b/Exercises/mdrange/Solution/exercise_mdrange_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/mpi_heat_conduction/Begin/mpi_heat_conduction_begin.cpp b/Exercises/mpi_heat_conduction/Begin/mpi_heat_conduction_begin.cpp index 9e1b98e0..06a39066 100644 --- a/Exercises/mpi_heat_conduction/Begin/mpi_heat_conduction_begin.cpp +++ b/Exercises/mpi_heat_conduction/Begin/mpi_heat_conduction_begin.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/mpi_heat_conduction/Solution/mpi_heat_conduction_solution.cpp b/Exercises/mpi_heat_conduction/Solution/mpi_heat_conduction_solution.cpp index a6e52ea3..f9fa16a4 100644 --- a/Exercises/mpi_heat_conduction/Solution/mpi_heat_conduction_solution.cpp +++ b/Exercises/mpi_heat_conduction/Solution/mpi_heat_conduction_solution.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/mpi_heat_conduction/no-mpi/mpi_heat_conduction.cpp b/Exercises/mpi_heat_conduction/no-mpi/mpi_heat_conduction.cpp index fd7a00b2..34381536 100644 --- a/Exercises/mpi_heat_conduction/no-mpi/mpi_heat_conduction.cpp +++ b/Exercises/mpi_heat_conduction/no-mpi/mpi_heat_conduction.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include struct System { diff --git a/Exercises/mpi_pack_unpack/Begin/mpi_pack_unpack_begin.cpp b/Exercises/mpi_pack_unpack/Begin/mpi_pack_unpack_begin.cpp index 607c97a8..c54e3bd4 100644 --- a/Exercises/mpi_pack_unpack/Begin/mpi_pack_unpack_begin.cpp +++ b/Exercises/mpi_pack_unpack/Begin/mpi_pack_unpack_begin.cpp @@ -1,46 +1,5 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 3.0 -// Copyright (2020) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project // EXERCISE Goal: // Understand how to use MPI with Kokkos. diff --git a/Exercises/mpi_pack_unpack/Solution/mpi_pack_unpack_solution.cpp b/Exercises/mpi_pack_unpack/Solution/mpi_pack_unpack_solution.cpp index 526c1fd9..0a19f5c7 100644 --- a/Exercises/mpi_pack_unpack/Solution/mpi_pack_unpack_solution.cpp +++ b/Exercises/mpi_pack_unpack/Solution/mpi_pack_unpack_solution.cpp @@ -1,46 +1,5 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 3.0 -// Copyright (2020) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project // EXERCISE Goal: // Understand how to use MPI with Kokkos. diff --git a/Exercises/multi_gpu_cuda/Begin/multi_gpu_cuda.cpp b/Exercises/multi_gpu_cuda/Begin/multi_gpu_cuda.cpp index 9849281c..4391df2d 100644 --- a/Exercises/multi_gpu_cuda/Begin/multi_gpu_cuda.cpp +++ b/Exercises/multi_gpu_cuda/Begin/multi_gpu_cuda.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE Goal: // Launch kernels on multiple GPU devices which execute simultaneously diff --git a/Exercises/multi_gpu_cuda/Solution/multi_gpu_cuda.cpp b/Exercises/multi_gpu_cuda/Solution/multi_gpu_cuda.cpp index c2612a6d..640303b4 100644 --- a/Exercises/multi_gpu_cuda/Solution/multi_gpu_cuda.cpp +++ b/Exercises/multi_gpu_cuda/Solution/multi_gpu_cuda.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include diff --git a/Exercises/parallel_scan/Begin/parallel_scan.cpp b/Exercises/parallel_scan/Begin/parallel_scan.cpp index 059c6bcb..e670e7a7 100644 --- a/Exercises/parallel_scan/Begin/parallel_scan.cpp +++ b/Exercises/parallel_scan/Begin/parallel_scan.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/parallel_scan/Solution/parallel_scan.cpp b/Exercises/parallel_scan/Solution/parallel_scan.cpp index cad43b8e..082d7ea4 100644 --- a/Exercises/parallel_scan/Solution/parallel_scan.cpp +++ b/Exercises/parallel_scan/Solution/parallel_scan.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/random_number/Begin/MC_DartSampler.cpp b/Exercises/random_number/Begin/MC_DartSampler.cpp index b9696734..06b1dad7 100644 --- a/Exercises/random_number/Begin/MC_DartSampler.cpp +++ b/Exercises/random_number/Begin/MC_DartSampler.cpp @@ -1,42 +1,5 @@ -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project #include #include diff --git a/Exercises/random_number/Solution/MC_DartSampler.cpp b/Exercises/random_number/Solution/MC_DartSampler.cpp index e107f550..a827f92a 100644 --- a/Exercises/random_number/Solution/MC_DartSampler.cpp +++ b/Exercises/random_number/Solution/MC_DartSampler.cpp @@ -1,42 +1,5 @@ -// ************************************************************************ -// -// Kokkos v. 2.0 -// Copyright (2014) Sandia Corporation -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "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 SANDIA CORPORATION OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project #include #include diff --git a/Exercises/scatter_view/Begin/scatter_view.cpp b/Exercises/scatter_view/Begin/scatter_view.cpp index 1e973759..faac21b0 100644 --- a/Exercises/scatter_view/Begin/scatter_view.cpp +++ b/Exercises/scatter_view/Begin/scatter_view.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include // for std::cout diff --git a/Exercises/scatter_view/Solution/scatter_view.cpp b/Exercises/scatter_view/Solution/scatter_view.cpp index 85145b44..ed6fe732 100644 --- a/Exercises/scatter_view/Solution/scatter_view.cpp +++ b/Exercises/scatter_view/Solution/scatter_view.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/scatter_view/Usage/usage.cpp b/Exercises/scatter_view/Usage/usage.cpp index 08667057..f9461d79 100644 --- a/Exercises/scatter_view/Usage/usage.cpp +++ b/Exercises/scatter_view/Usage/usage.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include KOKKOS_INLINE_FUNCTION int foo(int i) { return i; } diff --git a/Exercises/simd/Begin/simd_begin.cpp b/Exercises/simd/Begin/simd_begin.cpp index bcb81fa0..e60dc8c0 100644 --- a/Exercises/simd/Begin/simd_begin.cpp +++ b/Exercises/simd/Begin/simd_begin.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include //EXERCISE: include the right header (later Kokkos will include this) //#include diff --git a/Exercises/simd/Solution/simd_solution.cpp b/Exercises/simd/Solution/simd_solution.cpp index cc447aef..eaf48f96 100644 --- a/Exercises/simd/Solution/simd_solution.cpp +++ b/Exercises/simd/Solution/simd_solution.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/simd_warp/Begin/simd_warp_begin.cpp b/Exercises/simd_warp/Begin/simd_warp_begin.cpp index 757553f8..49814ac8 100644 --- a/Exercises/simd_warp/Begin/simd_warp_begin.cpp +++ b/Exercises/simd_warp/Begin/simd_warp_begin.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include //EXERCISE: include the right header (later Kokkos will include this) //#include diff --git a/Exercises/simd_warp/Solution/simd_warp_solution.cpp b/Exercises/simd_warp/Solution/simd_warp_solution.cpp index 6755fd27..e91e68c4 100644 --- a/Exercises/simd_warp/Solution/simd_warp_solution.cpp +++ b/Exercises/simd_warp/Solution/simd_warp_solution.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/subview/Begin/exercise_subview_begin.cpp b/Exercises/subview/Begin/exercise_subview_begin.cpp index e656c0f9..277d455d 100644 --- a/Exercises/subview/Begin/exercise_subview_begin.cpp +++ b/Exercises/subview/Begin/exercise_subview_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 4 (subview) Goals: // This exercise begins with the solution from Exercise 04 diff --git a/Exercises/subview/Solution/exercise_subview_solution.cpp b/Exercises/subview/Solution/exercise_subview_solution.cpp index 981dcba9..0be83a8d 100644 --- a/Exercises/subview/Solution/exercise_subview_solution.cpp +++ b/Exercises/subview/Solution/exercise_subview_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/team_policy/Begin/team_policy_begin.cpp b/Exercises/team_policy/Begin/team_policy_begin.cpp index 099f799e..18d4dc22 100644 --- a/Exercises/team_policy/Begin/team_policy_begin.cpp +++ b/Exercises/team_policy/Begin/team_policy_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 5 Goal: // Convert to team parallelism using team policy within the nested loops. diff --git a/Exercises/team_policy/Solution/team_policy_solution.cpp b/Exercises/team_policy/Solution/team_policy_solution.cpp index e6b50bbd..f8eb3394 100644 --- a/Exercises/team_policy/Solution/team_policy_solution.cpp +++ b/Exercises/team_policy/Solution/team_policy_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/team_scratch_memory/Begin/team_scratch_memory_begin.cpp b/Exercises/team_scratch_memory/Begin/team_scratch_memory_begin.cpp index 8895f6b3..580aaeaf 100644 --- a/Exercises/team_scratch_memory/Begin/team_scratch_memory_begin.cpp +++ b/Exercises/team_scratch_memory/Begin/team_scratch_memory_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 7 Goal: // Utilize scratch memory to explicitly cache the x vector. diff --git a/Exercises/team_scratch_memory/Solution/team_scratch_memory_solution.cpp b/Exercises/team_scratch_memory/Solution/team_scratch_memory_solution.cpp index 3886ecb8..a4db7aca 100644 --- a/Exercises/team_scratch_memory/Solution/team_scratch_memory_solution.cpp +++ b/Exercises/team_scratch_memory/Solution/team_scratch_memory_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/team_vector_loop/Begin/team_vector_loop_begin.cpp b/Exercises/team_vector_loop/Begin/team_vector_loop_begin.cpp index 4b1ae737..c9f24811 100644 --- a/Exercises/team_vector_loop/Begin/team_vector_loop_begin.cpp +++ b/Exercises/team_vector_loop/Begin/team_vector_loop_begin.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + // EXERCISE 6 Goal: // Convert to three-level team parallelism using team policy within the nested loops. diff --git a/Exercises/team_vector_loop/Solution/team_vector_loop_solution.cpp b/Exercises/team_vector_loop/Solution/team_vector_loop_solution.cpp index 81f2d1a7..49042d60 100644 --- a/Exercises/team_vector_loop/Solution/team_vector_loop_solution.cpp +++ b/Exercises/team_vector_loop/Solution/team_vector_loop_solution.cpp @@ -1,18 +1,6 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include #include diff --git a/Exercises/unique_token/Begin/unique_token.cpp b/Exercises/unique_token/Begin/unique_token.cpp index 0af6becb..cf6f0bcc 100644 --- a/Exercises/unique_token/Begin/unique_token.cpp +++ b/Exercises/unique_token/Begin/unique_token.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include // EXERCISE: need to remove the ifdef... diff --git a/Exercises/unique_token/Solution/unique_token.cpp b/Exercises/unique_token/Solution/unique_token.cpp index b13db287..30b700a6 100644 --- a/Exercises/unique_token/Solution/unique_token.cpp +++ b/Exercises/unique_token/Solution/unique_token.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include using atomic_2d_view = Kokkos::View #include diff --git a/Exercises/vectorshift/Begin/vectorshift_begin.cpp b/Exercises/vectorshift/Begin/vectorshift_begin.cpp index 72c7521d..a760b815 100644 --- a/Exercises/vectorshift/Begin/vectorshift_begin.cpp +++ b/Exercises/vectorshift/Begin/vectorshift_begin.cpp @@ -1,46 +1,5 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 3.0 -// Copyright (2020) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project // EXERCISE Goal: Learn to use PGAS to implement a circular vector shift. diff --git a/Exercises/vectorshift/Solution/vectorshift_solution.cpp b/Exercises/vectorshift/Solution/vectorshift_solution.cpp index 4f65efbd..a8277626 100644 --- a/Exercises/vectorshift/Solution/vectorshift_solution.cpp +++ b/Exercises/vectorshift/Solution/vectorshift_solution.cpp @@ -1,46 +1,5 @@ -/* -//@HEADER -// ************************************************************************ -// -// Kokkos v. 3.0 -// Copyright (2020) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. 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. -// -// 3. Neither the name of the Corporation nor the names of the -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY NTESS "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 NTESS OR THE -// CONTRIBUTORS 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) 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. -// -// Questions? Contact Christian R. Trott (crtrott@sandia.gov) -// -// ************************************************************************ -//@HEADER -*/ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project // EXERCISE Goal: Learn to use PGAS to implement a circular vector shift. diff --git a/Exercises/virtualfunction/Begin/classes.cpp b/Exercises/virtualfunction/Begin/classes.cpp index 1b9d7cb3..9c2a1cda 100644 --- a/Exercises/virtualfunction/Begin/classes.cpp +++ b/Exercises/virtualfunction/Begin/classes.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include KOKKOS_FUNCTION diff --git a/Exercises/virtualfunction/Begin/classes.hpp b/Exercises/virtualfunction/Begin/classes.hpp index 362c473c..f70f065b 100644 --- a/Exercises/virtualfunction/Begin/classes.hpp +++ b/Exercises/virtualfunction/Begin/classes.hpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #ifndef KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP #define KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP diff --git a/Exercises/virtualfunction/Begin/virtual_function.cpp b/Exercises/virtualfunction/Begin/virtual_function.cpp index 4ec7a531..dda91164 100644 --- a/Exercises/virtualfunction/Begin/virtual_function.cpp +++ b/Exercises/virtualfunction/Begin/virtual_function.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include // Exercise diff --git a/Exercises/virtualfunction/Solution/classes.cpp b/Exercises/virtualfunction/Solution/classes.cpp index 1b9d7cb3..9c2a1cda 100644 --- a/Exercises/virtualfunction/Solution/classes.cpp +++ b/Exercises/virtualfunction/Solution/classes.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include KOKKOS_FUNCTION diff --git a/Exercises/virtualfunction/Solution/classes.hpp b/Exercises/virtualfunction/Solution/classes.hpp index 362c473c..f70f065b 100644 --- a/Exercises/virtualfunction/Solution/classes.hpp +++ b/Exercises/virtualfunction/Solution/classes.hpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #ifndef KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP #define KOKKOS_EXAMPLE_VIRTUAL_FUNCTIONS_CLASSES_HPP diff --git a/Exercises/virtualfunction/Solution/virtual_function.cpp b/Exercises/virtualfunction/Solution/virtual_function.cpp index a16e0cf7..daaf849a 100644 --- a/Exercises/virtualfunction/Solution/virtual_function.cpp +++ b/Exercises/virtualfunction/Solution/virtual_function.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project + #include int main(int argc, char* argv[]) { diff --git a/LICENSE b/LICENSE index 6572cc2d..7200d2f2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,3 @@ - ************************************************************************ - - Kokkos v. 4.0 - Copyright (2022) National Technology & Engineering - Solutions of Sandia, LLC (NTESS). - - Under the terms of Contract DE-NA0003525 with NTESS, - the U.S. Government retains certain rights in this software. - - ============================================================================== Kokkos is under the Apache License v2.0 with LLVM Exceptions: ============================================================================== @@ -231,7 +221,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Questions? Contact: + Questions? Contact: Christian R. Trott (crtrott@sandia.gov) and Damien T. Lebrun-Grandie (lebrungrandt@ornl.gov) diff --git a/Scripts/new_header b/Scripts/new_header index 03eb04f8..41b343d7 100644 --- a/Scripts/new_header +++ b/Scripts/new_header @@ -1,15 +1,2 @@ -//@HEADER -// ************************************************************************ -// -// Kokkos v. 4.0 -// Copyright (2022) National Technology & Engineering -// Solutions of Sandia, LLC (NTESS). -// -// Under the terms of Contract DE-NA0003525 with NTESS, -// the U.S. Government retains certain rights in this software. -// -// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions. -// See https://kokkos.org/LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//@HEADER +// SPDX-FileCopyrightText: Copyright Contributors to the Kokkos project diff --git a/Scripts/old_header b/Scripts/old_header index 739bb787..ab799bf6 100644 --- a/Scripts/old_header +++ b/Scripts/old_header @@ -1,5 +1,3 @@ -/* -//@HEADER // ************************************************************************ // // Kokkos v. 2.0 @@ -35,8 +33,6 @@ // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -// Questions Contact H. Carter Edwards (hcedwar@sandia.gov) +// Questions? Contact Christian R. Trott (crtrott@sandia.gov) // // ************************************************************************ -//@HEADER -*/