Merge pull request #74 from LLNL/develop

Merge of v1.0.0 into master
LLNL · Feb 20, 2019 · db7d3b4 · db7d3b4
2 parents 25a2dcd + 206a626
commit db7d3b4
Show file tree

Hide file tree

Showing 58 changed files with 649 additions and 1,015 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,20 +1,12 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 cmake_minimum_required (VERSION 3.5.1)
 project(umap
-  VERSION 0.0.4
+  VERSION 1.0.0
   LANGUAGES CXX C
 )
 

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,9 +1,9 @@
-UMAP is developed by Lawrence Livermore National Security.
-The following copyrights apply:
+Intellectual Property Notice
+------------------------------
 
-Copyright (c) 2018, Lawrence Livermore National Security, LLC. Produced at
-the Lawrence Livermore National Laboratory. Written by Marty McFadden
-'mcfadden8 at llnl dot gov' LLNL-CODE-733797. All rights reserved.
+Umap is licensed under the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1,
+Ferbruary 1999 (LICENSE-LGPL
+or https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt).
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU Lesser General Public License (as published by the Free
@@ -15,3 +15,16 @@ Public License for more details.  You should have received a copy of the GNU
 Lesser General Public License along with this program; if not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 MA 02111-1307 USA.
+
+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/
+
+    SPDX-License-Identifier: LGPL-2.1-only
+
+External Packages
+-------------------
+
diff --git a/LICENSE b/LICENSE
diff --git a/NOTICE b/NOTICE
@@ -0,0 +1,21 @@
+This work was produced under the auspices of the U.S. Department of
+Energy by Lawrence Livermore National Laboratory under Contract
+DE-AC52-07NA27344.
+
+This work was prepared as an account of work sponsored by an agency of
+the United States Government. Neither the United States Government nor
+Lawrence Livermore National Security, LLC, nor any of their employees
+makes any warranty, expressed or implied, or assumes any legal 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.
+
+Reference herein to any specific commercial product, process, or service
+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/README.md b/README.md
@@ -1,4 +1,4 @@
-# UMAP v0.0.4 (alpha)
+# UMAP v1.0.0
 
 [![Documentation Status](https://readthedocs.org/projects/llnl-umap/badge/?version=develop)](https://llnl-umap.readthedocs.io/en/develop/?badge=develop)
 

diff --git a/cmake/BuildEnv.cmake b/cmake/BuildEnv.cmake
@@ -1,17 +1,10 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
+
 # Set up the language supported for the build environment
 set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_C_STANDARD 99)
diff --git a/cmake/BuildType.cmake b/cmake/BuildType.cmake
@@ -1,16 +1,8 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 # Set a default build type if none was specified
 set( default_build_type "Release" )

diff --git a/cmake/SetupUmapThirdParty.cmake b/cmake/SetupUmapThirdParty.cmake
@@ -1,15 +1,7 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 
diff --git a/config/config.h.in b/config/config.h.in
@@ -1,16 +1,8 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-// Produced at the Lawrence Livermore National Laboratory
+// Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+// UMAP Project Developers. See the top-level LICENSE file for details.
 //
-// Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-// LLNL-CODE-733797
-//
-// All rights reserved.
-//
-// This file is part of UMAP.
-//
-// For details, see https://github.com/LLNL/umap
-// Please also see the COPYRIGHT and LICENSE files for LGPL license.
+// SPDX-License-Identifier: LGPL-2.1-only
 //////////////////////////////////////////////////////////////////////////////
 
 #ifndef _UMAP_UMAPCONFIG_H

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
@@ -1,16 +1,8 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 
 #

diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -1,16 +1,8 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 
 ##############################################################################

diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
@@ -1,16 +1,8 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 
 breathe

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,16 +1,8 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 project(psort)
 

diff --git a/examples/psort.cpp b/examples/psort.cpp
@@ -1,16 +1,8 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-// Produced at the Lawrence Livermore National Laboratory
+// Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+// UMAP Project Developers. See the top-level LICENSE file for details.
 //
-// Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-// LLNL-CODE-733797
-//
-// All rights reserved.
-//
-// This file is part of UMAP.
-//
-// For details, see https://github.com/LLNL/umap
-// Please also see the COPYRIGHT and LICENSE files for LGPL license.
+// SPDX-License-Identifier: LGPL-2.1-only
 //////////////////////////////////////////////////////////////////////////////
 
 /*

diff --git a/host-configs/toss_3_x86_64/gcc_4_8_5.cmake b/host-configs/toss_3_x86_64/gcc_4_8_5.cmake
@@ -1,16 +1,8 @@
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 set(CMAKE_CXX_COMPILER "g++" CACHE PATH "")
 set(CMAKE_C_COMPILER "gcc" CACHE PATH "")

diff --git a/scripts/apply-license-info.sh b/scripts/apply-license-info.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+#############################################################################
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: LGPL-2.1-only
+#############################################################################
+
+setopt extended_glob
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+LIC_CMD=$(which lic)
+if [ ! $LIC_CMD ]; then
+  echo "${RED} [!] This script requires the lic command."
+  exit 255
+fi
+
+echo "Applying licenses to files"
+
+files_no_license=$(grep -L 'This file is part of Umpire.' \
+  benchmarks/**/*(^/) \
+  cmake/**/*(^/) \
+  docs/**/*~*rst(^/)\
+  examples/**/*(^/) \
+  host-configs/**/*(^/) \
+  scripts/**/*(^/) \
+  src/**/*~*tpl*(^/) \
+  tests/**/*(^/) \
+  CMakeLists.txt umpire-config.cmake.in)
+
+echo $files_no_license | xargs $LIC_CMD -f scripts/umpire-license.txt 
+
+echo "${GREEN} [Ok] License text applied. ${NOCOLOR}"
diff --git a/scripts/bamboo/build_and_test.sh b/scripts/bamboo/build_and_test.sh
@@ -1,17 +1,9 @@
 #!/bin/bash
 #############################################################################
-# Copyright (c) 2018, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
 #
-# Created by Marty McFadden, 'mcfadden8 at llnl dot gov'
-# LLNL-CODE-733797
-#
-# All rights reserved.
-#
-# This file is part of UMAP.
-#
-# For details, see https://github.com/LLNL/umap
-# Please also see the COPYRIGHT and LICENSE files for LGPL license.
+# SPDX-License-Identifier: LGPL-2.1-only
 #############################################################################
 
 #

diff --git a/scripts/check-license-info.sh b/scripts/check-license-info.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+#############################################################################
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: LGPL-2.1-only
+#############################################################################
+
+# This is used for the ~*tpl* line to ignore files in bundled tpls
+setopt extended_glob
+
+autoload colors
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+files_no_license=$(grep -L 'Lawrence Livermore National Security' \
+  cmake/**/*(^/) \
+  docs/**/*~*rst(^/)\
+  config/config.h.in\
+  examples/*(^/) \
+  host-configs/**/*(^/) \
+  scripts/**/*(^/) \
+  src/**/*~*tpl*(^/) \
+  tests/**/*~*csv~*xlsx~*sysinfo(^/) \
+  tests/CMakeLists.txt \
+  CMakeLists.txt)
+
+if [ $files_no_license ]; then
+  print "${RED} [!] Some files are missing license text: ${NOCOLOR}"
+  echo "${files_no_license}"
+  exit 255
+else
+  print "${GREEN} [Ok] All files have required license info."
+  exit 0
+fi
diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#############################################################################
+# Copyright 2017-2019 Lawrence Livermore National Security, LLC and other
+# UMAP Project Developers. See the top-level LICENSE file for details.
+#
+# SPDX-License-Identifier: LGPL-2.1-only
+#############################################################################
+
+TAR_CMD=tar
+VERSION=1.0.0
+
+git archive --prefix=umap-${VERSION}/ -o umap-${VERSION}.tar HEAD 2> /dev/null
+
+gzip umap-${VERSION}.tar