Merge branch 'develop' of git.nic.uoregon.edu:/gitroot/xpress-apex in…

…to develop
UO-OACISS · Apr 2, 2021 · a43dd06 · a43dd06
2 parents 9c120d4 + d14344c
commit a43dd06
Show file tree

Hide file tree

Showing 84 changed files with 250 additions and 138 deletions.
diff --git a/cmake/Modules/APEX_SetupCUPTI.cmake b/cmake/Modules/APEX_SetupCUPTI.cmake
@@ -1,4 +1,4 @@
-#  Copyright (c) 2020 University of Oregon
+#  Copyright (c) 2020-2021 University of Oregon
 #
 #  Distributed under the Boost Software License, Version 1.0. (See accompanying
 #  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/cmake/tests/openacc_test/openacc_test.cpp b/cmake/tests/openacc_test/openacc_test.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/cmake/tests/openacc_test/openacc_test.hpp b/cmake/tests/openacc_test/openacc_test.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/etc/spack/package.py b/etc/spack/package.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)

diff --git a/src/apex/CMakeLists.hpx b/src/apex/CMakeLists.hpx
@@ -1,5 +1,5 @@
-#  Copyright (c) 2014-2020 Kevin Huck
-#  Copyright (c) 2014-2020 University of Oregon
+#  Copyright (c) 2014-2021 Kevin Huck
+#  Copyright (c) 2014-2021 University of Oregon
 #
 #  Distributed under the Boost Software License, Version 1.0. (See accompanying
 #  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/CMakeLists.standalone b/src/apex/CMakeLists.standalone
@@ -1,5 +1,5 @@
-#  Copyright (c) 2014-2020 Kevin Huck
-#  Copyright (c) 2014-2020 University of Oregon
+#  Copyright (c) 2014-2021 Kevin Huck
+#  Copyright (c) 2014-2021 University of Oregon
 #
 #  Distributed under the Boost Software License, Version 1.0. (See accompanying
 #  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/CMakeLists.txt b/src/apex/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Copyright (c) 2014-2020 Kevin Huck
-# Copyright (c) 2014-2020 University of Oregon
+# Copyright (c) 2014-2021 Kevin Huck
+# Copyright (c) 2014-2021 University of Oregon
 #
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/activity_trace_async.cpp b/src/apex/activity_trace_async.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/address_resolution.cpp b/src/apex/address_resolution.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/address_resolution.hpp b/src/apex/address_resolution.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex.cpp b/src/apex/apex.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex.h b/src/apex/apex.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex.hpp b/src/apex/apex.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_api.hpp b/src/apex/apex_api.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_assert.h b/src/apex/apex_assert.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_bfd.cpp b/src/apex/apex_bfd.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_bfd.h b/src/apex/apex_bfd.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_config.h.in b/src/apex/apex_config.h.in
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_cxx_shared_lock.hpp b/src/apex/apex_cxx_shared_lock.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_error_handling.hpp b/src/apex/apex_error_handling.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_export.h b/src/apex/apex_export.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_kokkos.cpp b/src/apex/apex_kokkos.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_kokkos.hpp b/src/apex/apex_kokkos.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_nvml.cpp b/src/apex/apex_nvml.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_nvml.hpp b/src/apex/apex_nvml.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_ompt.cpp b/src/apex/apex_ompt.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_openacc.cpp b/src/apex/apex_openacc.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_openacc.hpp b/src/apex/apex_openacc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_options.cpp b/src/apex/apex_options.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_options.hpp b/src/apex/apex_options.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_policies.cpp b/src/apex/apex_policies.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_policies.h b/src/apex/apex_policies.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_policies.hpp b/src/apex/apex_policies.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_raja.cpp b/src/apex/apex_raja.cpp
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
 #include "apex_raja.hpp"
 
 // Statically loading plugin.

diff --git a/src/apex/apex_raja.hpp b/src/apex/apex_raja.hpp
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
 #pragma once
 
 #include "RAJA/util/PluginStrategy.hpp"

diff --git a/src/apex/apex_types.h b/src/apex/apex_types.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/apex_version.h.in b/src/apex/apex_version.h.in
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/concurrency_handler.cpp b/src/apex/concurrency_handler.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/concurrency_handler.hpp b/src/apex/concurrency_handler.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/cuda_thread_node.hpp b/src/apex/cuda_thread_node.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/event_filter.cpp b/src/apex/event_filter.cpp
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
 
 #include "event_filter.hpp"
 #include <regex>

diff --git a/src/apex/event_filter.hpp b/src/apex/event_filter.hpp
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
 #pragma once
 
 #include "apex.hpp"

diff --git a/src/apex/event_listener.cpp b/src/apex/event_listener.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/src/apex/event_listener.hpp b/src/apex/event_listener.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2014-2020 Kevin Huck
- * Copyright (c) 2014-2020 University of Oregon
+ * Copyright (c) 2014-2021 Kevin Huck
+ * Copyright (c) 2014-2021 University of Oregon
  *
  * Distributed under the Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)